mirror of
https://github.com/alexhopeoconnor/WiFiManager.git
synced 2026-10-22 10:42:10 +10:00
Merge branch 'master' of https://github.com/tzapu/WiFiManager
This commit is contained in:
+2
-1
@@ -3602,7 +3602,7 @@ void WiFiManager::handleUpdating(){
|
|||||||
else if (upload.status == UPLOAD_FILE_END) {
|
else if (upload.status == UPLOAD_FILE_END) {
|
||||||
if (Update.end(true)) { // true to set the size to the current progress
|
if (Update.end(true)) { // true to set the size to the current progress
|
||||||
#ifdef WM_DEBUG_LEVEL
|
#ifdef WM_DEBUG_LEVEL
|
||||||
DEBUG_WM(DEBUG_VERBOSE,F("[OTA] OTA FILE END bytes: "), upload.totalSize);
|
DEBUG_WM(DEBUG_VERBOSE,F("\n\n[OTA] OTA FILE END bytes: "), upload.totalSize);
|
||||||
// Serial.printf("Updated: %u bytes\r\nRebooting...\r\n", upload.totalSize);
|
// Serial.printf("Updated: %u bytes\r\nRebooting...\r\n", upload.totalSize);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
@@ -3628,6 +3628,7 @@ void WiFiManager::handleUpdateDone() {
|
|||||||
|
|
||||||
String page = getHTTPHead(FPSTR(S_options)); // @token options
|
String page = getHTTPHead(FPSTR(S_options)); // @token options
|
||||||
String str = FPSTR(HTTP_ROOT_MAIN);
|
String str = FPSTR(HTTP_ROOT_MAIN);
|
||||||
|
str.replace(FPSTR(T_t),_title);
|
||||||
str.replace(FPSTR(T_v), configPortalActive ? _apName : WiFi.localIP().toString()); // use ip if ap is not active for heading
|
str.replace(FPSTR(T_v), configPortalActive ? _apName : WiFi.localIP().toString()); // use ip if ap is not active for heading
|
||||||
page += str;
|
page += str;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user