From 64b4e67dcd49b150cfd02b9e173e427a55956600 Mon Sep 17 00:00:00 2001 From: Mit4el Date: Fri, 29 Nov 2024 23:13:09 +0300 Subject: [PATCH] btn Home in localota --- myProfile.json | 1 + src/UpgradeFirm.cpp | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/myProfile.json b/myProfile.json index 8ac27629..e8d1579c 100644 --- a/myProfile.json +++ b/myProfile.json @@ -15,6 +15,7 @@ "mqttUser": "rise", "mqttPass": "3hostel3", "serverip": "http://iotmanager.org", + "serverlocal": "http://192.168.1.2:5500", "log": 0, "mqttin": 0, "pinSCL": 0, diff --git a/src/UpgradeFirm.cpp b/src/UpgradeFirm.cpp index a258865a..a9a74307 100644 --- a/src/UpgradeFirm.cpp +++ b/src/UpgradeFirm.cpp @@ -67,7 +67,8 @@ bool upgradeFS(String path) { saveUpdeteStatus("fs", UPDATE_FAILED); if (retFS == HTTP_UPDATE_FAILED) { SerialPrint("E", F("Update"), "HTTP_UPDATE_FAILED"); - HTTP.send(200, "text/plain", "FS UPDATE_FAILED! DELETE /localota !!!"); + String page = "Ошибка обновления FS!
FS Update failed!
Home"; + HTTP.send(200, "text/html; charset=UTF-8", page); } else if (retFS == HTTP_UPDATE_NO_UPDATES) { SerialPrint("E", F("Update"), "HTTP_UPDATE_NO_UPDATES! DELETE /localota !!!"); //HTTP.send(200, "text/plain", "NO_UPDATES"); @@ -102,17 +103,20 @@ bool upgradeBuild(String path) { // если BUILD обновился успешно if (retBuild == HTTP_UPDATE_OK) { SerialPrint("!!!", F("Update"), F("BUILD upgrade done!")); - HTTP.send(200, "text/plain", "BUILD upgrade done! DELETE /localota !!!"); + String page = "Обновление BUILD выполнено!
Build upgrade done!
Home"; + HTTP.send(200, "text/html; charset=UTF-8", page); saveUpdeteStatus("build", UPDATE_COMPLETED); ret = true; } else { saveUpdeteStatus("build", UPDATE_FAILED); if (retBuild == HTTP_UPDATE_FAILED) { SerialPrint("E", F("Update"), "HTTP_UPDATE_FAILED"); - HTTP.send(200, "text/plain", "UPDATE_FAILED! DELETE /localota !!!"); + String page = "Ошибка обновления прошивки!
Firmware update failed!
Home"; + HTTP.send(200, "text/html; charset=UTF-8", page); } else if (retBuild == HTTP_UPDATE_NO_UPDATES) { SerialPrint("E", F("Update"), "HTTP_UPDATE_NO_UPDATES"); - HTTP.send(200, "text/plain", "NO_UPDATES! DELETE /localota !!!"); + String page = "Нет обновлений!
No updates!
Home"; + HTTP.send(200, "text/html; charset=UTF-8", page); } } #endif