From f4ad8ed3d854a3cd6d06ed9756b6c5f2d2ae6542 Mon Sep 17 00:00:00 2001 From: fvanroie <15969459+fvanroie@users.noreply.github.com> Date: Sat, 6 Mar 2021 00:55:01 +0100 Subject: [PATCH] Enable updates from http server --- src/sys/svc/hasp_http.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/sys/svc/hasp_http.cpp b/src/sys/svc/hasp_http.cpp index b8c51533..071eee2f 100644 --- a/src/sys/svc/hasp_http.cpp +++ b/src/sys/svc/hasp_http.cpp @@ -1795,6 +1795,12 @@ void webHandleFirmware() // "name='filename' accept='.spiffs'>"); // httpMessage += F("
"); + httpMessage += F(""); + httpMessage += FPSTR(MAIN_MENU_BUTTON); webSendPage(haspDevice.get_hostname(), httpMessage.length(), false); @@ -1807,6 +1813,9 @@ void webHandleFirmware() //////////////////////////////////////////////////////////////////////////////////////////////////// void httpHandleEspFirmware() { // http://plate01/espfirmware + char url[4]; + memcpy_P(url, PSTR("url"), 4); + if(!httpIsAuthenticated(F("espfirmware"))) return; { @@ -1817,7 +1826,7 @@ void httpHandleEspFirmware() httpMessage += F("ESP update
Updating ESP firmware from: "); - httpMessage += webServer.arg("espFirmware"); + httpMessage += webServer.arg(url); webSendPage(haspDevice.get_hostname(), httpMessage.length(), true); webServer.sendContent(httpMessage); @@ -1825,8 +1834,8 @@ void httpHandleEspFirmware() } webSendFooter(); - LOG_TRACE(TAG_HTTP, F("Attempting ESP firmware update from: %s"), webServer.arg("espFirmware").c_str()); - // espStartOta(webServer.arg("espFirmware")); + LOG_TRACE(TAG_HTTP, F("Attempting ESP firmware update from: %s"), webServer.arg(url).c_str()); + dispatch_web_update(NULL, webServer.arg(url).c_str()); } ////////////////////////////////////////////////////////////////////////////////////////////////////