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

Fix OTA webform and reduce flickering of progressbar

Browse Source
This commit is contained in:
fvanroie 2023-02-19 22:25:16 +01:00
parent 4d93dbdabf
commit 425e134823
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -949,13 +949,15 @@ static void http_handle_info()
static unsigned long htppLastLoopTime = 0; static unsigned long htppLastLoopTime = 0;
static void http_upload_progress() static void http_upload_progress()
{ {
long t = webServer.header("Content-Length").toInt();
if(millis() - htppLastLoopTime >= 1250) { if(millis() - htppLastLoopTime >= 1250) {
long t = webServer.header("Content-Length").toInt();
LOG_VERBOSE(TAG_HTTP, F(D_BULLET "Uploaded %u / %d bytes"), upload->totalSize + upload->currentSize, t); LOG_VERBOSE(TAG_HTTP, F(D_BULLET "Uploaded %u / %d bytes"), upload->totalSize + upload->currentSize, t);
htppLastLoopTime = millis(); htppLastLoopTime = millis();
if(t > 0) t = (upload->totalSize + upload->currentSize) * 100 / t;
haspProgressVal(t);
} }
if(t > 0) t = (upload->totalSize + upload->currentSize) * 100 / t; // if(t > 0) t = (upload->totalSize + upload->currentSize) * 100 / t;
haspProgressVal(t); // haspProgressVal(t);
} }
#if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266) #if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266)
@ -1018,6 +1020,7 @@ static void webHandleFirmwareUpload()
#endif #endif
} }
haspProgressMsg(upload->filename.c_str()); haspProgressMsg(upload->filename.c_str());
htppLastLoopTime = millis();
// if(!Update.begin(UPDATE_SIZE_UNKNOWN)) { // start with max available size // if(!Update.begin(UPDATE_SIZE_UNKNOWN)) { // start with max available size
// const char label[] = "spiffs"; // const char label[] = "spiffs";
@ -1167,6 +1170,7 @@ static void handleFileUpload()
} else { } else {
LOG_TRACE(TAG_HTTP, F("handleFileUpload Name: %s"), filename.c_str()); LOG_TRACE(TAG_HTTP, F("handleFileUpload Name: %s"), filename.c_str());
haspProgressMsg(fsUploadFile.name()); haspProgressMsg(fsUploadFile.name());
htppLastLoopTime = millis();
} }
} else { } else {
// Clear upload filesize, fix Response Content-Length // Clear upload filesize, fix Response Content-Length
@ -2422,7 +2426,10 @@ static void webHandleFirmware()
<form method="POST" action="/update" enctype="multipart/form-data" id="ota"> <form method="POST" action="/update" enctype="multipart/form-data" id="ota">
<div class="row"> <div class="row">
<div class="col-25"><label class="required" for="filename" v-t="'ota.file'"></label></div> <div class="col-25"><label class="required" for="filename" v-t="'ota.file'"></label></div>
<div class="col-75"><input required="" type="file" id="filename" accept=".bin"></div> <div class="col-75">
<input required="" type="file" name="filename" accept=".bin">
<input type="hidden" name="cmd" value="0">
</div>
</div> </div>
<button type="submit" value="ota" v-t="'ota.submit'"></button> <button type="submit" value="ota" v-t="'ota.submit'"></button>
</form> </form>