Skip to content
This repository was archived by the owner on Jan 29, 2023. It is now read-only.

Commit cdb027a

Browse files
khoih-progkhoih-prog
authored
v1.7.1 to fix bug
### Release v1.7.1 1. Fix bug for RP2040 using `arduino-pico` core
1 parent e2c3a8f commit cdb027a

8 files changed

+137
-57
lines changed

‎src/WiFiManager_NINA_Lite_DUE.h‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite
1010
Licensed under MIT license
1111
12-
Version: 1.7.0
12+
Version: 1.7.1
1313
1414
Version Modified By Date Comments
1515
------- ----------- ---------- -----------
@@ -20,6 +20,7 @@
2020
1.6.2 K Hoang 18/02/2022 Optional Board_Name in Menu. Optimize code by using passing by reference
2121
1.6.3 K Hoang 20/02/2022 Add optional CONFIG_MODE_LED. Add function to signal system is in Config Portal mode.
2222
1.7.0 K Hoang 27/04/2022 Use WiFiMulti_Generic library for auto-checking / auto-reconnecting MultiWiFi
23+
1.7.1 K Hoang 27/04/2022 Fix bug for RP2040 using arduino-pico core
2324
**********************************************************************************************************************************/
2425

2526
#ifndef WiFiManager_NINA_Lite_DUE_h
@@ -39,13 +40,13 @@
3940
#endif
4041

4142
#ifndef WIFIMANAGER_NINA_LITE_VERSION
42-
#define WIFIMANAGER_NINA_LITE_VERSION "WiFiManager_NINA_Lite v1.7.0"
43+
#define WIFIMANAGER_NINA_LITE_VERSION "WiFiManager_NINA_Lite v1.7.1"
4344

4445
#define WIFIMANAGER_NINA_LITE_VERSION_MAJOR 1
4546
#define WIFIMANAGER_NINA_LITE_VERSION_MINOR 7
46-
#define WIFIMANAGER_NINA_LITE_VERSION_PATCH 0
47+
#define WIFIMANAGER_NINA_LITE_VERSION_PATCH 1
4748

48-
#define WIFIMANAGER_NINA_LITE_VERSION_INT 1007000
49+
#define WIFIMANAGER_NINA_LITE_VERSION_INT 1007001
4950

5051
#endif
5152

@@ -407,8 +408,7 @@ class WiFiManager_NINA_Lite
407408
{
408409
hadConfigData = true;
409410

410-
wifiMulti.addAP(WIFININA_config.WiFi_Creds[0].wifi_ssid, WIFININA_config.WiFi_Creds[0].wifi_pw);
411-
wifiMulti.addAP(WIFININA_config.WiFi_Creds[1].wifi_ssid, WIFININA_config.WiFi_Creds[1].wifi_pw);
411+
wifiMulti_addAP();
412412

413413
if (connectMultiWiFi(RETRY_TIMES_CONNECT_WIFI))
414414
{
@@ -962,6 +962,18 @@ class WiFiManager_NINA_Lite
962962
WN_LOGERROR3(F("SSID="), WiFi.SSID(), F(",RSSI="), WiFi.RSSI());
963963
WN_LOGERROR1(F("IP="), localIP() );
964964
}
965+
966+
//////////////////////////////////////////////
967+
968+
void wifiMulti_addAP()
969+
{
970+
for (uint8_t index = 0; index < NUM_WIFI_CREDENTIALS; index++)
971+
{
972+
wifiMulti.addAP(WIFININA_config.WiFi_Creds[index].wifi_ssid, WIFININA_config.WiFi_Creds[index].wifi_pw);
973+
}
974+
}
975+
976+
//////////////////////////////////////////////
965977

966978
#define WIFININA_BOARD_TYPE "WIFININA"
967979
#define WM_NO_CONFIG "blank"
@@ -1326,8 +1338,7 @@ class WiFiManager_NINA_Lite
13261338
dueFlashStorage_putDynamicData();
13271339
#endif
13281340

1329-
wifiMulti.addAP(WIFININA_config.WiFi_Creds[0].wifi_ssid, WIFININA_config.WiFi_Creds[0].wifi_pw);
1330-
wifiMulti.addAP(WIFININA_config.WiFi_Creds[1].wifi_ssid, WIFININA_config.WiFi_Creds[1].wifi_pw);
1341+
wifiMulti_addAP();
13311342
}
13321343

13331344
//////////////////////////////////////////////

‎src/WiFiManager_NINA_Lite_Debug.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite
1010
Licensed under MIT license
1111
12-
Version: 1.7.0
12+
Version: 1.7.1
1313
1414
Version Modified By Date Comments
1515
------- ----------- ---------- -----------
@@ -20,6 +20,7 @@
2020
1.6.2 K Hoang 18/02/2022 Optional Board_Name in Menu. Optimize code by using passing by reference
2121
1.6.3 K Hoang 20/02/2022 Add optional CONFIG_MODE_LED. Add function to signal system is in Config Portal mode.
2222
1.7.0 K Hoang 27/04/2022 Use WiFiMulti_Generic library for auto-checking / auto-reconnecting MultiWiFi
23+
1.7.1 K Hoang 27/04/2022 Fix bug for RP2040 using arduino-pico core
2324
**********************************************************************************************************************************/
2425

2526
#ifndef WiFiManager_NINA_Lite_Debug_h

‎src/WiFiManager_NINA_Lite_RP2040.h‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite
1010
Licensed under MIT license
1111
12-
Version: 1.7.0
12+
Version: 1.7.1
1313
1414
Version Modified By Date Comments
1515
------- ----------- ---------- -----------
@@ -20,6 +20,7 @@
2020
1.6.2 K Hoang 18/02/2022 Optional Board_Name in Menu. Optimize code by using passing by reference
2121
1.6.3 K Hoang 20/02/2022 Add optional CONFIG_MODE_LED. Add function to signal system is in Config Portal mode.
2222
1.7.0 K Hoang 27/04/2022 Use WiFiMulti_Generic library for auto-checking / auto-reconnecting MultiWiFi
23+
1.7.1 K Hoang 27/04/2022 Fix bug for RP2040 using arduino-pico core
2324
**********************************************************************************************************************************/
2425

2526
#ifndef WiFiManager_NINA_Lite_RP2040_h
@@ -36,13 +37,13 @@
3637
#endif
3738

3839
#ifndef WIFIMANAGER_NINA_LITE_VERSION
39-
#define WIFIMANAGER_NINA_LITE_VERSION "WiFiManager_NINA_Lite v1.7.0"
40+
#define WIFIMANAGER_NINA_LITE_VERSION "WiFiManager_NINA_Lite v1.7.1"
4041

4142
#define WIFIMANAGER_NINA_LITE_VERSION_MAJOR 1
4243
#define WIFIMANAGER_NINA_LITE_VERSION_MINOR 7
43-
#define WIFIMANAGER_NINA_LITE_VERSION_PATCH 0
44+
#define WIFIMANAGER_NINA_LITE_VERSION_PATCH 1
4445

45-
#define WIFIMANAGER_NINA_LITE_VERSION_INT 1007000
46+
#define WIFIMANAGER_NINA_LITE_VERSION_INT 1007001
4647

4748
#endif
4849

@@ -403,8 +404,7 @@ class WiFiManager_NINA_Lite
403404
{
404405
hadConfigData = true;
405406

406-
wifiMulti.addAP(WIFININA_config.WiFi_Creds[0].wifi_ssid, WIFININA_config.WiFi_Creds[0].wifi_pw);
407-
wifiMulti.addAP(WIFININA_config.WiFi_Creds[1].wifi_ssid, WIFININA_config.WiFi_Creds[1].wifi_pw);
407+
wifiMulti_addAP();
408408

409409
if (connectMultiWiFi(RETRY_TIMES_CONNECT_WIFI))
410410
{
@@ -1004,6 +1004,18 @@ class WiFiManager_NINA_Lite
10041004
WN_LOGERROR3(F("SSID="), WiFi.SSID(), F(",RSSI="), WiFi.RSSI());
10051005
WN_LOGERROR1(F("IP="), localIP() );
10061006
}
1007+
1008+
//////////////////////////////////////////////
1009+
1010+
void wifiMulti_addAP()
1011+
{
1012+
for (uint8_t index = 0; index < NUM_WIFI_CREDENTIALS; index++)
1013+
{
1014+
wifiMulti.addAP(WIFININA_config.WiFi_Creds[index].wifi_ssid, WIFININA_config.WiFi_Creds[index].wifi_pw);
1015+
}
1016+
}
1017+
1018+
//////////////////////////////////////////////
10071019

10081020
#define WIFININA_BOARD_TYPE "WIFININA"
10091021
#define WM_NO_CONFIG "blank"
@@ -1498,8 +1510,7 @@ class WiFiManager_NINA_Lite
14981510
saveDynamicData();
14991511
#endif
15001512

1501-
wifiMulti.addAP(WIFININA_config.WiFi_Creds[0].wifi_ssid, WIFININA_config.WiFi_Creds[0].wifi_pw);
1502-
wifiMulti.addAP(WIFININA_config.WiFi_Creds[1].wifi_ssid, WIFININA_config.WiFi_Creds[1].wifi_pw);
1513+
wifiMulti_addAP();
15031514
}
15041515

15051516
//////////////////////////////////////////////
@@ -1978,6 +1989,8 @@ class WiFiManager_NINA_Lite
19781989
#if USE_DYNAMIC_PARAMETERS
19791990
saveDynamicData();
19801991
#endif
1992+
1993+
wifiMulti_addAP();
19811994
}
19821995

19831996
//////////////////////////////////////////////

‎src/WiFiManager_NINA_Lite_SAMD.h‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite
1010
Licensed under MIT license
1111
12-
Version: 1.7.0
12+
Version: 1.7.1
1313
1414
Version Modified By Date Comments
1515
------- ----------- ---------- -----------
@@ -20,6 +20,7 @@
2020
1.6.2 K Hoang 18/02/2022 Optional Board_Name in Menu. Optimize code by using passing by reference
2121
1.6.3 K Hoang 20/02/2022 Add optional CONFIG_MODE_LED. Add function to signal system is in Config Portal mode.
2222
1.7.0 K Hoang 27/04/2022 Use WiFiMulti_Generic library for auto-checking / auto-reconnecting MultiWiFi
23+
1.7.1 K Hoang 27/04/2022 Fix bug for RP2040 using arduino-pico core
2324
**********************************************************************************************************************************/
2425

2526
#ifndef WiFiManager_NINA_Lite_SAMD_h
@@ -42,13 +43,13 @@
4243
#endif
4344

4445
#ifndef WIFIMANAGER_NINA_LITE_VERSION
45-
#define WIFIMANAGER_NINA_LITE_VERSION "WiFiManager_NINA_Lite v1.7.0"
46+
#define WIFIMANAGER_NINA_LITE_VERSION "WiFiManager_NINA_Lite v1.7.1"
4647

4748
#define WIFIMANAGER_NINA_LITE_VERSION_MAJOR 1
4849
#define WIFIMANAGER_NINA_LITE_VERSION_MINOR 7
49-
#define WIFIMANAGER_NINA_LITE_VERSION_PATCH 0
50+
#define WIFIMANAGER_NINA_LITE_VERSION_PATCH 1
5051

51-
#define WIFIMANAGER_NINA_LITE_VERSION_INT 1007000
52+
#define WIFIMANAGER_NINA_LITE_VERSION_INT 1007001
5253

5354
#endif
5455

@@ -404,8 +405,7 @@ class WiFiManager_NINA_Lite
404405
{
405406
hadConfigData = true;
406407

407-
wifiMulti.addAP(WIFININA_config.WiFi_Creds[0].wifi_ssid, WIFININA_config.WiFi_Creds[0].wifi_pw);
408-
wifiMulti.addAP(WIFININA_config.WiFi_Creds[1].wifi_ssid, WIFININA_config.WiFi_Creds[1].wifi_pw);
408+
wifiMulti_addAP();
409409

410410
if (connectMultiWiFi(RETRY_TIMES_CONNECT_WIFI))
411411
{
@@ -988,6 +988,18 @@ class WiFiManager_NINA_Lite
988988
WN_LOGERROR3(F("SSID="), WiFi.SSID(), F(",RSSI="), WiFi.RSSI());
989989
WN_LOGERROR1(F("IP="), localIP() );
990990
}
991+
992+
//////////////////////////////////////////////
993+
994+
void wifiMulti_addAP()
995+
{
996+
for (uint8_t index = 0; index < NUM_WIFI_CREDENTIALS; index++)
997+
{
998+
wifiMulti.addAP(WIFININA_config.WiFi_Creds[index].wifi_ssid, WIFININA_config.WiFi_Creds[index].wifi_pw);
999+
}
1000+
}
1001+
1002+
//////////////////////////////////////////////
9911003

9921004
#define WIFININA_BOARD_TYPE "WIFININA"
9931005
#define WM_NO_CONFIG "blank"
@@ -1303,8 +1315,7 @@ class WiFiManager_NINA_Lite
13031315
EEPROM_putDynamicData();
13041316
#endif
13051317

1306-
wifiMulti.addAP(WIFININA_config.WiFi_Creds[0].wifi_ssid, WIFININA_config.WiFi_Creds[0].wifi_pw);
1307-
wifiMulti.addAP(WIFININA_config.WiFi_Creds[1].wifi_ssid, WIFININA_config.WiFi_Creds[1].wifi_pw);
1318+
wifiMulti_addAP();
13081319
}
13091320

13101321
//////////////////////////////////////////////

‎src/WiFiManager_NINA_Lite_SAMD_CP.h‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite
1010
Licensed under MIT license
1111
12-
Version: 1.7.0
12+
Version: 1.7.1
1313
1414
Version Modified By Date Comments
1515
------- ----------- ---------- -----------
@@ -20,6 +20,7 @@
2020
1.6.2 K Hoang 18/02/2022 Optional Board_Name in Menu. Optimize code by using passing by reference
2121
1.6.3 K Hoang 20/02/2022 Add optional CONFIG_MODE_LED. Add function to signal system is in Config Portal mode.
2222
1.7.0 K Hoang 27/04/2022 Use WiFiMulti_Generic library for auto-checking / auto-reconnecting MultiWiFi
23+
1.7.1 K Hoang 27/04/2022 Fix bug for RP2040 using arduino-pico core
2324
*****************************************************************************************************************************/
2425

2526
#ifndef WiFiManager_NINA_Lite_SAMD_h
@@ -42,13 +43,13 @@
4243
#endif
4344

4445
#ifndef WIFIMANAGER_NINA_LITE_VERSION
45-
#define WIFIMANAGER_NINA_LITE_VERSION "WiFiManager_NINA_Lite v1.7.0"
46+
#define WIFIMANAGER_NINA_LITE_VERSION "WiFiManager_NINA_Lite v1.7.1"
4647

4748
#define WIFIMANAGER_NINA_LITE_VERSION_MAJOR 1
4849
#define WIFIMANAGER_NINA_LITE_VERSION_MINOR 7
49-
#define WIFIMANAGER_NINA_LITE_VERSION_PATCH 0
50+
#define WIFIMANAGER_NINA_LITE_VERSION_PATCH 1
5051

51-
#define WIFIMANAGER_NINA_LITE_VERSION_INT 1007000
52+
#define WIFIMANAGER_NINA_LITE_VERSION_INT 1007001
5253

5354
#endif
5455

@@ -391,8 +392,7 @@ class WiFiManager_NINA_Lite
391392
{
392393
hadConfigData = true;
393394

394-
wifiMulti.addAP(WIFININA_config.WiFi_Creds[0].wifi_ssid, WIFININA_config.WiFi_Creds[0].wifi_pw);
395-
wifiMulti.addAP(WIFININA_config.WiFi_Creds[1].wifi_ssid, WIFININA_config.WiFi_Creds[1].wifi_pw);
395+
wifiMulti_addAP();
396396

397397
if (connectMultiWiFi(RETRY_TIMES_CONNECT_WIFI))
398398
{
@@ -972,6 +972,18 @@ class WiFiManager_NINA_Lite
972972
WN_LOGERROR3(F("SSID="), WiFi.SSID(), F(",RSSI="), WiFi.RSSI());
973973
WN_LOGERROR1(F("IP="), localIP() );
974974
}
975+
976+
//////////////////////////////////////////////
977+
978+
void wifiMulti_addAP()
979+
{
980+
for (uint8_t index = 0; index < NUM_WIFI_CREDENTIALS; index++)
981+
{
982+
wifiMulti.addAP(WIFININA_config.WiFi_Creds[index].wifi_ssid, WIFININA_config.WiFi_Creds[index].wifi_pw);
983+
}
984+
}
985+
986+
//////////////////////////////////////////////
975987

976988
#define WIFININA_BOARD_TYPE "WIFININA"
977989
#define WM_NO_CONFIG "blank"
@@ -1315,8 +1327,7 @@ class WiFiManager_NINA_Lite
13151327
EEPROM_putDynamicData();
13161328
#endif
13171329

1318-
wifiMulti.addAP(WIFININA_config.WiFi_Creds[0].wifi_ssid, WIFININA_config.WiFi_Creds[0].wifi_pw);
1319-
wifiMulti.addAP(WIFININA_config.WiFi_Creds[1].wifi_ssid, WIFININA_config.WiFi_Creds[1].wifi_pw);
1330+
wifiMulti_addAP();
13201331
}
13211332

13221333
//////////////////////////////////////////////

‎src/WiFiManager_NINA_Lite_STM32.h‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Built by Khoi Hoang https://github.com/khoih-prog/WiFiManager_NINA_Lite
1010
Licensed under MIT license
1111
12-
Version: 1.7.0
12+
Version: 1.7.1
1313
1414
Version Modified By Date Comments
1515
------- ----------- ---------- -----------
@@ -20,6 +20,7 @@
2020
1.6.2 K Hoang 18/02/2022 Optional Board_Name in Menu. Optimize code by using passing by reference
2121
1.6.3 K Hoang 20/02/2022 Add optional CONFIG_MODE_LED. Add function to signal system is in Config Portal mode.
2222
1.7.0 K Hoang 27/04/2022 Use WiFiMulti_Generic library for auto-checking / auto-reconnecting MultiWiFi
23+
1.7.1 K Hoang 27/04/2022 Fix bug for RP2040 using arduino-pico core
2324
**********************************************************************************************************************************/
2425

2526
#ifndef WiFiManager_NINA_Lite_STM32_h
@@ -37,13 +38,13 @@
3738
#endif
3839

3940
#ifndef WIFIMANAGER_NINA_LITE_VERSION
40-
#define WIFIMANAGER_NINA_LITE_VERSION "WiFiManager_NINA_Lite v1.7.0"
41+
#define WIFIMANAGER_NINA_LITE_VERSION "WiFiManager_NINA_Lite v1.7.1"
4142

4243
#define WIFIMANAGER_NINA_LITE_VERSION_MAJOR 1
4344
#define WIFIMANAGER_NINA_LITE_VERSION_MINOR 7
44-
#define WIFIMANAGER_NINA_LITE_VERSION_PATCH 0
45+
#define WIFIMANAGER_NINA_LITE_VERSION_PATCH 1
4546

46-
#define WIFIMANAGER_NINA_LITE_VERSION_INT 1007000
47+
#define WIFIMANAGER_NINA_LITE_VERSION_INT 1007001
4748

4849
#endif
4950

@@ -400,8 +401,7 @@ class WiFiManager_NINA_Lite
400401
{
401402
hadConfigData = true;
402403

403-
wifiMulti.addAP(WIFININA_config.WiFi_Creds[0].wifi_ssid, WIFININA_config.WiFi_Creds[0].wifi_pw);
404-
wifiMulti.addAP(WIFININA_config.WiFi_Creds[1].wifi_ssid, WIFININA_config.WiFi_Creds[1].wifi_pw);
404+
wifiMulti_addAP();
405405

406406
if (connectMultiWiFi(RETRY_TIMES_CONNECT_WIFI))
407407
{
@@ -956,6 +956,18 @@ class WiFiManager_NINA_Lite
956956
WN_LOGERROR3(F("SSID="), WiFi.SSID(), F(",RSSI="), WiFi.RSSI());
957957
WN_LOGERROR1(F("IP="), localIP() );
958958
}
959+
960+
//////////////////////////////////////////////
961+
962+
void wifiMulti_addAP()
963+
{
964+
for (uint8_t index = 0; index < NUM_WIFI_CREDENTIALS; index++)
965+
{
966+
wifiMulti.addAP(WIFININA_config.WiFi_Creds[index].wifi_ssid, WIFININA_config.WiFi_Creds[index].wifi_pw);
967+
}
968+
}
969+
970+
//////////////////////////////////////////////
959971

960972
#define WIFININA_BOARD_TYPE "WIFININA"
961973
#define WM_NO_CONFIG "blank"
@@ -1279,8 +1291,7 @@ class WiFiManager_NINA_Lite
12791291
EEPROM_putDynamicData();
12801292
#endif
12811293

1282-
wifiMulti.addAP(WIFININA_config.WiFi_Creds[0].wifi_ssid, WIFININA_config.WiFi_Creds[0].wifi_pw);
1283-
wifiMulti.addAP(WIFININA_config.WiFi_Creds[1].wifi_ssid, WIFININA_config.WiFi_Creds[1].wifi_pw);
1294+
wifiMulti_addAP();
12841295
}
12851296

12861297
//////////////////////////////////////////////

0 commit comments

Comments
 (0)