v1.7.1 to fix bug

### Release v1.7.1 1. Fix bug for RP2040 using `arduino-pico` core
khoih-prog · Apr 27, 2022 · cdb027a · cdb027a
1 parent e2c3a8f
commit cdb027a
Show file tree

Hide file tree

Showing 8 changed files with 137 additions and 57 deletions.
diff --git a/src/WiFiManager_NINA_Lite_DUE.h b/src/WiFiManager_NINA_Lite_DUE.h
@@ -9,7 +9,7 @@
   Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite
   Licensed under MIT license
 
-  Version: 1.7.0
+  Version: 1.7.1
 
   Version Modified By   Date        Comments
   ------- -----------  ----------   -----------
@@ -20,6 +20,7 @@
   1.6.2   K Hoang      18/02/2022  Optional Board_Name in Menu. Optimize code by using passing by reference
   1.6.3   K Hoang      20/02/2022  Add optional CONFIG_MODE_LED. Add function to signal system is in Config Portal mode.
   1.7.0   K Hoang      27/04/2022  Use WiFiMulti_Generic library for auto-checking / auto-reconnecting MultiWiFi
+  1.7.1   K Hoang      27/04/2022  Fix bug for RP2040 using arduino-pico core
   **********************************************************************************************************************************/
 
 #ifndef WiFiManager_NINA_Lite_DUE_h
@@ -39,13 +40,13 @@
 #endif
 
 #ifndef WIFIMANAGER_NINA_LITE_VERSION
-  #define WIFIMANAGER_NINA_LITE_VERSION            "WiFiManager_NINA_Lite v1.7.0"
+  #define WIFIMANAGER_NINA_LITE_VERSION            "WiFiManager_NINA_Lite v1.7.1"
 
   #define WIFIMANAGER_NINA_LITE_VERSION_MAJOR      1
   #define WIFIMANAGER_NINA_LITE_VERSION_MINOR      7
-  #define WIFIMANAGER_NINA_LITE_VERSION_PATCH      0
+  #define WIFIMANAGER_NINA_LITE_VERSION_PATCH      1
 
-#define WIFIMANAGER_NINA_LITE_VERSION_INT          1007000
+#define WIFIMANAGER_NINA_LITE_VERSION_INT          1007001
 
 #endif
 
@@ -407,8 +408,7 @@ class WiFiManager_NINA_Lite
       {
         hadConfigData = true;
 
-        wifiMulti.addAP(WIFININA_config.WiFi_Creds[0].wifi_ssid, WIFININA_config.WiFi_Creds[0].wifi_pw);
-  			wifiMulti.addAP(WIFININA_config.WiFi_Creds[1].wifi_ssid, WIFININA_config.WiFi_Creds[1].wifi_pw);
+        wifiMulti_addAP();
 
         if (connectMultiWiFi(RETRY_TIMES_CONNECT_WIFI))
         {
@@ -962,6 +962,18 @@ class WiFiManager_NINA_Lite
       WN_LOGERROR3(F("SSID="), WiFi.SSID(), F(",RSSI="), WiFi.RSSI());
       WN_LOGERROR1(F("IP="), localIP() );
     }
+
+    //////////////////////////////////////////////
+
+    void wifiMulti_addAP()    
+    {
+      for (uint8_t index = 0; index < NUM_WIFI_CREDENTIALS; index++)
+      {
+        wifiMulti.addAP(WIFININA_config.WiFi_Creds[index].wifi_ssid, WIFININA_config.WiFi_Creds[index].wifi_pw);
+  	  }
+  	}  
+
+    //////////////////////////////////////////////
 
 #define WIFININA_BOARD_TYPE       "WIFININA"
 #define WM_NO_CONFIG              "blank"
@@ -1326,8 +1338,7 @@ class WiFiManager_NINA_Lite
       dueFlashStorage_putDynamicData();
 #endif      
 
-      wifiMulti.addAP(WIFININA_config.WiFi_Creds[0].wifi_ssid, WIFININA_config.WiFi_Creds[0].wifi_pw);
-  	  wifiMulti.addAP(WIFININA_config.WiFi_Creds[1].wifi_ssid, WIFININA_config.WiFi_Creds[1].wifi_pw);
+      wifiMulti_addAP();
     }
 
     //////////////////////////////////////////////

diff --git a/src/WiFiManager_NINA_Lite_Debug.h b/src/WiFiManager_NINA_Lite_Debug.h
@@ -9,7 +9,7 @@
   Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite
   Licensed under MIT license
   
-  Version: 1.7.0
+  Version: 1.7.1
 
   Version Modified By   Date        Comments
   ------- -----------  ----------   -----------
@@ -20,6 +20,7 @@
   1.6.2   K Hoang      18/02/2022  Optional Board_Name in Menu. Optimize code by using passing by reference
   1.6.3   K Hoang      20/02/2022  Add optional CONFIG_MODE_LED. Add function to signal system is in Config Portal mode.
   1.7.0   K Hoang      27/04/2022  Use WiFiMulti_Generic library for auto-checking / auto-reconnecting MultiWiFi
+  1.7.1   K Hoang      27/04/2022  Fix bug for RP2040 using arduino-pico core
   **********************************************************************************************************************************/
 
 #ifndef WiFiManager_NINA_Lite_Debug_h

diff --git a/src/WiFiManager_NINA_Lite_RP2040.h b/src/WiFiManager_NINA_Lite_RP2040.h
@@ -9,7 +9,7 @@
   Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite
   Licensed under MIT license
 
-  Version: 1.7.0
+  Version: 1.7.1
 
   Version Modified By   Date        Comments
   ------- -----------  ----------   -----------
@@ -20,6 +20,7 @@
   1.6.2   K Hoang      18/02/2022  Optional Board_Name in Menu. Optimize code by using passing by reference
   1.6.3   K Hoang      20/02/2022  Add optional CONFIG_MODE_LED. Add function to signal system is in Config Portal mode.
   1.7.0   K Hoang      27/04/2022  Use WiFiMulti_Generic library for auto-checking / auto-reconnecting MultiWiFi
+  1.7.1   K Hoang      27/04/2022  Fix bug for RP2040 using arduino-pico core
   **********************************************************************************************************************************/
 
 #ifndef WiFiManager_NINA_Lite_RP2040_h
@@ -36,13 +37,13 @@
 #endif
 
 #ifndef WIFIMANAGER_NINA_LITE_VERSION
-  #define WIFIMANAGER_NINA_LITE_VERSION            "WiFiManager_NINA_Lite v1.7.0"
+  #define WIFIMANAGER_NINA_LITE_VERSION            "WiFiManager_NINA_Lite v1.7.1"
 
   #define WIFIMANAGER_NINA_LITE_VERSION_MAJOR      1
   #define WIFIMANAGER_NINA_LITE_VERSION_MINOR      7
-  #define WIFIMANAGER_NINA_LITE_VERSION_PATCH      0
+  #define WIFIMANAGER_NINA_LITE_VERSION_PATCH      1
 
-#define WIFIMANAGER_NINA_LITE_VERSION_INT          1007000
+#define WIFIMANAGER_NINA_LITE_VERSION_INT          1007001
 
 #endif
 
@@ -403,8 +404,7 @@ class WiFiManager_NINA_Lite
       {
         hadConfigData = true;
 
-        wifiMulti.addAP(WIFININA_config.WiFi_Creds[0].wifi_ssid, WIFININA_config.WiFi_Creds[0].wifi_pw);
-  			wifiMulti.addAP(WIFININA_config.WiFi_Creds[1].wifi_ssid, WIFININA_config.WiFi_Creds[1].wifi_pw);
+        wifiMulti_addAP();
 
         if (connectMultiWiFi(RETRY_TIMES_CONNECT_WIFI))
         {
@@ -1004,6 +1004,18 @@ class WiFiManager_NINA_Lite
       WN_LOGERROR3(F("SSID="), WiFi.SSID(), F(",RSSI="), WiFi.RSSI());
       WN_LOGERROR1(F("IP="), localIP() );
     }
+
+    //////////////////////////////////////////////
+
+    void wifiMulti_addAP()    
+    {
+      for (uint8_t index = 0; index < NUM_WIFI_CREDENTIALS; index++)
+      {
+        wifiMulti.addAP(WIFININA_config.WiFi_Creds[index].wifi_ssid, WIFININA_config.WiFi_Creds[index].wifi_pw);
+  	  }
+  	}  
+
+    //////////////////////////////////////////////
 
 #define WIFININA_BOARD_TYPE       "WIFININA"
 #define WM_NO_CONFIG              "blank"
@@ -1498,8 +1510,7 @@ class WiFiManager_NINA_Lite
       saveDynamicData();
 #endif
 
-      wifiMulti.addAP(WIFININA_config.WiFi_Creds[0].wifi_ssid, WIFININA_config.WiFi_Creds[0].wifi_pw);
-  	  wifiMulti.addAP(WIFININA_config.WiFi_Creds[1].wifi_ssid, WIFININA_config.WiFi_Creds[1].wifi_pw);
+      wifiMulti_addAP();
     }
 
 //////////////////////////////////////////////
@@ -1978,6 +1989,8 @@ class WiFiManager_NINA_Lite
 #if USE_DYNAMIC_PARAMETERS      
       saveDynamicData();
 #endif
+
+      wifiMulti_addAP();
     }
 
 //////////////////////////////////////////////

diff --git a/src/WiFiManager_NINA_Lite_SAMD.h b/src/WiFiManager_NINA_Lite_SAMD.h
@@ -9,7 +9,7 @@
   Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite
   Licensed under MIT license
 
-  Version: 1.7.0
+  Version: 1.7.1
 
   Version Modified By   Date        Comments
   ------- -----------  ----------   -----------
@@ -20,6 +20,7 @@
   1.6.2   K Hoang      18/02/2022  Optional Board_Name in Menu. Optimize code by using passing by reference
   1.6.3   K Hoang      20/02/2022  Add optional CONFIG_MODE_LED. Add function to signal system is in Config Portal mode.
   1.7.0   K Hoang      27/04/2022  Use WiFiMulti_Generic library for auto-checking / auto-reconnecting MultiWiFi
+  1.7.1   K Hoang      27/04/2022  Fix bug for RP2040 using arduino-pico core
   **********************************************************************************************************************************/
 
 #ifndef WiFiManager_NINA_Lite_SAMD_h
@@ -42,13 +43,13 @@
 #endif
 
 #ifndef WIFIMANAGER_NINA_LITE_VERSION
-  #define WIFIMANAGER_NINA_LITE_VERSION            "WiFiManager_NINA_Lite v1.7.0"
+  #define WIFIMANAGER_NINA_LITE_VERSION            "WiFiManager_NINA_Lite v1.7.1"
 
   #define WIFIMANAGER_NINA_LITE_VERSION_MAJOR      1
   #define WIFIMANAGER_NINA_LITE_VERSION_MINOR      7
-  #define WIFIMANAGER_NINA_LITE_VERSION_PATCH      0
+  #define WIFIMANAGER_NINA_LITE_VERSION_PATCH      1
 
-#define WIFIMANAGER_NINA_LITE_VERSION_INT          1007000
+#define WIFIMANAGER_NINA_LITE_VERSION_INT          1007001
 
 #endif
 
@@ -404,8 +405,7 @@ class WiFiManager_NINA_Lite
       {
         hadConfigData = true;
 
-        wifiMulti.addAP(WIFININA_config.WiFi_Creds[0].wifi_ssid, WIFININA_config.WiFi_Creds[0].wifi_pw);
-  			wifiMulti.addAP(WIFININA_config.WiFi_Creds[1].wifi_ssid, WIFININA_config.WiFi_Creds[1].wifi_pw);
+        wifiMulti_addAP();
 
         if (connectMultiWiFi(RETRY_TIMES_CONNECT_WIFI))
         {
@@ -988,6 +988,18 @@ class WiFiManager_NINA_Lite
       WN_LOGERROR3(F("SSID="), WiFi.SSID(), F(",RSSI="), WiFi.RSSI());
       WN_LOGERROR1(F("IP="), localIP() );
     }
+
+    //////////////////////////////////////////////
+
+    void wifiMulti_addAP()    
+    {
+      for (uint8_t index = 0; index < NUM_WIFI_CREDENTIALS; index++)
+      {
+        wifiMulti.addAP(WIFININA_config.WiFi_Creds[index].wifi_ssid, WIFININA_config.WiFi_Creds[index].wifi_pw);
+  	  }
+  	}  
+
+    //////////////////////////////////////////////
 
 #define WIFININA_BOARD_TYPE       "WIFININA"
 #define WM_NO_CONFIG              "blank"
@@ -1303,8 +1315,7 @@ class WiFiManager_NINA_Lite
       EEPROM_putDynamicData();
 #endif
 
-      wifiMulti.addAP(WIFININA_config.WiFi_Creds[0].wifi_ssid, WIFININA_config.WiFi_Creds[0].wifi_pw);
-  	  wifiMulti.addAP(WIFININA_config.WiFi_Creds[1].wifi_ssid, WIFININA_config.WiFi_Creds[1].wifi_pw);
+      wifiMulti_addAP();
     }
 
     //////////////////////////////////////////////

diff --git a/src/WiFiManager_NINA_Lite_SAMD_CP.h b/src/WiFiManager_NINA_Lite_SAMD_CP.h
@@ -9,7 +9,7 @@
   Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite
   Licensed under MIT license
 
-  Version: 1.7.0
+  Version: 1.7.1
 
   Version Modified By   Date        Comments
   ------- -----------  ----------   -----------
@@ -20,6 +20,7 @@
   1.6.2   K Hoang      18/02/2022  Optional Board_Name in Menu. Optimize code by using passing by reference
   1.6.3   K Hoang      20/02/2022  Add optional CONFIG_MODE_LED. Add function to signal system is in Config Portal mode.
   1.7.0   K Hoang      27/04/2022  Use WiFiMulti_Generic library for auto-checking / auto-reconnecting MultiWiFi
+  1.7.1   K Hoang      27/04/2022  Fix bug for RP2040 using arduino-pico core
   *****************************************************************************************************************************/
 
 #ifndef WiFiManager_NINA_Lite_SAMD_h
@@ -42,13 +43,13 @@
 #endif
 
 #ifndef WIFIMANAGER_NINA_LITE_VERSION
-  #define WIFIMANAGER_NINA_LITE_VERSION            "WiFiManager_NINA_Lite v1.7.0"
+  #define WIFIMANAGER_NINA_LITE_VERSION            "WiFiManager_NINA_Lite v1.7.1"
 
   #define WIFIMANAGER_NINA_LITE_VERSION_MAJOR      1
   #define WIFIMANAGER_NINA_LITE_VERSION_MINOR      7
-  #define WIFIMANAGER_NINA_LITE_VERSION_PATCH      0
+  #define WIFIMANAGER_NINA_LITE_VERSION_PATCH      1
 
-#define WIFIMANAGER_NINA_LITE_VERSION_INT          1007000
+#define WIFIMANAGER_NINA_LITE_VERSION_INT          1007001
 
 #endif
 
@@ -391,8 +392,7 @@ class WiFiManager_NINA_Lite
       {
         hadConfigData = true;
 
-        wifiMulti.addAP(WIFININA_config.WiFi_Creds[0].wifi_ssid, WIFININA_config.WiFi_Creds[0].wifi_pw);
-  			wifiMulti.addAP(WIFININA_config.WiFi_Creds[1].wifi_ssid, WIFININA_config.WiFi_Creds[1].wifi_pw);
+        wifiMulti_addAP();
 
         if (connectMultiWiFi(RETRY_TIMES_CONNECT_WIFI))
         {
@@ -972,6 +972,18 @@ class WiFiManager_NINA_Lite
       WN_LOGERROR3(F("SSID="), WiFi.SSID(), F(",RSSI="), WiFi.RSSI());
       WN_LOGERROR1(F("IP="), localIP() );
     }
+
+    //////////////////////////////////////////////
+
+    void wifiMulti_addAP()    
+    {
+      for (uint8_t index = 0; index < NUM_WIFI_CREDENTIALS; index++)
+      {
+        wifiMulti.addAP(WIFININA_config.WiFi_Creds[index].wifi_ssid, WIFININA_config.WiFi_Creds[index].wifi_pw);
+  	  }
+  	}  
+
+    //////////////////////////////////////////////
 
 #define WIFININA_BOARD_TYPE       "WIFININA"
 #define WM_NO_CONFIG              "blank"
@@ -1315,8 +1327,7 @@ class WiFiManager_NINA_Lite
       EEPROM_putDynamicData();
 #endif
 
-      wifiMulti.addAP(WIFININA_config.WiFi_Creds[0].wifi_ssid, WIFININA_config.WiFi_Creds[0].wifi_pw);
-  	  wifiMulti.addAP(WIFININA_config.WiFi_Creds[1].wifi_ssid, WIFININA_config.WiFi_Creds[1].wifi_pw);
+      wifiMulti_addAP();
     }
 
     //////////////////////////////////////////////

diff --git a/src/WiFiManager_NINA_Lite_STM32.h b/src/WiFiManager_NINA_Lite_STM32.h
@@ -9,7 +9,7 @@
   Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite
   Licensed under MIT license
 
-  Version: 1.7.0
+  Version: 1.7.1
 
   Version Modified By   Date        Comments
   ------- -----------  ----------   -----------
@@ -20,6 +20,7 @@
   1.6.2   K Hoang      18/02/2022  Optional Board_Name in Menu. Optimize code by using passing by reference
   1.6.3   K Hoang      20/02/2022  Add optional CONFIG_MODE_LED. Add function to signal system is in Config Portal mode.
   1.7.0   K Hoang      27/04/2022  Use WiFiMulti_Generic library for auto-checking / auto-reconnecting MultiWiFi
+  1.7.1   K Hoang      27/04/2022  Fix bug for RP2040 using arduino-pico core
   **********************************************************************************************************************************/
 
 #ifndef WiFiManager_NINA_Lite_STM32_h
@@ -37,13 +38,13 @@
 #endif
 
 #ifndef WIFIMANAGER_NINA_LITE_VERSION
-  #define WIFIMANAGER_NINA_LITE_VERSION            "WiFiManager_NINA_Lite v1.7.0"
+  #define WIFIMANAGER_NINA_LITE_VERSION            "WiFiManager_NINA_Lite v1.7.1"
 
   #define WIFIMANAGER_NINA_LITE_VERSION_MAJOR      1
   #define WIFIMANAGER_NINA_LITE_VERSION_MINOR      7
-  #define WIFIMANAGER_NINA_LITE_VERSION_PATCH      0
+  #define WIFIMANAGER_NINA_LITE_VERSION_PATCH      1
 
-#define WIFIMANAGER_NINA_LITE_VERSION_INT          1007000
+#define WIFIMANAGER_NINA_LITE_VERSION_INT          1007001
 
 #endif
 
@@ -400,8 +401,7 @@ class WiFiManager_NINA_Lite
       {
         hadConfigData = true;
 
-        wifiMulti.addAP(WIFININA_config.WiFi_Creds[0].wifi_ssid, WIFININA_config.WiFi_Creds[0].wifi_pw);
-  			wifiMulti.addAP(WIFININA_config.WiFi_Creds[1].wifi_ssid, WIFININA_config.WiFi_Creds[1].wifi_pw);
+        wifiMulti_addAP();
 
         if (connectMultiWiFi(RETRY_TIMES_CONNECT_WIFI))
         {
@@ -956,6 +956,18 @@ class WiFiManager_NINA_Lite
       WN_LOGERROR3(F("SSID="), WiFi.SSID(), F(",RSSI="), WiFi.RSSI());
       WN_LOGERROR1(F("IP="), localIP() );
     }
+
+    //////////////////////////////////////////////
+
+    void wifiMulti_addAP()    
+    {
+      for (uint8_t index = 0; index < NUM_WIFI_CREDENTIALS; index++)
+      {
+        wifiMulti.addAP(WIFININA_config.WiFi_Creds[index].wifi_ssid, WIFININA_config.WiFi_Creds[index].wifi_pw);
+  	  }
+  	}  
+
+    //////////////////////////////////////////////
 
 #define WIFININA_BOARD_TYPE       "WIFININA"
 #define WM_NO_CONFIG              "blank"
@@ -1279,8 +1291,7 @@ class WiFiManager_NINA_Lite
       EEPROM_putDynamicData();
 #endif
 
-      wifiMulti.addAP(WIFININA_config.WiFi_Creds[0].wifi_ssid, WIFININA_config.WiFi_Creds[0].wifi_pw);
-  	  wifiMulti.addAP(WIFININA_config.WiFi_Creds[1].wifi_ssid, WIFININA_config.WiFi_Creds[1].wifi_pw);
+      wifiMulti_addAP();
     }
 
     //////////////////////////////////////////////