NewLife
/
SmartOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

程序稳定以后，减少调试日志输出

This commit is contained in:
nnhy 2015-10-08 11:01:58 +00:00
parent 4f8862b24d
commit 1ed71078da
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
App/Button_GrayLevel.cpp
View File

@ -46,7 +46,8 @@ void Button_GrayLevel::Set(Pin key, Pin relay, bool relayInvert)
assert_param(key != P0); assert_param(key != P0);
// 中断过滤模式，0x01表示使用按下，0x02表示使用弹起 // 中断过滤模式，0x01表示使用按下，0x02表示使用弹起
Key.Mode = 0x02; Key.Mode = 0x02;
Key.ShakeTime = 10;
Key.Set(key); Key.Set(key);
Key.Register(OnPress, this); Key.Register(OnPress, this);
Key.Open(); Key.Open();

32
Message/DataStore.cpp
View File

@ -1,5 +1,13 @@
#include "DataStore.h" #include "DataStore.h"
#define DS_DEBUG DEBUG
//#define DS_DEBUG 0
#if DS_DEBUG
#define ds_printf debug_printf
#else
#define ds_printf(format, ...)
#endif
// 初始化 // 初始化
DataStore::DataStore() : Areas(0) DataStore::DataStore() : Areas(0)
{ {
@ -115,19 +123,19 @@ int ByteDataPort::Write(byte* data)
byte cmd = *data; byte cmd = *data;
if(cmd == 0xFF) return Read(data); if(cmd == 0xFF) return Read(data);
debug_printf("控制0x%02X ", cmd); ds_printf("控制0x%02X ", cmd);
switch(cmd) switch(cmd)
{ {
case 1: case 1:
debug_printf("打开"); ds_printf("打开");
OnWrite(1); OnWrite(1);
break; break;
case 0: case 0:
debug_printf("关闭"); ds_printf("关闭");
OnWrite(0); OnWrite(0);
break; break;
case 2: case 2:
debug_printf("反转"); ds_printf("反转");
OnWrite(!OnRead()); OnWrite(!OnRead());
break; break;
default: default:
@ -144,7 +152,7 @@ int ByteDataPort::Write(byte* data)
// 开关闪烁 // 开关闪烁
case 1: case 1:
s = cmd - 0x10; s = cmd - 0x10;
debug_printf("闪烁 %d 秒", s); ds_printf("闪烁 %d 秒", s);
OnWrite(!OnRead()); OnWrite(!OnRead());
Next = cmd; Next = cmd;
StartAsync(s * 1000); StartAsync(s * 1000);
@ -152,7 +160,7 @@ int ByteDataPort::Write(byte* data)
// 开关闪烁（毫秒级） // 开关闪烁（毫秒级）
case 2: case 2:
s = (cmd - 0x20) * 100; s = (cmd - 0x20) * 100;
debug_printf("闪烁 %d 毫秒", s); ds_printf("闪烁 %d 毫秒", s);
OnWrite(!OnRead()); OnWrite(!OnRead());
Next = cmd; Next = cmd;
StartAsync(s); StartAsync(s);
@ -163,7 +171,7 @@ int ByteDataPort::Write(byte* data)
case 6: case 6:
case 7: case 7:
s = cmd - 0x40; s = cmd - 0x40;
debug_printf("延迟 %d 秒关闭", s); ds_printf("延迟 %d 秒关闭", s);
//OnWrite(1); //OnWrite(1);
Next = 0; Next = 0;
StartAsync(s * 1000); StartAsync(s * 1000);
@ -174,24 +182,24 @@ int ByteDataPort::Write(byte* data)
case 10: case 10:
case 11: case 11:
s = cmd - 0x80; s = cmd - 0x80;
debug_printf("延迟 %d 秒打开", s); ds_printf("延迟 %d 秒打开", s);
//OnWrite(0); //OnWrite(0);
Next = 1; Next = 1;
StartAsync(s * 1000); StartAsync(s * 1000);
break; break;
} }
#if DEBUG #if DS_DEBUG
//Name.Show(true); //Name.Show(true);
//debug_printf(" %s\r\n", Name); //ds_printf(" %s\r\n", Name);
//Show(true); //Show(true);
Object* obj = dynamic_cast<Object*>(this); Object* obj = dynamic_cast<Object*>(this);
if(obj) if(obj)
{ {
debug_printf(" "); ds_printf(" ");
obj->Show(true); obj->Show(true);
} }
else else
debug_printf("\r\n"); ds_printf("\r\n");
#endif #endif
return Read(data); return Read(data);