diff --git a/Drivers/Enc28j60.cpp b/Drivers/Enc28j60.cpp index 0d6c3b40..aca25412 100644 --- a/Drivers/Enc28j60.cpp +++ b/Drivers/Enc28j60.cpp @@ -478,7 +478,7 @@ bool Enc28j60::PhyWrite(byte addr, ushort data) // 等待 PHY 写完成 int times = 100; - while((ReadReg(MISTAT) & MISTAT_BUSY) && --times > 0); + while((ReadReg(MISTAT) & MISTAT_BUSY) && --times > 0) { } return times > 0; } diff --git a/Kernel/Z_Debug.cpp b/Kernel/Z_Debug.cpp index f076d1f9..485a9c34 100644 --- a/Kernel/Z_Debug.cpp +++ b/Kernel/Z_Debug.cpp @@ -132,6 +132,9 @@ void operator delete[](void* p) noexcept } } +void operator delete(void* p, uint size) noexcept { operator delete(p); } +void operator delete[](void* p, uint size) noexcept { operator delete[](p); } + #if !defined(TINY) && defined(STM32F0) #if defined(__CC_ARM) #pragma arm section code diff --git a/TinyNet/TinyClient.cpp b/TinyNet/TinyClient.cpp index 68667f25..fa08dd58 100644 --- a/TinyNet/TinyClient.cpp +++ b/TinyNet/TinyClient.cpp @@ -89,7 +89,7 @@ void TinyClient::Close() /******************************** 收发中心 ********************************/ bool TinyClient::Send(TinyMessage& msg) { - assert(this, "令牌客户端未初始化"); + //assert(this, "令牌客户端未初始化"); assert(Control, "令牌控制器未初始化"); // 未组网时,禁止发其它消息。组网消息通过广播发出,不经过这里 @@ -103,7 +103,7 @@ bool TinyClient::Send(TinyMessage& msg) bool TinyClient::Reply(TinyMessage& msg) { - assert(this, "令牌客户端未初始化"); + //assert(this, "令牌客户端未初始化"); assert(Control, "令牌控制器未初始化"); // 未组网时,禁止发其它消息。组网消息通过广播发出,不经过这里