Revision 42:3f62103a4f3c, committed 2015-05-07

Comitter:

mbedAustin

Date:

Thu May 07 03:51:02 2015 +0000

Parent:

41:264902b160ea

Child:

43:2e326d95fe2c

Commit message:

enabled TCPConnection debug messages, made tcpconnection and socket messages more verbose (file and line number included in output)

Changed in this revision

--- a/ESP8266/ESP8266.cpp	Thu May 07 03:37:55 2015 +0000
+++ b/ESP8266/ESP8266.cpp	Thu May 07 03:51:02 2015 +0000
@@ -24,9 +24,9 @@
 
 //Debug is disabled by default
 #if 1
-#define DBG(x, ...)  printf("[ESP8266 : DBG]"x" [%s,%d]\r\n", ##__VA_ARGS__,__FILE__,__LINE__); 
-#define WARN(x, ...) printf("[ESP8266 : WARN]"x" [%s,%d]\r\n", ##__VA_ARGS__,__FILE__,__LINE__); 
-#define ERR(x, ...)  printf("[ESP8266 : ERR]"x" [%s,%d]\r\n", ##__VA_ARGS__,__FILE__,__LINE__); 
+#define DBG(x, ...)  printf("[ESP8266 : DBG]"x" \t[%s,%d]\r\n", ##__VA_ARGS__,__FILE__,__LINE__); 
+#define WARN(x, ...) printf("[ESP8266 : WARN]"x" \t[%s,%d]\r\n", ##__VA_ARGS__,__FILE__,__LINE__); 
+#define ERR(x, ...)  printf("[ESP8266 : ERR]"x" \t[%s,%d]\r\n", ##__VA_ARGS__,__FILE__,__LINE__); 
 #else
 #define DBG(x, ...)
 #define WARN(x, ...)
@@ -34,7 +34,7 @@
 #endif
 
 #if 1
-#define INFO(x, ...) printf("[ESP8266 : INFO]"x" [%s,%d]\r\n", ##__VA_ARGS__,__FILE__,__LINE__); 
+#define INFO(x, ...) printf("[ESP8266 : INFO]"x" \t[%s,%d]\r\n", ##__VA_ARGS__,__FILE__,__LINE__); 
 #else
 #define INFO(x, ...)
 #endif
@@ -219,7 +219,7 @@
         //pos4 = resultString.find('"',pos3+1);
         strncpy(ipString,resultString.substr(pos1,pos2).c_str(),sizeof(ipString));
         ipString[pos2 - pos1 +1] = 0; // null terminate string correctly.
-        DBG("IP: %s",ipString);
+        INFO("IP: %s",ipString);
         ip = ipString;
 
     } else {
@@ -342,7 +342,7 @@
     Timer tmr;
     int result = 0;
 
-    DBG("sendingCommand: %s",cmd);
+    DBG("sendCmd:\t %s",cmd);
 
     attach_rx(true);
 
@@ -379,7 +379,7 @@
                 while (readable())
                     getc();
 
-                DBG("check: %s", checking.c_str());
+                DBG("check:\t %s", checking.c_str());
 
                 attach_rx(true);
                 return -1;

--- a/Socket/Socket.cpp	Thu May 07 03:37:55 2015 +0000
+++ b/Socket/Socket.cpp	Thu May 07 03:51:02 2015 +0000
@@ -23,9 +23,9 @@
 #if 0
 //Enable debug
 #include <cstdio>
-#define DBG(x, ...) std::printf("[Socket : DBG]"x" [%s,%d]\r\n", ##__VA_ARGS__,__FILE__,__LINE__); 
-#define WARN(x, ...) std::printf("[Socket : WARN]"x" [%s,%d]\r\n", ##__VA_ARGS__,__FILE__,__LINE__); 
-#define ERR(x, ...) std::printf("[Socket : ERR]"x" [%s,%d]\r\n", ##__VA_ARGS__,__FILE__,__LINE__); 
+#define DBG(x, ...) std::printf("[Socket : DBG]"x" \t[%s,%d]\r\n", ##__VA_ARGS__,__FILE__,__LINE__); 
+#define WARN(x, ...) std::printf("[Socket : WARN]"x" \t[%s,%d]\r\n", ##__VA_ARGS__,__FILE__,__LINE__); 
+#define ERR(x, ...) std::printf("[Socket : ERR]"x" \t[%s,%d]\r\n", ##__VA_ARGS__,__FILE__,__LINE__); 
 
 #else
 //Disable debug

--- a/Socket/TCPSocketConnection.cpp	Thu May 07 03:37:55 2015 +0000
+++ b/Socket/TCPSocketConnection.cpp	Thu May 07 03:51:02 2015 +0000
@@ -23,10 +23,10 @@
 using std::memcpy;
 
 //Debug is disabled by default
-#if 0
-#define DBG(x, ...)  printf("[TCPConnection : DBG]"x"\r\n", ##__VA_ARGS__);
-#define WARN(x, ...) printf("[TCPConnection: WARN]"x"\r\n", ##__VA_ARGS__);
-#define ERR(x, ...)  printf("[TCPConnection : ERR]"x"\r\n", ##__VA_ARGS__);
+#if 1
+#define DBG(x, ...)  printf("[TCPConnection : DBG]"x" \t[%s,%d]\r\n", ##__VA_ARGS__,__FILE__,__LINE__); 
+#define WARN(x, ...) printf("[TCPConnection: WARN]"x" \t[%s,%d]\r\n", ##__VA_ARGS__,__FILE__,__LINE__); 
+#define ERR(x, ...)  printf("[TCPConnection : ERR]"x" \t[%s,%d]\r\n", ##__VA_ARGS__,__FILE__,__LINE__); 
 #else
 #define DBG(x, ...)
 #define WARN(x, ...)