@@ -340,7 +340,6 @@ uint32_t getChipOUI();
340
340
341
341
// /////////////////////////////////////////
342
342
343
- // NEW
344
343
#define MAX_ID_LEN 5
345
344
#define MAX_DISPLAY_NAME_LEN 16
346
345
@@ -480,8 +479,6 @@ const char ESP_WM_LITE_HTML_END[] PROGMEM = "</html>";
480
479
481
480
// ////////////////////////////////////////
482
481
483
- // KH Add repeatedly used const
484
-
485
482
const char WM_HTTP_HEAD_CL[] PROGMEM = " Content-Length" ;
486
483
const char WM_HTTP_HEAD_TEXT_HTML[] PROGMEM = " text/html" ;
487
484
const char WM_HTTP_HEAD_TEXT_PLAIN[] PROGMEM = " text/plain" ;
@@ -1024,21 +1021,19 @@ class ESP_WiFiManager_Lite
1024
1021
WiFi.hostname (RFC952_hostname);
1025
1022
#else
1026
1023
1027
-
1028
1024
// Check cores/esp32/esp_arduino_version.h and cores/esp32/core_version.h
1029
1025
#if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) )
1030
1026
WiFi.setHostname (RFC952_hostname);
1031
1027
#else
1032
-
1033
1028
// Still have bug in ESP32_S2 for old core. If using WiFi.setHostname() => WiFi.localIP() always = 255.255.255.255
1034
1029
if ( String (ARDUINO_BOARD) != " ESP32S2_DEV" )
1035
1030
{
1036
1031
// See https://github.com/espressif/arduino-esp32/issues/2537
1037
1032
WiFi.config (INADDR_NONE, INADDR_NONE, INADDR_NONE);
1038
1033
WiFi.setHostname (RFC952_hostname);
1039
1034
}
1040
-
1041
1035
#endif
1036
+
1042
1037
#endif
1043
1038
}
1044
1039
}
@@ -1915,24 +1910,7 @@ class ESP_WiFiManager_Lite
1915
1910
ESP_WML_LOGINFO (F (" failed" ));
1916
1911
}
1917
1912
}
1918
- #endif
1919
-
1920
- // ////////////////////////////////////////////
1921
-
1922
- void NULLTerminateConfig ()
1923
- {
1924
- // #define HEADER_MAX_LEN 16
1925
- // #define SERVER_MAX_LEN 32
1926
- // #define TOKEN_MAX_LEN 36
1927
-
1928
- // NULL Terminating to be sure
1929
- ESP_WM_LITE_config.header [HEADER_MAX_LEN - 1 ] = 0 ;
1930
- ESP_WM_LITE_config.WiFi_Creds [0 ].wifi_ssid [SSID_MAX_LEN - 1 ] = 0 ;
1931
- ESP_WM_LITE_config.WiFi_Creds [0 ].wifi_pw [PASS_MAX_LEN - 1 ] = 0 ;
1932
- ESP_WM_LITE_config.WiFi_Creds [1 ].wifi_ssid [SSID_MAX_LEN - 1 ] = 0 ;
1933
- ESP_WM_LITE_config.WiFi_Creds [1 ].wifi_pw [PASS_MAX_LEN - 1 ] = 0 ;
1934
- ESP_WM_LITE_config.board_name [BOARD_NAME_MAX_LEN - 1 ] = 0 ;
1935
- }
1913
+ #endif // USE_DYNAMIC_PARAMETERS
1936
1914
1937
1915
// ////////////////////////////////////////////
1938
1916
@@ -2167,10 +2145,8 @@ class ESP_WiFiManager_Lite
2167
2145
2168
2146
#endif
2169
2147
2170
- // Don't need
2171
- ESP_WM_LITE_config.checkSum = 0 ;
2172
-
2173
2148
saveAllConfigData ();
2149
+ displayConfigData (ESP_WM_LITE_config);
2174
2150
2175
2151
return false ;
2176
2152
}
@@ -2208,7 +2184,7 @@ class ESP_WiFiManager_Lite
2208
2184
#endif
2209
2185
2210
2186
#ifndef EEPROM_START
2211
- #define EEPROM_START 0 // define 256 in DRD/MRD
2187
+ #define EEPROM_START 0 // define 256 in DRD/MRD
2212
2188
#else
2213
2189
#if (EEPROM_START + FLAG_DATA_SIZE + CONFIG_DATA_SIZE + FORCED_CONFIG_PORTAL_FLAG_DATA_SIZE > EEPROM_SIZE)
2214
2190
#error EPROM_START + FLAG_DATA_SIZE + CONFIG_DATA_SIZE + FORCED_CONFIG_PORTAL_FLAG_DATA_SIZE > EEPROM_SIZE. Please adjust.
@@ -2553,10 +2529,8 @@ class ESP_WiFiManager_Lite
2553
2529
2554
2530
#endif
2555
2531
2556
- // Don't need
2557
- ESP_WM_LITE_config.checkSum = 0 ;
2558
-
2559
2532
saveAllConfigData ();
2533
+ displayConfigData (ESP_WM_LITE_config);
2560
2534
2561
2535
return false ;
2562
2536
}
@@ -2565,10 +2539,6 @@ class ESP_WiFiManager_Lite
2565
2539
// If SSID, PW ="blank" or NULL, stay in config mode forever until having config Data.
2566
2540
return false ;
2567
2541
}
2568
- else
2569
- {
2570
- displayConfigData (ESP_WM_LITE_config);
2571
- }
2572
2542
2573
2543
return true ;
2574
2544
}
@@ -2660,7 +2630,6 @@ class ESP_WiFiManager_Lite
2660
2630
2661
2631
// ////////////////////////////////////////////
2662
2632
2663
- // NEW
2664
2633
void createHTML (String& root_html_template)
2665
2634
{
2666
2635
String pitem;
0 commit comments