From 8065a1eaa4cb2581acf37d820dc6ac8e7fcc86c6 Mon Sep 17 00:00:00 2001
From: sidey79 <7968127+sidey79@users.noreply.github.com>
Date: Mon, 9 Apr 2018 23:08:43 +0200
Subject: [PATCH 1/5] Added OTA updater option from esp8266. Code is manly
 taken from KoljaWindeler but modified in some pieces to fit current library
 version

---
 WiFiManager.cpp | 86 +++++++++++++++++++++++++++++++++++++++++++++++++
 WiFiManager.h   |  5 +++
 strings_en.h    | 12 +++++--
 3 files changed, 101 insertions(+), 2 deletions(-)

diff --git a/WiFiManager.cpp b/WiFiManager.cpp
index aabbe8d..91134f7 100644
--- a/WiFiManager.cpp
+++ b/WiFiManager.cpp
@@ -400,6 +400,8 @@ void WiFiManager::setupConfigPortal() {
   server->on((String)FPSTR(R_info), std::bind(&WiFiManager::handleInfo, this));
   server->on((String)FPSTR(R_param), std::bind(&WiFiManager::handleParam, this));
   server->on((String)FPSTR(R_paramsave), std::bind(&WiFiManager::handleParamSave, this));
+  server->on((String)FPSTR(R_update), std::bind(&WiFiManager::handleUpdate, this));
+  server->on((String)FPSTR(R_updatedone), HTTP_POST, std::bind(&WiFiManager::handleUpdateDone, this), std::bind(&WiFiManager::handleUpdating, this));
   server->on((String)FPSTR(R_restart), std::bind(&WiFiManager::handleReset, this));
   server->on((String)FPSTR(R_exit), std::bind(&WiFiManager::handleExit, this));
   server->on((String)FPSTR(R_close), std::bind(&WiFiManager::handleClose, this));
@@ -2370,3 +2372,87 @@ void WiFiManager::WiFi_autoReconnect(){
     }
   #endif
 }
+
+
+void WiFiManager::handleUpdate() {
+	DEBUG_WM(F("Handle update"));
+	if (captivePortal()) { // If captive portal return flase to redirect back.
+		return;
+	}
+	String page = FPSTR(HTTP_HEAD);
+	page.replace("{v}", "Options");
+	page += FPSTR(HTTP_SCRIPT);
+	page += FPSTR(HTTP_STYLE);
+	page += _customHeadElement;
+	page += FPSTR(HTTP_HEAD_END);
+	page += "<h1>";
+	page += _apName;
+	page += "</h1>";
+	page += FPSTR(HTTP_ROOT_MAIN);
+	page += FPSTR(HTTP_UPDATE);
+	page += FPSTR(HTTP_END);
+	server->send(200, "text/html", page);
+}
+
+void WiFiManager::handleUpdating(){
+	if (captivePortal()) { // If captive portal return flase to redirect back.
+		return;
+	}
+	// handler for the file upload, get's the sketch bytes, and writes
+	// them through the Update object
+	HTTPUpload& upload = server->upload();
+	if (upload.status == UPLOAD_FILE_START) {
+		Serial.setDebugOutput(true);
+
+		WiFiUDP::stopAll();
+		DEBUG_WM("Update: %s\r\n", upload.filename.c_str());
+		uint32_t maxSketchSpace = (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000;
+		if (!Update.begin(maxSketchSpace)) { // start with max available size
+			Update.printError(Serial);
+		}
+	} else if (upload.status == UPLOAD_FILE_WRITE) {
+		Serial.printf(".");
+		if (Update.write(upload.buf, upload.currentSize) != upload.currentSize) {
+			Update.printError(Serial);
+		}
+	} else if (upload.status == UPLOAD_FILE_END) {
+		if (Update.end(true)) { // true to set the size to the current progress
+			Serial.printf("Update Success: %u\r\nRebooting...\r\n", upload.totalSize);
+		} else {
+			Update.printError(Serial);
+		}
+		Serial.setDebugOutput(false);
+	} else if (upload.status == UPLOAD_FILE_ABORTED) {
+		Update.end();
+		DEBUG_WM("Update was aborted");
+	}
+	delay(0);
+} // handleUpdating
+
+void WiFiManager::handleUpdateDone() {
+	DEBUG_WM(F("Handle update done"));
+	if (captivePortal()) { // If captive portal return flase to redirect back.
+	}
+	String page = FPSTR(HTTP_HEAD);
+	page.replace("{v}", "Options");
+	page += FPSTR(HTTP_SCRIPT);
+	page += FPSTR(HTTP_STYLE);
+	page += _customHeadElement;
+	page += FPSTR(HTTP_HEAD_END);
+	page += "<h1>";
+	page += _apName;
+	page += "</h1>";
+	page += FPSTR(HTTP_ROOT_MAIN);
+	if (Update.hasError()) {
+		page += FPSTR(HTTP_UPDATE_FAIL);
+		DEBUG_WM(F("update failed"));
+	}
+	else {
+		page += FPSTR(HTTP_UPDATE_OK);
+		DEBUG_WM(F("update ok"));
+	}
+	page += FPSTR(HTTP_END);
+	server->send(200, "text/html", page);
+	delay(1000); // send page
+	ESP.restart();
+}
diff --git a/WiFiManager.h b/WiFiManager.h
index 6763833..ab98252 100644
--- a/WiFiManager.h
+++ b/WiFiManager.h
@@ -343,6 +343,11 @@ class WiFiManager
     boolean       stopConfigPortal();
     uint8_t       processConfigPortal();
     void          stopCaptivePortal();
+	// OTA Update handler
+	void          handleUpdate();
+	void          handleUpdating();
+	void          handleUpdateDone();
+
 
     // wifi platform abstractions
     bool          WiFi_Mode(WiFiMode_t m);
diff --git a/strings_en.h b/strings_en.h
index 2cb9f7a..8dbe91a 100644
--- a/strings_en.h
+++ b/strings_en.h
@@ -28,6 +28,7 @@ const char * const HTTP_PORTAL_MENU[] PROGMEM = {
 "<form action='/info'    method='get'><button>Info</button></form><br/>\n", // MENU_INFO
 "<form action='/param'   method='get'><button>Setup</button></form><br/>\n",//MENU_PARAM
 "<form action='/close'   method='get'><button>Close</button></form><br/>\n", // MENU_CLOSE
+"<form action='/update'  method='get'><button>Update</button></form><br/>\n",// MENU_UPDATE
 "<form action='/restart' method='get'><button>Restart</button></form><br/>\n",// MENU_RESTART
 "<form action='/exit'    method='get'><button>Exit</button></form><br/>\n",  // MENU_EXIT
 "<form action='/erase'   method='get'><button class='D'>Erase</button></form><br/>\n", // MENU_ERASE
@@ -110,6 +111,10 @@ const char HTTP_HELP[]             PROGMEM =
  "</table>"
  "<p/>More information about WiFiManager at <a href='https://github.com/tzapu/WiFiManager'>https://github.com/tzapu/WiFiManager</a>.";
 
+const char HTTP_UPDATE[] PROGMEM = "<form method='POST' action='update' enctype='multipart/form-data'><input type='file' name='update'><input type='submit' value='Update'></form>";
+const char HTTP_UPDATE_FAIL[] PROGMEM = "Update Failed!";
+const char HTTP_UPDATE_OK[] PROGMEM = "Update OK! Rebooting now...";
+
 #ifdef JSTEST
 const char HTTP_JS[] PROGMEM = 
 "<script>function postAjax(url, data, success) {"
@@ -210,14 +215,15 @@ const char D_HR[]                 PROGMEM = "--------------------";
 // -----------------------------------------------------------------------------------------------
 // DO NOT EDIT BELOW THIS LINE
 
-const uint8_t _nummenutokens = 9;
-const char * const _menutokens[9] PROGMEM = {
+const uint8_t _nummenutokens = 10;
+const char * const _menutokens[10] PROGMEM = {
     "wifi",
     "wifinoscan",
     "info",
     "param",
     "close",
     "restart",
+	"update",
     "exit",
     "erase",
     "sep"
@@ -235,6 +241,8 @@ const char R_exit[]               PROGMEM = "/exit";
 const char R_close[]              PROGMEM = "/close";
 const char R_erase[]              PROGMEM = "/erase"; 
 const char R_status[]             PROGMEM = "/status";
+const char R_update[]             PROGMEM = "/u";
+const char R_updatedone[]             PROGMEM = "/update";
 
 
 //Strings

From 16bc717cebeb70d7b2313af39f3fe3f72748b24c Mon Sep 17 00:00:00 2001
From: sidey79 <7968127+sidey79@users.noreply.github.com>
Date: Mon, 9 Apr 2018 23:44:27 +0200
Subject: [PATCH 2/5] Include Update.h for ESP32

---
 WiFiManager.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WiFiManager.h b/WiFiManager.h
index ab98252..0d6eede 100644
--- a/WiFiManager.h
+++ b/WiFiManager.h
@@ -43,6 +43,7 @@
 
     #include <WiFi.h>
     #include <esp_wifi.h>  
+    #include <Updater.h>
     
     #define WIFI_getChipId() (uint32_t)ESP.getEfuseMac()
     #define WM_WIFIOPEN   WIFI_AUTH_OPEN

From 3fafb3304a0c7e61b06cbb1348993cc3d65bb168 Mon Sep 17 00:00:00 2001
From: sidey79 <7968127+sidey79@users.noreply.github.com>
Date: Tue, 10 Apr 2018 23:07:56 +0200
Subject: [PATCH 3/5] HTML Pages and generation for OAT Update adapted to
 current version of lib Debug output corrected at some point

---
 WiFiManager.cpp | 74 +++++++++++++++++++++++--------------------------
 strings_en.h    |  9 +++---
 2 files changed, 40 insertions(+), 43 deletions(-)

diff --git a/WiFiManager.cpp b/WiFiManager.cpp
index 91134f7..d0a9906 100644
--- a/WiFiManager.cpp
+++ b/WiFiManager.cpp
@@ -2373,76 +2373,65 @@ void WiFiManager::WiFi_autoReconnect(){
   #endif
 }
 
-
+// Called when /u is requested
 void WiFiManager::handleUpdate() {
-	DEBUG_WM(F("Handle update"));
-	if (captivePortal()) { // If captive portal return flase to redirect back.
-		return;
-	}
-	String page = FPSTR(HTTP_HEAD);
-	page.replace("{v}", "Options");
-	page += FPSTR(HTTP_SCRIPT);
-	page += FPSTR(HTTP_STYLE);
-	page += _customHeadElement;
-	page += FPSTR(HTTP_HEAD_END);
-	page += "<h1>";
-	page += _apName;
-	page += "</h1>";
-	page += FPSTR(HTTP_ROOT_MAIN);
+	DEBUG_WM(DEBUG_VERBOSE,F("<- Handle update"));
+	if (captivePortal()) return; // If captive portal redirect instead of displaying the page
+	String page = getHTTPHead(FPSTR(S_options)); // @token options
+	String str = FPSTR(HTTP_ROOT_MAIN);
+	str.replace(FPSTR(T_v), configPortalActive ? _apName : WiFi.localIP().toString()); // use ip if ap is not active for heading
+	page += str;
+
 	page += FPSTR(HTTP_UPDATE);
 	page += FPSTR(HTTP_END);
-	server->send(200, "text/html", page);
+
+	server->sendHeader(FPSTR(HTTP_HEAD_CL), String(page.length()));
+	server->send(200, FPSTR(HTTP_HEAD_CT), page);
+
 }
 
 void WiFiManager::handleUpdating(){
-	if (captivePortal()) { // If captive portal return flase to redirect back.
-		return;
-	}
-	// handler for the file upload, get's the sketch bytes, and writes
+	if (captivePortal()) return; // If captive portal redirect instead of displaying the page
+								 // handler for the file upload, get's the sketch bytes, and writes
 	// them through the Update object
 	HTTPUpload& upload = server->upload();
 	if (upload.status == UPLOAD_FILE_START) {
 		Serial.setDebugOutput(true);
 
 		WiFiUDP::stopAll();
-		DEBUG_WM("Update: %s\r\n", upload.filename.c_str());
+		Serial.printf("Update: %s\r\n", upload.filename.c_str());
 		uint32_t maxSketchSpace = (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000;
 		if (!Update.begin(maxSketchSpace)) { // start with max available size
 			Update.printError(Serial);
 		}
 	} else if (upload.status == UPLOAD_FILE_WRITE) {
-		Serial.printf(".");
+		Serial.print(".");
 		if (Update.write(upload.buf, upload.currentSize) != upload.currentSize) {
 			Update.printError(Serial);
 		}
 	} else if (upload.status == UPLOAD_FILE_END) {
 		if (Update.end(true)) { // true to set the size to the current progress
-			Serial.printf("Update Success: %u\r\nRebooting...\r\n", upload.totalSize);
+			Serial.printf("Updated: %u bytes\r\nRebooting...\r\n", upload.totalSize);
 		} else {
 			Update.printError(Serial);
 		}
 		Serial.setDebugOutput(false);
 	} else if (upload.status == UPLOAD_FILE_ABORTED) {
 		Update.end();
-		DEBUG_WM("Update was aborted");
+		DEBUG_WM(F("<- Update was aborted"));
 	}
 	delay(0);
 } // handleUpdating
 
 void WiFiManager::handleUpdateDone() {
-	DEBUG_WM(F("Handle update done"));
-	if (captivePortal()) { // If captive portal return flase to redirect back.
-	}
-	String page = FPSTR(HTTP_HEAD);
-	page.replace("{v}", "Options");
-	page += FPSTR(HTTP_SCRIPT);
-	page += FPSTR(HTTP_STYLE);
-	page += _customHeadElement;
-	page += FPSTR(HTTP_HEAD_END);
-	page += "<h1>";
-	page += _apName;
-	page += "</h1>";
-	page += FPSTR(HTTP_ROOT_MAIN);
+	DEBUG_WM(DEBUG_VERBOSE, F("<- Handle update done"));
+	if (captivePortal()) return; // If captive portal redirect instead of displaying the page
+
+	String page = getHTTPHead(FPSTR(S_options)); // @token options
+	String str = FPSTR(HTTP_ROOT_MAIN);
+	str.replace(FPSTR(T_v), configPortalActive ? _apName : WiFi.localIP().toString()); // use ip if ap is not active for heading
+	page += str;
+
 	if (Update.hasError()) {
 		page += FPSTR(HTTP_UPDATE_FAIL);
 		DEBUG_WM(F("update failed"));
@@ -2450,9 +2439,16 @@ void WiFiManager::handleUpdateDone() {
 	else {
 		page += FPSTR(HTTP_UPDATE_OK);
 		DEBUG_WM(F("update ok"));
+
 	}
 	page += FPSTR(HTTP_END);
-	server->send(200, "text/html", page);
+
+	server->sendHeader(FPSTR(HTTP_HEAD_CL), String(page.length()));
+	server->send(200, FPSTR(HTTP_HEAD_CT), page);
+
+
 	delay(1000); // send page
-	ESP.restart();
+	if (!Update.hasError()) {
+		ESP.restart();
+	}
 }
diff --git a/strings_en.h b/strings_en.h
index 8dbe91a..05f0f3d 100644
--- a/strings_en.h
+++ b/strings_en.h
@@ -100,6 +100,8 @@ const char HTTP_HELP[]             PROGMEM =
  "<td>Parameter page</td></tr>"
  "<tr><td><a href='/info'>/info</a></td>"
  "<td>Information page</td></tr>"
+ "<tr><td><a href='/u'>/u</a></td>"
+ "<td>OTA Update</td></tr>"
  "<tr><td><a href='/close'>/close</a></td>"
  "<td>Close the captiveportal popup,configportal will remain active</td></tr>"
  "<tr><td><a href='/exit'>/exit</a></td>"
@@ -215,15 +217,14 @@ const char D_HR[]                 PROGMEM = "--------------------";
 // -----------------------------------------------------------------------------------------------
 // DO NOT EDIT BELOW THIS LINE
 
-const uint8_t _nummenutokens = 10;
-const char * const _menutokens[10] PROGMEM = {
+const uint8_t _nummenutokens = 9;
+const char * const _menutokens[9] PROGMEM = {
     "wifi",
     "wifinoscan",
     "info",
     "param",
     "close",
     "restart",
-	"update",
     "exit",
     "erase",
     "sep"
@@ -242,7 +243,7 @@ const char R_close[]              PROGMEM = "/close";
 const char R_erase[]              PROGMEM = "/erase"; 
 const char R_status[]             PROGMEM = "/status";
 const char R_update[]             PROGMEM = "/u";
-const char R_updatedone[]             PROGMEM = "/update";
+const char R_updatedone[]         PROGMEM = "/update";
 
 
 //Strings

From fe17307e090c72a5885a5b93ab39de62308bb476 Mon Sep 17 00:00:00 2001
From: sidey79 <7968127+sidey79@users.noreply.github.com>
Date: Wed, 11 Apr 2018 22:11:44 +0200
Subject: [PATCH 4/5] Updated include for ota update lib for esp32

---
 WiFiManager.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WiFiManager.h b/WiFiManager.h
index 0d6eede..712a5a5 100644
--- a/WiFiManager.h
+++ b/WiFiManager.h
@@ -43,7 +43,7 @@
 
     #include <WiFi.h>
     #include <esp_wifi.h>  
-    #include <Updater.h>
+    #include <Update.h>
     
     #define WIFI_getChipId() (uint32_t)ESP.getEfuseMac()
     #define WM_WIFIOPEN   WIFI_AUTH_OPEN

From 428c9fcbd593425c41174e0adc8d20c233e03f51 Mon Sep 17 00:00:00 2001
From: sidey79 <7968127+sidey79@users.noreply.github.com>
Date: Fri, 13 Apr 2018 21:51:36 +0200
Subject: [PATCH 5/5] Updated for ESP32 - compile only tested

---
 WiFiManager.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/WiFiManager.cpp b/WiFiManager.cpp
index 9738066..7a199c8 100644
--- a/WiFiManager.cpp
+++ b/WiFiManager.cpp
@@ -2416,9 +2416,19 @@ void WiFiManager::handleUpdating(){
 	if (upload.status == UPLOAD_FILE_START) {
 		Serial.setDebugOutput(true);
 
+#ifdef ESP8266
 		WiFiUDP::stopAll();
+#elif defined(ESP32)
+			// Think we do not need to stop WiFIUDP because we haven't started a listener
+#endif
 		Serial.printf("Update: %s\r\n", upload.filename.c_str());
+#ifdef ESP8266
 		uint32_t maxSketchSpace = (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000;
+#elif defined(ESP32)
+		uint32_t maxSketchSpace = (ESP.getFlashChipSize() - 0x1000) & 0xFFFFF000;
+
+#endif
+
 		if (!Update.begin(maxSketchSpace)) { // start with max available size
 			Update.printError(Serial);
 		}
@@ -2464,7 +2474,6 @@ void WiFiManager::handleUpdateDone() {
 	server->sendHeader(FPSTR(HTTP_HEAD_CL), String(page.length()));
 	server->send(200, FPSTR(HTTP_HEAD_CT), page);
 
-
 	delay(1000); // send page
 	if (!Update.hasError()) {
 		ESP.restart();