jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-26 04:36:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Firmware Upgrade From URL #300

Browse Source
This commit is contained in:
fvanroie 2022-05-04 22:59:43 +02:00
parent 666c7d10b6
commit e3d90d9579
1 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/sys/svc/hasp_http.cpp
View File

@ -1,7 +1,6 @@
/* MIT License - Copyright (c) 2019-2022 Francis Van Roie /* MIT License - Copyright (c) 2019-2022 Francis Van Roie
For full license information read the LICENSE file in the project folder */ For full license information read the LICENSE file in the project folder */
//#include "webServer.h"
#include "hasplib.h" #include "hasplib.h"
#include "ArduinoLog.h" #include "ArduinoLog.h"
@ -2021,7 +2020,26 @@ static void webHandleFirmware()
{ {
if(!httpIsAuthenticated(F("firmware"))) return; if(!httpIsAuthenticated(F("firmware"))) return;
{ // Send Content if(webServer.method() == HTTP_POST && webServer.hasArg(PSTR("url"))) {
String url = webServer.arg(PSTR("url"));
{
String httpMessage((char*)0);
httpMessage.reserve(HTTP_PAGE_SIZE);
httpMessage += F("<h1>");
httpMessage += haspDevice.get_hostname();
httpMessage += F("</h1><hr>");
httpMessage += F("<p><b>ESP update</b></p>Updating ESP firmware from: ");
httpMessage += url;
webSendHeader(haspDevice.get_hostname(), httpMessage.length(), true);
webServer.sendContent(httpMessage);
}
LOG_TRACE(TAG_HTTP, F("Updating ESP firmware from: %s"), url.c_str());
dispatch_web_update(NULL, url.c_str(), TAG_HTTP);
} else {
// Send Firmware page
String httpMessage((char*)0); String httpMessage((char*)0);
httpMessage.reserve(HTTP_PAGE_SIZE); httpMessage.reserve(HTTP_PAGE_SIZE);
httpMessage += F("<h1>"); httpMessage += F("<h1>");
@ -2047,19 +2065,18 @@ static void webHandleFirmware()
httpMessage += F("<button type='submit' name='save' value='debug'>" D_HTTP_UPDATE_FIRMWARE "</button>"); httpMessage += F("<button type='submit' name='save' value='debug'>" D_HTTP_UPDATE_FIRMWARE "</button>");
httpMessage += F("</form></div>"); httpMessage += F("</form></div>");
/* Update from URL // Update from URL
// Form // Form
httpMessage += F("<div class='container'><form method='POST' action='/espfirmware'>"); httpMessage += F("<div class='container'><form method='POST' action='/firmware'>");
// URL // URL
httpMessage += httpMessage +=
F("<div class='row'><div class='col-25'><label class='required' for='url'>From URL</label></div>"); F("<div class='row'><div class='col-25'><label class='required' for='url'>From URL</label></div>");
httpMessage += F("<div class='col-75'><input required id='url' name='url' value=''></div></div>"); httpMessage += F("<div class='col-75'><input required id='url' name='url' value=''></div></div>");
// Submit & End Form // Submit & End Form
httpMessage += F("<button type='submit' name='save' value='debug'>Update from URL</button>"); httpMessage += F("<button type='submit' name='save' value='debug'>Update from URL</button>");
httpMessage += F("</form></div>"); httpMessage += F("</form></div>");
*/
httpMessage += FPSTR(MAIN_MENU_BUTTON); httpMessage += FPSTR(MAIN_MENU_BUTTON);
@ -2270,7 +2287,7 @@ void httpSetup()
LOG_VERBOSE(TAG_HTTP, F("Total size: %s"), webServer.hostHeader().c_str()); LOG_VERBOSE(TAG_HTTP, F("Total size: %s"), webServer.hostHeader().c_str());
}, },
webHandleFirmwareUpload); webHandleFirmwareUpload);
// webServer.on(F("/espfirmware"), httpHandleEspFirmware); // webServer.on(F("/espfirmware"), httpHandleEspFirmware);
#endif #endif
#if HASP_USE_WIFI > 0 #if HASP_USE_WIFI > 0