@@ -1505,7 +1505,7 @@ class ESP_WiFiManager_Lite
1505
1505
// ////////////////////////////////////
1506
1506
1507
1507
#define ESP_WML_BOARD_TYPE " ESP_WM_LITE"
1508
- #define WM_NO_CONFIG " blank"
1508
+ #define ESP_WML_NO_CONFIG " blank"
1509
1509
1510
1510
int calcChecksum ()
1511
1511
{
@@ -1527,20 +1527,20 @@ class ESP_WiFiManager_Lite
1527
1527
1528
1528
// If SSID = "blank" or NULL, or PWD length < 8 (as required by standard) => return false
1529
1529
// Only need 1 set of valid SSID/PWD
1530
- if (!( ( strncmp (ESP_WML_config.WiFi_Creds [0 ].wifi_ssid , WM_NO_CONFIG , strlen (WM_NO_CONFIG )) &&
1530
+ if (!( ( strncmp (ESP_WML_config.WiFi_Creds [0 ].wifi_ssid , ESP_WML_NO_CONFIG , strlen (ESP_WML_NO_CONFIG )) &&
1531
1531
( strlen (ESP_WML_config.WiFi_Creds [0 ].wifi_ssid ) > 0 ) ) &&
1532
1532
( strlen (ESP_WML_config.WiFi_Creds [0 ].wifi_pw ) >= PASSWORD_MIN_LEN ) ) ||
1533
- ( strncmp (ESP_WML_config.WiFi_Creds [1 ].wifi_ssid , WM_NO_CONFIG , strlen (WM_NO_CONFIG )) &&
1533
+ ( strncmp (ESP_WML_config.WiFi_Creds [1 ].wifi_ssid , ESP_WML_NO_CONFIG , strlen (ESP_WML_NO_CONFIG )) &&
1534
1534
( strlen (ESP_WML_config.WiFi_Creds [1 ].wifi_ssid ) > 0 ) &&
1535
1535
( strlen (ESP_WML_config.WiFi_Creds [1 ].wifi_pw ) >= PASSWORD_MIN_LEN ) ) )
1536
1536
#else
1537
1537
1538
1538
// If SSID = "blank" or NULL, or PWD length < 8 (as required by standard) => invalid set
1539
1539
// Need both sets of valid SSID/PWD
1540
- if ( !strncmp (ESP_WML_config.WiFi_Creds [0 ].wifi_ssid , WM_NO_CONFIG , strlen (WM_NO_CONFIG )) ||
1541
- !strncmp (ESP_WML_config.WiFi_Creds [0 ].wifi_pw , WM_NO_CONFIG , strlen (WM_NO_CONFIG )) ||
1542
- !strncmp (ESP_WML_config.WiFi_Creds [1 ].wifi_ssid , WM_NO_CONFIG , strlen (WM_NO_CONFIG )) ||
1543
- !strncmp (ESP_WML_config.WiFi_Creds [1 ].wifi_pw , WM_NO_CONFIG , strlen (WM_NO_CONFIG )) ||
1540
+ if ( !strncmp (ESP_WML_config.WiFi_Creds [0 ].wifi_ssid , ESP_WML_NO_CONFIG , strlen (ESP_WML_NO_CONFIG )) ||
1541
+ !strncmp (ESP_WML_config.WiFi_Creds [0 ].wifi_pw , ESP_WML_NO_CONFIG , strlen (ESP_WML_NO_CONFIG )) ||
1542
+ !strncmp (ESP_WML_config.WiFi_Creds [1 ].wifi_ssid , ESP_WML_NO_CONFIG , strlen (ESP_WML_NO_CONFIG )) ||
1543
+ !strncmp (ESP_WML_config.WiFi_Creds [1 ].wifi_pw , ESP_WML_NO_CONFIG , strlen (ESP_WML_NO_CONFIG )) ||
1544
1544
( strlen (ESP_WML_config.WiFi_Creds [0 ].wifi_ssid ) == 0 ) ||
1545
1545
( strlen (ESP_WML_config.WiFi_Creds [1 ].wifi_ssid ) == 0 ) ||
1546
1546
( strlen (ESP_WML_config.WiFi_Creds [0 ].wifi_pw ) < PASSWORD_MIN_LEN ) ||
@@ -2033,19 +2033,19 @@ class ESP_WiFiManager_Lite
2033
2033
{
2034
2034
memset (&ESP_WML_config, 0 , sizeof (ESP_WML_config));
2035
2035
2036
- strcpy (ESP_WML_config.WiFi_Creds [0 ].wifi_ssid , WM_NO_CONFIG );
2037
- strcpy (ESP_WML_config.WiFi_Creds [0 ].wifi_pw , WM_NO_CONFIG );
2038
- strcpy (ESP_WML_config.WiFi_Creds [1 ].wifi_ssid , WM_NO_CONFIG );
2039
- strcpy (ESP_WML_config.WiFi_Creds [1 ].wifi_pw , WM_NO_CONFIG );
2040
- strcpy (ESP_WML_config.board_name , WM_NO_CONFIG );
2036
+ strcpy (ESP_WML_config.WiFi_Creds [0 ].wifi_ssid , ESP_WML_NO_CONFIG );
2037
+ strcpy (ESP_WML_config.WiFi_Creds [0 ].wifi_pw , ESP_WML_NO_CONFIG );
2038
+ strcpy (ESP_WML_config.WiFi_Creds [1 ].wifi_ssid , ESP_WML_NO_CONFIG );
2039
+ strcpy (ESP_WML_config.WiFi_Creds [1 ].wifi_pw , ESP_WML_NO_CONFIG );
2040
+ strcpy (ESP_WML_config.board_name , ESP_WML_NO_CONFIG );
2041
2041
2042
2042
#if USE_DYNAMIC_PARAMETERS
2043
2043
2044
2044
for (uint16_t i = 0 ; i < NUM_MENU_ITEMS; i++)
2045
2045
{
2046
2046
// Actual size of pdata is [maxlen + 1]
2047
2047
memset (myMenuItems[i].pdata , 0 , myMenuItems[i].maxlen + 1 );
2048
- strncpy (myMenuItems[i].pdata , WM_NO_CONFIG , myMenuItems[i].maxlen );
2048
+ strncpy (myMenuItems[i].pdata , ESP_WML_NO_CONFIG , myMenuItems[i].maxlen );
2049
2049
}
2050
2050
2051
2051
#endif
@@ -2361,11 +2361,11 @@ class ESP_WiFiManager_Lite
2361
2361
{
2362
2362
memset (&ESP_WML_config, 0 , sizeof (ESP_WML_config));
2363
2363
2364
- strcpy (ESP_WML_config.WiFi_Creds [0 ].wifi_ssid , WM_NO_CONFIG );
2365
- strcpy (ESP_WML_config.WiFi_Creds [0 ].wifi_pw , WM_NO_CONFIG );
2366
- strcpy (ESP_WML_config.WiFi_Creds [1 ].wifi_ssid , WM_NO_CONFIG );
2367
- strcpy (ESP_WML_config.WiFi_Creds [1 ].wifi_pw , WM_NO_CONFIG );
2368
- strcpy (ESP_WML_config.board_name , WM_NO_CONFIG );
2364
+ strcpy (ESP_WML_config.WiFi_Creds [0 ].wifi_ssid , ESP_WML_NO_CONFIG );
2365
+ strcpy (ESP_WML_config.WiFi_Creds [0 ].wifi_pw , ESP_WML_NO_CONFIG );
2366
+ strcpy (ESP_WML_config.WiFi_Creds [1 ].wifi_ssid , ESP_WML_NO_CONFIG );
2367
+ strcpy (ESP_WML_config.WiFi_Creds [1 ].wifi_pw , ESP_WML_NO_CONFIG );
2368
+ strcpy (ESP_WML_config.board_name , ESP_WML_NO_CONFIG );
2369
2369
}
2370
2370
2371
2371
strcpy (ESP_WML_config.header , ESP_WML_BOARD_TYPE);
0 commit comments