debug serial maco edit

NexSerialConfig.h

@@ -16,10 +16,19 @@
 #ifndef __NexSerialConfig_H__
 #define __NexSerialConfig_H__
 
-/*Define debug serial*/
-#define dbSerial Serial
+/*enable debug serial*/
+#define DEBUG_SERIAL_ENABLE 
+
+#ifdef DEBUG_SERIAL_ENABLE
+#define dbSerialPrint(a)    Serial.print(a)
+#define dbSerialPrintln(a)  Serial.println(a)
+#define dbSerialBegin(a)    Serial.begin(a)
+#else
+#define dbSerialPrint(a)
+#define dbSerialPrintln(a)
+#define dbSerialBegin(a)
+#endif
 
 /*Define Nextion serial*/
 #define nexSerial Serial2
-
 #endif 

NexTouch.cpp

@@ -121,26 +121,26 @@ const char* NexTouch::getObjName(void)
  */
 void NexTouch::print(void)
 {
-    dbSerial.print("[");
-    dbSerial.print((uint32_t)this);
-    dbSerial.print(":");
-    dbSerial.print(pid);
-    dbSerial.print(",");
-    dbSerial.print(cid);
-    dbSerial.print(",");
+    dbSerialPrint("[");
+    dbSerialPrint((uint32_t)this);
+    dbSerialPrint(":");
+    dbSerialPrint(pid);
+    dbSerialPrint(",");
+    dbSerialPrint(cid);
+    dbSerialPrint(",");
     if (name)
     {
-        dbSerial.print(name);
+        dbSerialPrint(name);
     }
     else
     {
-        dbSerial.print("(null)");
+        dbSerialPrint("(null)");
     }
-    dbSerial.print(",");
-    dbSerial.print((uint32_t)cbPush);
-    dbSerial.print(",");
-    dbSerial.print((uint32_t)cbPop);
-    dbSerial.println("]");
+    dbSerialPrint(",");
+    dbSerialPrint((uint32_t)cbPush);
+    dbSerialPrint(",");
+    dbSerialPrint((uint32_t)cbPop);
+    dbSerialPrintln("]");
 }
 
 void NexTouch::attachPush(NexTouchEventCb push, void *ptr)
@@ -243,11 +243,11 @@ bool NexTouch::recvRetCommandFinished(uint32_t timeout)
 
     if (ret) 
     {
-        dbSerial.println("recvRetCommandFinished ok");
+        dbSerialPrintln("recvRetCommandFinished ok");
     }
     else
     {
-        dbSerial.println("recvRetCommandFinished err");
+        dbSerialPrintln("recvRetCommandFinished err");
     }
     
     return ret;
@@ -334,11 +334,11 @@ uint16_t NexTouch::recvRetString(char *buffer, uint16_t len, uint32_t timeout)
     
 __return:
 
-    dbSerial.print("recvRetString[");
-    dbSerial.print(temp.length());
-    dbSerial.print(",");
-    dbSerial.print(temp);
-    dbSerial.println("]");
+    dbSerialPrint("recvRetString[");
+    dbSerialPrint(temp.length());
+    dbSerialPrint(",");
+    dbSerialPrint(temp);
+    dbSerialPrintln("]");
 
     return ret;
 }
@@ -383,12 +383,12 @@ __return:
 
     if (ret) 
     {
-        dbSerial.print("recvRetNumber :");
-        dbSerial.println(*number);
+        dbSerialPrint("recvRetNumber :");
+        dbSerialPrintln(*number);
     }
     else
     {
-        dbSerial.println("recvRetNumber err");
+        dbSerialPrintln("recvRetNumber err");
     }
     
     return ret;
@@ -468,12 +468,12 @@ bool sendCurrentPageId(uint8_t* pageId)
 
     if (ret) 
     {
-        dbSerial.print("recvPageId :");
-        dbSerial.println(*pageId);
+        dbSerialPrint("recvPageId :");
+        dbSerialPrintln(*pageId);
     }
     else
     {
-        dbSerial.println("recvPageId err");
+        dbSerialPrintln("recvPageId err");
     }
 
     return ret;
@@ -493,12 +493,12 @@ bool touchCalibration(void)
     delay(10);
     if(NexTouch::recvRetCommandFinished())
     {
-        dbSerial.println("TouchCalibration ok ");
+        dbSerialPrintln("TouchCalibration ok ");
         ret = true; 
     }
     else 
     {
-        dbSerial.println("TouchCalibration err ");
+        dbSerialPrintln("TouchCalibration err ");
     }
     
     return ret;
@@ -517,12 +517,12 @@ bool  disableTouchFocus(void)
     delay(10);
     if(NexTouch::recvRetCommandFinished())
     {
-        dbSerial.println("disableTouchFocus ok ");
+        dbSerialPrintln("disableTouchFocus ok ");
         ret = true; 
     }
     else 
     {
-        dbSerial.println("disableTouchFocus err ");
+        dbSerialPrintln("disableTouchFocus err ");
     }
     
     return ret;
@@ -542,12 +542,12 @@ bool pauseSerialCommand(void)
     delay(10);
     if(NexTouch::recvRetCommandFinished())
     {
-        dbSerial.println("pauseSerialCommand ok ");
+        dbSerialPrintln("pauseSerialCommand ok ");
         ret = true; 
     }
     else 
     {
-        dbSerial.println("pauseSerialCommand err ");
+        dbSerialPrintln("pauseSerialCommand err ");
     }
 
     return ret;
@@ -566,12 +566,12 @@ bool recoverySerialCommand(void)
     delay(10);
     if(NexTouch::recvRetCommandFinished())
     {
-        dbSerial.println("recoverySerialCommand ok ");
+        dbSerialPrintln("recoverySerialCommand ok ");
         ret = true; 
     }
     else 
     {
-        dbSerial.println("recoverySerialCommand err ");
+        dbSerialPrintln("recoverySerialCommand err ");
     }
 
     return ret;	
@@ -598,15 +598,15 @@ bool setCurrentBrightness(uint8_t dimValue)
 
     if(NexTouch::recvRetCommandFinished())
     {   
-        dbSerial.print("setCurrentBrightness[ ");
-        dbSerial.print(dimValue);
-        dbSerial.println("]ok ");
+        dbSerialPrint("setCurrentBrightness[ ");
+        dbSerialPrint(dimValue);
+        dbSerialPrintln("]ok ");
       
         ret = true; 
     }
     else 
     {
-        dbSerial.println("setCurrentBrightness err ");
+        dbSerialPrintln("setCurrentBrightness err ");
     }
 
     return ret;    
@@ -633,14 +633,14 @@ bool setDefaultBrightness(uint8_t dimDefaultValue)
 
     if(NexTouch::recvRetCommandFinished())
     {
-        dbSerial.print("setDefaultBrightness[");
-        dbSerial.print(dimDefaultValue);
-        dbSerial.println("]ok");
+        dbSerialPrint("setDefaultBrightness[");
+        dbSerialPrint(dimDefaultValue);
+        dbSerialPrintln("]ok");
         ret = true; 
     }
     else 
     {
-        dbSerial.println("setDefaultBrightness err ");
+        dbSerialPrintln("setDefaultBrightness err ");
     }
 
     return ret; 
@@ -661,7 +661,7 @@ bool sleepMode(uint8_t mode)
     String cmd;
     if(mode != 0 && mode != 1)
     {
-        dbSerial.println("mode input ok ");
+        dbSerialPrintln("mode input ok ");
         return ret;
     }
     utoa(mode, buf, 10);
@@ -672,12 +672,12 @@ bool sleepMode(uint8_t mode)
 
     if(NexTouch::recvRetCommandFinished())
     {
-        dbSerial.println("sleepMode ok ");
+        dbSerialPrintln("sleepMode ok ");
         ret = true; 
     }
     else 
     {
-        dbSerial.println("sleepMode err ");
+        dbSerialPrintln("sleepMode err ");
     }
 
     return ret; 
@@ -704,12 +704,12 @@ bool setCurrentBaudrate(uint32_t baudrate)
 
     if(NexTouch::recvRetCommandFinished())
     {
-        dbSerial.println("setCurrentBaudrate ok ");
+        dbSerialPrintln("setCurrentBaudrate ok ");
         ret = true; 
     }
     else 
     {
-        dbSerial.println("setCurrentBaudrate err ");
+        dbSerialPrintln("setCurrentBaudrate err ");
     }
 
     return ret; 
@@ -736,12 +736,12 @@ bool setDefaultBaudrate(uint32_t defaultBaudrate)
 
     if(NexTouch::recvRetCommandFinished())
     {
-        dbSerial.println("setDefaultBaudrate ok ");
+        dbSerialPrintln("setDefaultBaudrate ok ");
         ret = true; 
     }
     else 
     {
-        dbSerial.println("setDefaultBaudrate err ");
+        dbSerialPrintln("setDefaultBaudrate err ");
     }
 
     return ret; 

examples/CompButton/CompButton.ino

@@ -29,11 +29,9 @@ void b0PopCallback(void *ptr)
     uint16_t len;
     uint16_t number;
     NexButton *btn = (NexButton *)ptr;
-    
-    dbSerial.println("b0PopCallback");
-    dbSerial.print("ptr=");
-    dbSerial.println((uint32_t)ptr);
-    
+    dbSerialPrintln("b0PopCallback");
+    dbSerialPrint("ptr=");
+    dbSerialPrintln((uint32_t)ptr); 
     memset(buffer, 0, sizeof(buffer));
     btn->getText(buffer, sizeof(buffer));
     
@@ -47,15 +45,15 @@ void b0PopCallback(void *ptr)
 }
 
 void setup(void)
-{
-    dbSerial.begin(9600);
+{  
+    dbSerialBegin(9600);  
     nexInit();
     b0.attachPop(b0PopCallback, &b0);
-    dbSerial.println("setup done");
+    dbSerialPrintln("setup done"); 
 }
 
 void loop(void)
-{
-    dbSerial.println("nexLoop");
+{   
+    dbSerialPrintln("nexLoop");  
     nexLoop(nexListenList);
 }

examples/CompHotspot/CompHotspot.ino

@@ -27,45 +27,45 @@ NexTouch *nexListenList[] =
 
 void hot0PushCallback(void *ptr)
 {
-    dbSerial.println("hot0PushCallback");
-    dbSerial.print("ptr=");
-    dbSerial.println((uint32_t)ptr);
+    dbSerialPrintln("hot0PushCallback");
+    dbSerialPrint("ptr=");
+    dbSerialPrintln((uint32_t)ptr);
 }
 
 void hot1PushCallback(void *ptr)
 {
-    dbSerial.println("hot1PushCallback");    
-    dbSerial.print("ptr=");
-    dbSerial.println((uint32_t)ptr);
+    dbSerialPrintln("hot1PushCallback");    
+    dbSerialPrint("ptr=");
+    dbSerialPrintln((uint32_t)ptr);
 }
 
 void hot0PopCallback(void *ptr)
 {
-    dbSerial.println("hot0PopCallback");
-    dbSerial.print("ptr=");
-    dbSerial.println((uint32_t)ptr);
+    dbSerialPrintln("hot0PopCallback");
+    dbSerialPrint("ptr=");
+    dbSerialPrintln((uint32_t)ptr);
 }
 
 void hot1PopCallback(void *ptr)
 {
-    dbSerial.println("hot1PopCallback");
-    dbSerial.print("ptr=");
-    dbSerial.println((uint32_t)ptr);
+    dbSerialPrintln("hot1PopCallback");
+    dbSerialPrint("ptr=");
+    dbSerialPrintln((uint32_t)ptr);
 }
 
 void setup(void)
 {
-    dbSerial.begin(9600);
+    dbSerialBegin(9600);
     nexInit();
     hot0.attachPush(hot0PushCallback, &hot0);
     hot0.attachPop(hot0PopCallback, &hot0);
     hot1.attachPush(hot1PushCallback, &hot1);
     hot1.attachPop(hot1PopCallback, &hot1);
-    dbSerial.println("setup done");
+    dbSerialPrintln("setup done");
 }
 
 void loop(void)
 {
-    dbSerial.println("nexLoop");
+    dbSerialPrintln("nexLoop");
     nexLoop(nexListenList);
 }

examples/CompPage/CompPage.ino

@@ -31,44 +31,44 @@ NexTouch *nexListenList[] =
 
 void page0PopCallback(void *ptr)
 {
-    dbSerial.println("page0PopCallback");
+    dbSerialPrintln("page0PopCallback");
     page1.show();
 }
 
 void page1PopCallback(void *ptr)
 {
-    dbSerial.println("page1PopCallback");
+    dbSerialPrintln("page1PopCallback");
     page2.show();
 }
 
 void page2PopCallback(void *ptr)
 {
-    dbSerial.println("page2PopCallback");
+    dbSerialPrintln("page2PopCallback");
     page3.show();
 }
 
 void page3PopCallback(void *ptr)
 {
-    dbSerial.println("page3PopCallback");
+    dbSerialPrintln("page3PopCallback");
     page0.show();
 }
 
 void setup(void)
 {   
-    dbSerial.begin(9600);
+    dbSerialBegin(9600);
     nexInit();
-    dbSerial.println("setup begin");
+    dbSerialPrintln("setup begin");
     
     page0.attachPop(page0PopCallback);
     page1.attachPop(page1PopCallback);
     page2.attachPop(page2PopCallback);
     page3.attachPop(page3PopCallback);
     
-    dbSerial.println("setup end");
+    dbSerialPrintln("setup end");
 }
 
 void loop(void)
 {
-    dbSerial.println("nexLoop");
+    dbSerialPrintln("nexLoop");
     nexLoop(nexListenList);
 }

examples/CompPicture/CompPicture.ino

@@ -26,7 +26,7 @@ NexTouch *nexListenList[] =
 void p0PopCallback(void *ptr)
 {
     uint32_t number = 0;
-    dbSerial.println("p0PopCallback");
+    dbSerialPrintln("p0PopCallback");
 
     p0.getPic(&number);
 
@@ -45,15 +45,15 @@ void p0PopCallback(void *ptr)
 
 void setup(void)
 {
-    dbSerial.begin(9600);
+    dbSerialBegin(9600);
     nexInit();
     p0.attachPop(p0PopCallback);
-    dbSerial.println("setup done");
+    dbSerialPrintln("setup done");
 }
 
 void loop(void)
 {
-    dbSerial.println("nexLoop");
+    dbSerialPrintln("nexLoop");
     nexLoop(nexListenList);
 }
 

examples/CompPointer/CompPointer.ino

@@ -30,7 +30,7 @@ NexTouch *nexListenList[] =
 void buttonUpPopCallback(void *ptr)
 {
     uint32_t number = 0;
-    dbSerial.println("buttonUpPopCallback");
+    dbSerialPrintln("buttonUpPopCallback");
 
     pointer.getValue(&number);
 
@@ -45,7 +45,7 @@ void buttonUpPopCallback(void *ptr)
 void buttonDownPopCallback(void *ptr)
 {
     uint32_t number = 0;
-    dbSerial.println("buttonDownPopCallback");
+    dbSerialPrintln("buttonDownPopCallback");
 
     pointer.getValue(&number);
 
@@ -61,16 +61,16 @@ void buttonDownPopCallback(void *ptr)
 
 void setup(void)
 {
-    dbSerial.begin(9600);
+    dbSerialBegin(9600);
     nexInit();
     btn_up.attachPop(buttonUpPopCallback);
     btn_down.attachPop(buttonDownPopCallback);
-    dbSerial.println("setup done");
+    dbSerialPrintln("setup done");
 }
 
 void loop(void)
 {
-    dbSerial.println("nexLoop");
+    dbSerialPrintln("nexLoop");
     nexLoop(nexListenList);
 }
 

examples/CompProgressBar/CompProgressBar.ino

@@ -30,7 +30,7 @@ NexTouch *nexListenList[] =
 void buttonUpPopCallback(void *ptr)
 {
     uint32_t number = 0;
-    dbSerial.println("buttonUpPopCallback");
+    dbSerialPrintln("buttonUpPopCallback");
 
     j0.getValue(&number);
 
@@ -45,7 +45,7 @@ void buttonUpPopCallback(void *ptr)
 void buttonDownPopCallback(void *ptr)
 {
     uint32_t number = 0;
-    dbSerial.println("buttonDownPopCallback");
+    dbSerialPrintln("buttonDownPopCallback");
 
     j0.getValue(&number);
 
@@ -63,16 +63,16 @@ void setup(void)
 {
     uint32_t brightness = 0;
     
-    dbSerial.begin(9600);
+    dbSerialBegin(9600);
     nexInit();
     btn_up.attachPop(buttonUpPopCallback);
     btn_down.attachPop(buttonDownPopCallback);
-    dbSerial.println("setup done");
+    dbSerialPrintln("setup done");
 }
 
 void loop(void)
 {
-    dbSerial.println("nexLoop");
+    dbSerialPrintln("nexLoop");
     nexLoop(nexListenList);
 }
 

examples/CompSlice/CompSlice.ino

@@ -26,7 +26,7 @@ NexTouch *nexListenList[] =
 void q0PopCallback(void *ptr)
 {
     uint32_t number = 0;
-    dbSerial.println("q0PopCallback");
+    dbSerialPrintln("q0PopCallback");
 
     q0.getPic(&number);
 
@@ -39,15 +39,15 @@ void q0PopCallback(void *ptr)
 
 void setup(void)
 {
-    dbSerial.begin(9600);
+    dbSerialBegin(9600);
     nexInit();
     q0.attachPop(q0PopCallback);
-    dbSerial.println("setup done");
+    dbSerialPrintln("setup done");
 }
 
 void loop(void)
 {
-    dbSerial.println("nexLoop");
+    dbSerialPrintln("nexLoop");
     nexLoop(nexListenList);
 }
 

examples/CompText/CompText.ino

@@ -36,7 +36,7 @@ NexTouch *nexListenList[] =
 
 void t0PopCallback(void *ptr)
 {
-    dbSerial.println("t0PopCallback");
+    dbSerialPrintln("t0PopCallback");
     t0.setText("50");
 }
 
@@ -45,7 +45,7 @@ void b0PopCallback(void *ptr)
     uint16_t len;
     uint16_t number;
     
-    dbSerial.println("b0PopCallback");
+    dbSerialPrintln("b0PopCallback");
 
     memset(buffer, 0, sizeof(buffer));
     t0.getText(buffer, sizeof(buffer));
@@ -64,7 +64,7 @@ void b1PopCallback(void *ptr)
     uint16_t len;
     uint16_t number;
     
-    dbSerial.println("b1PopCallback");
+    dbSerialPrintln("b1PopCallback");
 
     memset(buffer, 0, sizeof(buffer));
     t0.getText(buffer, sizeof(buffer));
@@ -80,14 +80,14 @@ void b1PopCallback(void *ptr)
 
 void setup(void)
 {
-    dbSerial.begin(9600);
+    dbSerialBegin(9600);
     nexInit();
-    dbSerial.println("setup done");
+    dbSerialPrintln("setup done");
 }
 
 void loop(void)
 {
-    dbSerial.println("nexLoop");
+    dbSerialPrintln("nexLoop");
     nexLoop(nexListenList);
 }