Skip to content

Commit 349ae49

Browse files
committed
WM_NO_CONFIG -> ESP_WML_NO_CONFIG
1 parent b5e389b commit 349ae49

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

src/ESP_WiFiManager_Lite.h

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1505,7 +1505,7 @@ class ESP_WiFiManager_Lite
15051505
//////////////////////////////////////
15061506

15071507
#define ESP_WML_BOARD_TYPE "ESP_WM_LITE"
1508-
#define WM_NO_CONFIG "blank"
1508+
#define ESP_WML_NO_CONFIG "blank"
15091509

15101510
int calcChecksum()
15111511
{
@@ -1527,20 +1527,20 @@ class ESP_WiFiManager_Lite
15271527

15281528
// If SSID = "blank" or NULL, or PWD length < 8 (as required by standard) => return false
15291529
// 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)) &&
15311531
( strlen(ESP_WML_config.WiFi_Creds[0].wifi_ssid) > 0 ) ) &&
15321532
( 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)) &&
15341534
( strlen(ESP_WML_config.WiFi_Creds[1].wifi_ssid) > 0 ) &&
15351535
( strlen(ESP_WML_config.WiFi_Creds[1].wifi_pw) >= PASSWORD_MIN_LEN ) ) )
15361536
#else
15371537

15381538
// If SSID = "blank" or NULL, or PWD length < 8 (as required by standard) => invalid set
15391539
// 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)) ||
15441544
( strlen(ESP_WML_config.WiFi_Creds[0].wifi_ssid) == 0 ) ||
15451545
( strlen(ESP_WML_config.WiFi_Creds[1].wifi_ssid) == 0 ) ||
15461546
( strlen(ESP_WML_config.WiFi_Creds[0].wifi_pw) < PASSWORD_MIN_LEN ) ||
@@ -2033,19 +2033,19 @@ class ESP_WiFiManager_Lite
20332033
{
20342034
memset(&ESP_WML_config, 0, sizeof(ESP_WML_config));
20352035

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);
20412041

20422042
#if USE_DYNAMIC_PARAMETERS
20432043

20442044
for (uint16_t i = 0; i < NUM_MENU_ITEMS; i++)
20452045
{
20462046
// Actual size of pdata is [maxlen + 1]
20472047
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);
20492049
}
20502050

20512051
#endif
@@ -2361,11 +2361,11 @@ class ESP_WiFiManager_Lite
23612361
{
23622362
memset(&ESP_WML_config, 0, sizeof(ESP_WML_config));
23632363

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);
23692369
}
23702370

23712371
strcpy(ESP_WML_config.header, ESP_WML_BOARD_TYPE);

0 commit comments

Comments
 (0)