v1.6.0

#### New in v1.6.0 1. Sync'ed with latest WiFiNINA Library v1.6.0. 2. New features include ***WiFiStorage*** and update to ***NINA Firmware v1.4.0*** from v1.3.0 3. Enhance debugging tool
khoih-prog · Jul 21, 2020 · fe4d77b · fe4d77b
1 parent 1db944e
commit fe4d77b
Show file tree

Hide file tree

Showing 10 changed files with 137 additions and 96 deletions.
diff --git a/README.md b/README.md
@@ -12,6 +12,7 @@
 
 1. Sync'ed with latest WiFiNINA Library v1.6.0. 
 2. New features include ***WiFiStorage*** and update to ***NINA Firmware v1.4.0*** from v1.3.0
+3. Enhance debugging tool
 
 #### New in v1.5.3
 

diff --git a/src/WiFiClient_Generic.cpp b/src/WiFiClient_Generic.cpp
@@ -37,11 +37,14 @@
   1.6.0   K Hoang      19/07/2020 Sync with Aruino WiFiNINA Library v1.6.0 (new Firmware 1.4.0 and WiFiStorage)
  *****************************************************************************************************************************/
 
-extern "C" {
-#include "utility/wl_definitions.h"
-#include "utility/wl_types.h"
-#include "string.h"
-#include "utility/debug.h"
+#define _WIFININA_LOGLEVEL_         1
+
+extern "C" 
+{
+  #include "utility/wl_definitions.h"
+  #include "utility/wl_types.h"
+  #include "string.h"
+  #include "utility/debug.h"
 }
 
 
@@ -101,7 +104,7 @@ int WiFiClient::connect(IPAddress ip, uint16_t port)
   else
   {
     // KH
-    LOGDEBUG("No Socket available");
+    NN_LOGDEBUG("No Socket available");
 
     return 0;
   }
@@ -136,7 +139,7 @@ int WiFiClient::connectSSL(IPAddress ip, uint16_t port)
   else
   {
     // KH
-    LOGDEBUG("No Socket available");
+    NN_LOGDEBUG("No Socket available");
 
     return 0;
   }
@@ -170,7 +173,7 @@ int WiFiClient::connectSSL(const char *host, uint16_t port)
   else
   {
     // KH
-    LOGDEBUG("No Socket available");
+    NN_LOGDEBUG("No Socket available");
 
     return 0;
   }

diff --git a/src/WiFiServer_Generic.cpp b/src/WiFiServer_Generic.cpp
@@ -40,6 +40,8 @@
 #include <string.h>
 #include "utility/server_drv.h"
 
+#define _WIFININA_LOGLEVEL_         1
+
 extern "C" 
 {
   #include "utility/debug.h"
@@ -88,19 +90,38 @@ WiFiClient WiFiServer::available(byte* status)
   {
     // check previous received client socket
     if (_lastSock != NO_SOCKET_AVAIL) 
-    {
+    {     
       WiFiClient client(_lastSock);
+
+      // KH, from v1.6.0 debug
+      NN_LOGDEBUG1("WiFiServer::available: _lastSock =", _lastSock);
+
+      if (client.connected()) 
+        NN_LOGDEBUG("WiFiServer::available: client.connected");
+
+      if (client.available()) 
+        NN_LOGDEBUG("WiFiServer::available: client.available");
+
+
+      //////
 
       if (client.connected() && client.available()) 
       {
         sock = _lastSock;
+
+        // KH, from v1.6.0 debug
+        NN_LOGDEBUG1("WiFiServer::available: sock/_lastSock =", sock);
       }
     }
 
     if (sock == NO_SOCKET_AVAIL) 
     {
       // check for new client socket
       sock = ServerDrv::availServer(_sock);
+
+      // KH, from v1.6.0 debug
+      //NN_LOGDEBUG1("WiFiServer::available: sock =", sock);
+      //////
     }
   }
 
@@ -114,10 +135,18 @@ WiFiClient WiFiServer::available(byte* status)
     }
 
     _lastSock = sock;
+
+    // KH, from v1.6.0 debug
+    NN_LOGDEBUG1("WiFiServer::available: Client OK, sock =", sock);
+    //////
 
     return client;
   }
 
+  // KH, from v1.6.0 debug
+  NN_LOGDEBUG("WiFiServer::available: Client not OK");
+  //////
+
   return WiFiClient(255);
 }
 

diff --git a/src/WiFiServer_Generic.h b/src/WiFiServer_Generic.h
@@ -43,6 +43,8 @@
 extern "C" 
 {
   #include "utility/wl_definitions.h"
+  // KH, from v1.6.0
+  #include "utility/debug.h"
 }
 
 #include "Server.h"

diff --git a/src/WiFiUdp_Generic.h b/src/WiFiUdp_Generic.h
@@ -102,4 +102,5 @@ class WiFiUDP : public UDP
     friend class WiFiDrv;
 };
 
+
 #endif    //WiFiUDP_Generic_h
diff --git a/src/WiFi_Generic.cpp b/src/WiFi_Generic.cpp
@@ -126,7 +126,7 @@ int WiFiClass::begin(const char* ssid, const char *passphrase)
       if ((status != WL_IDLE_STATUS) && (status != WL_NO_SSID_AVAIL) && (status != WL_SCAN_COMPLETED))
       {
         //KH
-        LOGDEBUG1("WiFi-begin: return1 = ", status);
+        NN_LOGDEBUG1("WiFi-begin: return1 = ", status);
         break;
       }
     }
@@ -135,7 +135,7 @@ int WiFiClass::begin(const char* ssid, const char *passphrase)
   }
 
   //KH
-  LOGDEBUG1("WiFi-begin: return2 = ", status);
+  NN_LOGDEBUG1("WiFi-begin: return2 = ", status);
 
   return status;
 }
@@ -159,7 +159,7 @@ uint8_t WiFiClass::beginAP(const char *ssid, uint8_t channel)
       if ((status != WL_IDLE_STATUS) && (status != WL_NO_SSID_AVAIL) && (status != WL_SCAN_COMPLETED))
       {
         //KH
-        LOGDEBUG1("WiFi-beginAP2: return1 = ", status);
+        NN_LOGDEBUG1("WiFi-beginAP2: return1 = ", status);
 
         break;
       }
@@ -171,7 +171,7 @@ uint8_t WiFiClass::beginAP(const char *ssid, uint8_t channel)
   }
 
   //KH
-  LOGDEBUG1("WiFi-beginAP2: return2 = ", status);
+  NN_LOGDEBUG1("WiFi-beginAP2: return2 = ", status);
 
   return status;
 }
@@ -197,7 +197,7 @@ uint8_t WiFiClass::beginAP(const char *ssid, const char* passphrase, uint8_t cha
       if ((status != WL_IDLE_STATUS) && (status != WL_NO_SSID_AVAIL) && (status != WL_SCAN_COMPLETED))
       {
         //KH
-        LOGDEBUG1("WiFi-beginAP3: return1 = ", status);
+        NN_LOGDEBUG1("WiFi-beginAP3: return1 = ", status);
 
         break;
       }
@@ -209,7 +209,7 @@ uint8_t WiFiClass::beginAP(const char *ssid, const char* passphrase, uint8_t cha
   }
 
   //KH
-  LOGDEBUG1("WiFi-beginAP3: return2 = ", status);
+  NN_LOGDEBUG1("WiFi-beginAP3: return2 = ", status);
 
   return status;
 }

diff --git a/src/utility/debug.h b/src/utility/debug.h
@@ -53,9 +53,9 @@
 
 // KH Add, v1.6.0
 #ifdef DEBUG_WIFININA_PORT
-  #define DBG_PORT      DEBUG_WIFININA_PORT
+  #define DBG_PORT_NN      DEBUG_WIFININA_PORT
 #else
-  #define DBG_PORT      Serial
+  #define DBG_PORT_NN     Serial
 #endif
 
 // Change _WIFININA_LOGLEVEL_ to set tracing and logging verbosity
@@ -72,25 +72,27 @@
 // Error waitResponse message
 #define ERROR_RESPONSE  ":Error waitResponse"
 
-#define LOGERROR(x)     if(_WIFININA_LOGLEVEL_>0) { DBG_PORT.print("[NN] "); DBG_PORT.println(x); }
-#define LOGERROR1(x,y)  if(_WIFININA_LOGLEVEL_>0) { DBG_PORT.print("[NN] "); DBG_PORT.print(x); DBG_PORT.print(" "); DBG_PORT.println(y); }
+#define NN_LOGERROR(x)     if(_WIFININA_LOGLEVEL_>0) { DBG_PORT_NN.print("[NN] "); DBG_PORT_NN.println(x); }
+#define NN_LOGERROR1(x,y)  if(_WIFININA_LOGLEVEL_>0) { DBG_PORT_NN.print("[NN] "); DBG_PORT_NN.print(x); DBG_PORT_NN.print(" "); DBG_PORT_NN.println(y); }
 
-#define LOGWARN(x)      if(_WIFININA_LOGLEVEL_>1) { DBG_PORT.print("[NN] "); DBG_PORT.println(x); }
-#define LOGWARN1(x,y)   if(_WIFININA_LOGLEVEL_>1) { DBG_PORT.print("[NN] "); DBG_PORT.print(x); DBG_PORT.print(" "); DBG_PORT.println(y); }
+#define NN_LOGWARN(x)      if(_WIFININA_LOGLEVEL_>1) { DBG_PORT_NN.print("[NN] "); DBG_PORT_NN.println(x); }
+#define NN_LOGWARN1(x,y)   if(_WIFININA_LOGLEVEL_>1) { DBG_PORT_NN.print("[NN] "); DBG_PORT_NN.print(x); DBG_PORT_NN.print(" "); DBG_PORT_NN.println(y); }
 
-#define LOGINFO(x)      if(_WIFININA_LOGLEVEL_>2) { DBG_PORT.print("[NN] "); DBG_PORT.println(x); }
-#define LOGINFO1(x,y)   if(_WIFININA_LOGLEVEL_>2) { DBG_PORT.print("[NN] "); DBG_PORT.print(x); DBG_PORT.print(" "); DBG_PORT.println(y); }
-#define LOGINFO2(x,y,z) if(_WIFININA_LOGLEVEL_>3) { DBG_PORT.print("[NN] "); DBG_PORT.print(x); DBG_PORT.print(" "); DBG_PORT.print(y); DBG_PORT.print(" "); DBG_PORT.println(z); }
-#define LOGINFO3(x,y,z,w) if(_WIFININA_LOGLEVEL_>3) { DBG_PORT.print("[NN] "); DBG_PORT.print(x); DBG_PORT.print(" "); DBG_PORT.print(y); DBG_PORT.print(" "); DBG_PORT.println(z); DBG_PORT.print(" "); DBG_PORT.println(w); }
+#define NN_LOGINFO(x)      if(_WIFININA_LOGLEVEL_>2) { DBG_PORT_NN.print("[NN] "); DBG_PORT_NN.println(x); }
+#define NN_LOGINFO1(x,y)   if(_WIFININA_LOGLEVEL_>2) { DBG_PORT_NN.print("[NN] "); DBG_PORT_NN.print(x); DBG_PORT_NN.print(" "); DBG_PORT_NN.println(y); }
+#define NN_LOGINFO2(x,y,z) if(_WIFININA_LOGLEVEL_>3) { DBG_PORT_NN.print("[NN] "); DBG_PORT_NN.print(x); DBG_PORT_NN.print(" "); DBG_PORT_NN.print(y); DBG_PORT_NN.print(" "); DBG_PORT_NN.println(z); }
+#define NN_LOGINFO3(x,y,z,w) if(_WIFININA_LOGLEVEL_>3) { DBG_PORT_NN.print("[NN] "); DBG_PORT_NN.print(x); DBG_PORT_NN.print(" "); DBG_PORT_NN.print(y); DBG_PORT_NN.print(" "); DBG_PORT_NN.println(z); DBG_PORT_NN.print(" "); DBG_PORT_NN.println(w); }
 
-#define LOGDEBUG(x)      if(_WIFININA_LOGLEVEL_>3) { DBG_PORT.print("[NN] "); DBG_PORT.println(x); }
-#define LOGDEBUG0(x)     if(_WIFININA_LOGLEVEL_>3) { DBG_PORT.print("[NN] "); DBG_PORT.print(x); }
-#define LOGDEBUG1(x,y)   if(_WIFININA_LOGLEVEL_>3) { DBG_PORT.print("[NN] "); DBG_PORT.print(x); DBG_PORT.print(" "); DBG_PORT.println(y); }
-#define LOGDEBUG2(x,y,z) if(_WIFININA_LOGLEVEL_>3) { DBG_PORT.print("[NN] "); DBG_PORT.print(x); DBG_PORT.print(" "); DBG_PORT.print(y); DBG_PORT.print(" "); DBG_PORT.println(z); }
-#define LOGDEBUG3(x,y,z,w) if(_WIFININA_LOGLEVEL_>3) { DBG_PORT.print("[NN] "); DBG_PORT.print(x); DBG_PORT.print(" "); DBG_PORT.print(y); DBG_PORT.print(" "); DBG_PORT.println(z); DBG_PORT.print(" "); DBG_PORT.println(w); }
+#define NN_LOGDEBUG(x)      if(_WIFININA_LOGLEVEL_>3) { DBG_PORT_NN.print("[NN] "); DBG_PORT_NN.println(x); }
+#define NN_LOGDEBUG0(x)     if(_WIFININA_LOGLEVEL_>3) { DBG_PORT_NN.print("[NN] "); DBG_PORT_NN.print(x); }
+#define NN_LOGDEBUG1(x,y)   if(_WIFININA_LOGLEVEL_>3) { DBG_PORT_NN.print("[NN] "); DBG_PORT_NN.print(x); DBG_PORT_NN.print(" "); DBG_PORT_NN.println(y); }
+#define NN_LOGDEBUG2(x,y,z) if(_WIFININA_LOGLEVEL_>3) { DBG_PORT_NN.print("[NN] "); DBG_PORT_NN.print(x); DBG_PORT_NN.print(" "); DBG_PORT_NN.print(y); DBG_PORT_NN.print(" "); DBG_PORT_NN.println(z); }
+#define NN_LOGDEBUG3(x,y,z,w) if(_WIFININA_LOGLEVEL_>3) { DBG_PORT_NN.print("[NN] "); DBG_PORT_NN.print(x); DBG_PORT_NN.print(" "); DBG_PORT_NN.print(y); DBG_PORT_NN.print(" "); DBG_PORT_NN.println(z); DBG_PORT_NN.print(" "); DBG_PORT_NN.println(w); }
 
 //////
 
+#if 0
+
 #define PRINT_FILE_LINE() do { 						\
 		Serial.print("[");Serial.print(__FILE__);		\
 		Serial.print("::");Serial.print(__LINE__);Serial.print("]");\
@@ -130,6 +132,8 @@
   #define WARN(args) do {} while (0);
 #endif
 
+#endif    // if 0
+
 
 //KH
 #define _DEBUG_SPI_     false
@@ -158,4 +162,5 @@
   #define TOGGLE_TRIGGER()
 #endif
 
+
 #endif    // Debug_H
diff --git a/src/utility/server_drv.cpp b/src/utility/server_drv.cpp
@@ -75,7 +75,7 @@ void ServerDrv::startServer(uint16_t port, uint8_t sock, uint8_t protMode)
 
   if (!SpiDrv::waitResponseCmd(START_SERVER_TCP_CMD, PARAM_NUMS_1, &_data, &_dataLen))
   {
-    LOGDEBUG1("ServerDrv::startServer1", ERROR_RESPONSE);
+    NN_LOGDEBUG1("ServerDrv::startServer1", ERROR_RESPONSE);
   }
 
   SpiDrv::spiSlaveDeselect();
@@ -102,7 +102,7 @@ void ServerDrv::startServer(uint32_t ipAddress, uint16_t port, uint8_t sock, uin
 
   if (!SpiDrv::waitResponseCmd(START_SERVER_TCP_CMD, PARAM_NUMS_1, &_data, &_dataLen))
   {
-    LOGDEBUG1("ServerDrv::startServer2", ERROR_RESPONSE);
+    NN_LOGDEBUG1("ServerDrv::startServer2", ERROR_RESPONSE);
   }
 
   SpiDrv::spiSlaveDeselect();
@@ -130,7 +130,7 @@ void ServerDrv::startClient(uint32_t ipAddress, uint16_t port, uint8_t sock, uin
 
   if (!SpiDrv::waitResponseCmd(START_CLIENT_TCP_CMD, PARAM_NUMS_1, &_data, &_dataLen))
   {
-    LOGDEBUG1("ServerDrv::startClient1", ERROR_RESPONSE);
+    NN_LOGDEBUG1("ServerDrv::startClient1", ERROR_RESPONSE);
   }
 
   SpiDrv::spiSlaveDeselect();
@@ -167,7 +167,7 @@ void ServerDrv::startClient(const char* host, uint8_t host_len, uint32_t ipAddre
 
   if (!SpiDrv::waitResponseCmd(START_CLIENT_TCP_CMD, PARAM_NUMS_1, &_data, &_dataLen))
   {
-    LOGDEBUG1("ServerDrv::startClient2", ERROR_RESPONSE);
+    NN_LOGDEBUG1("ServerDrv::startClient2", ERROR_RESPONSE);
   }
 
   SpiDrv::spiSlaveDeselect();
@@ -196,7 +196,7 @@ void ServerDrv::stopClient(uint8_t sock)
 
   if (!SpiDrv::waitResponseCmd(STOP_CLIENT_TCP_CMD, PARAM_NUMS_1, &_data, &_dataLen))
   {
-    LOGDEBUG1("ServerDrv::stopClient", ERROR_RESPONSE);
+    NN_LOGDEBUG1("ServerDrv::stopClient", ERROR_RESPONSE);
   }
 
   SpiDrv::spiSlaveDeselect();
@@ -225,7 +225,7 @@ uint8_t ServerDrv::getServerState(uint8_t sock)
 
   if (!SpiDrv::waitResponseCmd(GET_STATE_TCP_CMD, PARAM_NUMS_1, &_data, &_dataLen))
   {
-    LOGDEBUG1("ServerDrv::getServerState", ERROR_RESPONSE);
+    NN_LOGDEBUG1("ServerDrv::getServerState", ERROR_RESPONSE);
   }
 
   SpiDrv::spiSlaveDeselect();
@@ -255,7 +255,7 @@ uint8_t ServerDrv::getClientState(uint8_t sock)
 
   if (!SpiDrv::waitResponseCmd(GET_CLIENT_STATE_TCP_CMD, PARAM_NUMS_1, &_data, &_dataLen))
   {
-    LOGDEBUG1("ServerDrv::getClientState", ERROR_RESPONSE);
+    NN_LOGDEBUG1("ServerDrv::getClientState", ERROR_RESPONSE);
   }
 
   SpiDrv::spiSlaveDeselect();
@@ -351,7 +351,7 @@ bool ServerDrv::getData(uint8_t sock, uint8_t *data, uint8_t peek)
 
   if (!SpiDrv::waitResponseData8(GET_DATA_TCP_CMD, &_data, &_dataLen))
   {
-    LOGDEBUG1("ServerDrv::getData", ERROR_RESPONSE);
+    NN_LOGDEBUG1("ServerDrv::getData", ERROR_RESPONSE);
   }
 
   SpiDrv::spiSlaveDeselect();
@@ -392,7 +392,7 @@ bool ServerDrv::getDataBuf(uint8_t sock, uint8_t *_data, uint16_t *_dataLen)
   // Wait for reply
   if (!SpiDrv::waitResponseData16(GET_DATABUF_TCP_CMD, _data, _dataLen))
   {
-    LOGDEBUG1("ServerDrv::getDataBuf", ERROR_RESPONSE);
+    NN_LOGDEBUG1("ServerDrv::getDataBuf", ERROR_RESPONSE);
   }
 
   SpiDrv::spiSlaveDeselect();
@@ -433,7 +433,7 @@ bool ServerDrv::insertDataBuf(uint8_t sock, const uint8_t *data, uint16_t _len)
 
   if (!SpiDrv::waitResponseData8(INSERT_DATABUF_CMD, &_data, &_dataLen))
   {
-    LOGDEBUG1("ServerDrv::insertDataBuf", ERROR_RESPONSE);
+    NN_LOGDEBUG1("ServerDrv::insertDataBuf", ERROR_RESPONSE);
   }
 
   SpiDrv::spiSlaveDeselect();
@@ -468,7 +468,7 @@ bool ServerDrv::sendUdpData(uint8_t sock)
 
   if (!SpiDrv::waitResponseData8(SEND_DATA_UDP_CMD, &_data, &_dataLen))
   {
-    LOGDEBUG1("ServerDrv::sendUdpData", ERROR_RESPONSE);
+    NN_LOGDEBUG1("ServerDrv::sendUdpData", ERROR_RESPONSE);
   }
 
   SpiDrv::spiSlaveDeselect();
@@ -509,7 +509,7 @@ uint16_t ServerDrv::sendData(uint8_t sock, const uint8_t *data, uint16_t len)
 
   if (!SpiDrv::waitResponseData8(SEND_DATA_TCP_CMD, (uint8_t*)&_data, &_dataLen))
   {
-    LOGDEBUG1("ServerDrv::sendData", ERROR_RESPONSE);
+    NN_LOGDEBUG1("ServerDrv::sendData", ERROR_RESPONSE);
   }
 
   SpiDrv::spiSlaveDeselect();
@@ -544,7 +544,7 @@ uint8_t ServerDrv::checkDataSent(uint8_t sock)
     // Wait for reply
     if (!SpiDrv::waitResponseCmd(DATA_SENT_TCP_CMD, PARAM_NUMS_1, &_data, &_dataLen))
     {
-      LOGDEBUG1("ServerDrv::checkDataSent", ERROR_RESPONSE);
+      NN_LOGDEBUG1("ServerDrv::checkDataSent", ERROR_RESPONSE);
     }
 
     SpiDrv::spiSlaveDeselect();
Original file line number	Diff line number	Diff line change
Expand Up		@@ -102,4 +102,5 @@ class WiFiUDP : public UDP
		friend class WiFiDrv;
		};


		#endif //WiFiUDP_Generic_h