github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-01-13 23:45:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed firmware upgrade

Browse Source
This commit is contained in:
Gunnar Skjold 2023-01-12 21:24:36 +01:00
parent 365061df29
commit c28752a00a
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/SvelteUi/json/firmware.html
View File

@ -1,9 +1,11 @@
<html>
<form action="/firmware" enctype="multipart/form-data" method="post" autocomplete="off">
File: <input name="file" type="file" accept=".bin"><br/>
or<br/>
URL: <input name="url" type="text"/><br/>
<br/>
File: <input name="file" type="file" accept=".bin">
<button type="submit" class="">Upload</button>
</form>
or<br/><br/>
<form action="/firmware" method="post" autocomplete="off">
URL: <input name="url" type="text"/>
<button type="submit" class="">Install</button>
</form>
</html>

20
lib/SvelteUi/src/AmsWebServer.cpp
View File

@ -1549,10 +1549,12 @@ void AmsWebServer::firmwareUpload() {
return;
HTTPUpload& upload = server.upload();
if(upload.totalSize == 0) {
return;
} else if(upload.status == UPLOAD_FILE_START) {
if(upload.status == UPLOAD_FILE_START) {
String filename = upload.filename;
if(filename.isEmpty()) {
if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf(PSTR("No file, falling back to post\n"));
return;
}
if(!filename.endsWith(".bin")) {
server.send(500, MIME_PLAIN, "500: couldn't create file");
} else {
@ -1576,10 +1578,10 @@ HTTPUpload& AmsWebServer::uploadFile(const char* path) {
HTTPUpload& upload = server.upload();
if(upload.status == UPLOAD_FILE_START){
if(uploading) {
if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf(PSTR("Upload already in progress"));
if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf(PSTR("Upload already in progress\n"));
server.send_P(500, MIME_HTML, PSTR("<html><body><h1>Upload already in progress!</h1></body></html>"));
} else if (!LittleFS.begin()) {
if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf(PSTR("An Error has occurred while mounting LittleFS"));
if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf(PSTR("An Error has occurred while mounting LittleFS\n"));
server.send_P(500, MIME_HTML, PSTR("<html><body><h1>Unable to mount LittleFS!</h1></body></html>"));
} else {
uploading = true;
@ -1617,7 +1619,7 @@ HTTPUpload& AmsWebServer::uploadFile(const char* path) {
if(debugger->isActive(RemoteDebug::ERROR)) debugger->printf(PSTR("An Error has occurred while writing file"));
snprintf_P(buf, BufferSize, RESPONSE_JSON,
"false",
"Unable to upload",
"File size does not match",
"false"
);
server.setContentLength(strlen(buf));
@ -1625,14 +1627,18 @@ HTTPUpload& AmsWebServer::uploadFile(const char* path) {
}
}
} else if(upload.status == UPLOAD_FILE_END) {
if(debugger->isActive(RemoteDebug::DEBUG)) {
debugger->printf_P(PSTR("handleFileUpload Ended\n"));
}
if(file) {
file.flush();
file.close();
// LittleFS.end();
} else {
debugger->printf_P(PSTR("File was not valid in the end... Write error: %d, \n"), file.getWriteError());
snprintf_P(buf, BufferSize, RESPONSE_JSON,
"false",
"Unable to upload",
"Upload ended, but file is missing",
"false"
);
server.setContentLength(strlen(buf));