iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-26 22:22:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'IoTManagerProject:ver4dev' into ver4dev

Browse Source
This commit is contained in:
biveraxe
2022-02-20 22:57:55 +03:00
committed by GitHub
parent 905d137341 cce5726390
commit 9fe7adb151
7 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/UpgradeFirm.cpp
View File

@@ -36,8 +36,10 @@ bool upgradeFS() {
bool ret = false;
WiFiClient wifiClient;
SerialPrint("!!!", F("Update"), F("Start upgrade FS..."));
handleUpdateStatus(true, UPDATE_FS_IN_PROGRESS);
if (getBinPath("") == "error") {
SerialPrint("E", F("Update"), F("FS Path error"));
handleUpdateStatus(true, PATH_ERROR);
return ret;
}
#ifdef ESP8266
@@ -52,9 +54,10 @@ bool upgradeFS() {
//если FS обновилась успешно
if (retFS == HTTP_UPDATE_OK) {
SerialPrint("!!!", F("Update"), F("FS upgrade done!"));
handleUpdateStatus(true, UPDATE_FS_COMPLETED);
ret = true;
}
handleUpdateStatus(true, UPDATE_FS_FAILED);
return ret;
}
@@ -62,8 +65,10 @@ bool upgradeBuild() {
bool ret = false;
WiFiClient wifiClient;
SerialPrint("!!!", F("Update"), F("Start upgrade BUILD..."));
handleUpdateStatus(true, UPDATE_BUILD_IN_PROGRESS);
if (getBinPath("") == "error") {
SerialPrint("E", F("Update"), F("Build Path error"));
handleUpdateStatus(true, PATH_ERROR);
return ret;
}
#ifdef esp8266_4mb
@@ -78,9 +83,10 @@ bool upgradeBuild() {
//если BUILD обновился успешно
if (retBuild == HTTP_UPDATE_OK) {
SerialPrint("!!!", F("Update"), F("BUILD upgrade done!"));
handleUpdateStatus(true, UPDATE_BUILD_COMPLETED);
ret = true;
}
handleUpdateStatus(true, UPDATE_BUILD_FAILED);
return ret;
}
@@ -117,4 +123,9 @@ void saveUserDataToFlash() {
writeFile("/config.json", update.configJson);
writeFile("/settings.json", update.settingsFlashJson);
writeFile("/layout.json", update.layoutJson);
}
void handleUpdateStatus(bool send, int state) {
jsonWriteInt_(errorsHeapJson, F("upd"), state);
if (!send) standWebSocket.broadcastTXT(errorsHeapJson);
}

8
src/utils/SerialPrint.cpp
View File

@@ -2,8 +2,10 @@
#include "utils/SerialPrint.h"
void SerialPrint(String errorLevel, String module, String msg) {
Serial.println(prettyMillis(millis()) + " [" + errorLevel + "] [" + module + "] " + msg);
String tosend = "[" + errorLevel + "] [" + module + "] " + msg;
String tosend = prettyMillis(millis()) + " [" + errorLevel + "] [" + module + "] " + msg;
Serial.println(tosend);
// ws.textAll(tosend);
if (jsonReadInt(settingsFlashJson, F("log")) != 0) {
standWebSocket.broadcastTXT("/log|" + tosend);
}
}