ota added

2026-03-26 22:22:16 +03:00 · 2020-09-17 21:33:54 +03:00
parent d6f5506812
commit e23481eef2
13 changed files with 186 additions and 153 deletions
--- a/src/UpgradeFirm.cpp
+++ b/src/UpgradeFirm.cpp
@@ -0,0 +1,129 @@
+#include "UpgradeFirm.h"
+
+#include "Class/NotAsinc.h"
+#include "ESP8266.h"
+#include "Global.h"
+
+void upgradeInit() {
+    myNotAsincActions->add(
+        do_UPGRADE, [&](void*) {
+            upgrade_firmware(3);
+        },
+        nullptr);
+
+    myNotAsincActions->add(
+        do_GETLASTVERSION, [&](void*) {
+            getLastVersion();
+        },
+        nullptr);
+
+    if (isNetworkActive()) {
+        getLastVersion();
+        if (lastVersion > 0) {
+            SerialPrint("I", "Update", "available version: " + lastVersion);
+        }
+    };
+}
+
+void getLastVersion() {
+    if ((WiFi.status() == WL_CONNECTED)) {
+        String tmp = getURL(F("http://95.128.182.133/projects/iotmanager/esp8266/esp8266ver.txt"));
+        if (tmp == "error") {
+            lastVersion = -1;
+        } else {
+            lastVersion = tmp.toInt();
+        }
+    } else {
+        lastVersion = -2;
+    }
+    jsonWriteInt(configSetupJson, "last_version", lastVersion);
+}
+
+void upgrade_firmware(int type) {
+    if (type == 1) {  //only build
+        if (upgradeBuild()) restartEsp();
+    } else if (type == 2) {  //only spiffs
+        if (upgradeFS()) restartEsp();
+    } else if (type == 3) {  //spiffs and build
+        if (upgradeFS()) {
+            if (upgradeBuild()) {
+                restartEsp();
+            }
+        }
+    }
+}
+
+bool upgradeFS() {
+    WiFiClient wifiClient;
+    bool ret = false;
+    Serial.println("Start upgrade LittleFS, please wait...");
+    ESPhttpUpdate.rebootOnUpdate(false);
+    t_httpUpdate_return retFS = ESPhttpUpdate.updateSpiffs(wifiClient, F("http://95.128.182.133/projects/iotmanager/esp8266/littlefs.bin"));
+    if (retFS == HTTP_UPDATE_OK) {  //если FS обновилась успешно
+        SerialPrint("I", "Update", "LittleFS upgrade done!");
+        ret = true;
+    }
+    return ret;
+}
+
+bool upgradeBuild() {
+    WiFiClient wifiClient;
+    bool ret = false;
+    Serial.println("Start upgrade BUILD, please wait...");
+    ESPhttpUpdate.rebootOnUpdate(false);
+    t_httpUpdate_return retBuild = ESPhttpUpdate.update(wifiClient, F("http://95.128.182.133/projects/iotmanager/esp8266/firmware.bin"));
+    if (retBuild == HTTP_UPDATE_OK) {  //если BUILD обновился успешно
+        SerialPrint("I", "Update", "BUILD upgrade done!");
+        ret = true;
+    }
+    return ret;
+}
+
+void restartEsp() {
+    Serial.println("Restart ESP....");
+    delay(1000);
+    ESP.restart();
+}
+
+//void upgrade_firmware() {
+//    String scanerioBackup, configBackup, setupBackup;
+//
+//    scanerioBackup = readFile(String(DEVICE_SCENARIO_FILE), 4096);
+//    configBackup = readFile(String(DEVICE_CONFIG_FILE), 4096);
+//    setupBackup = configSetupJson;
+//
+//    SerialPrint("I","module","update data");
+//    WiFiClient wifiClient;
+//#ifdef ESP8266
+//    ESPhttpUpdate.rebootOnUpdate(false);
+//    t_httpUpdate_return ret = ESPhttpUpdate.updateSpiffs(wifiClient, F("http://91.204.228.124:1100/update/esp8266/esp32-esp8266_iot-manager_modules_firmware.spiffs.bin"));
+//#else
+//    httpUpdate.rebootOnUpdate(false);
+//    t_httpUpdate_return ret = httpUpdate.updateSpiffs(client_for_upgrade, F("http://91.204.228.124:1100/update/esp32/esp32-esp8266_iot-manager_modules_firmware.spiffs.bin"));
+//#endif
+//    if (ret == HTTP_UPDATE_OK) {
+//        writeFile(String(DEVICE_SCENARIO_FILE), scanerioBackup);
+//        writeFile(String(DEVICE_CONFIG_FILE), configBackup);
+//        writeFile("config.json", setupBackup);
+//
+//        saveConfig();
+//
+//        SerialPrint("I","module","done!");
+//    } else {
+//        SerialPrint("[E]","module","on data");
+//        return;
+//    }
+//
+//    //Serial.println("update firmware");
+//#ifdef ESP8266
+//    ret = ESPhttpUpdate.update(wifiClient, F("http://91.204.228.124:1100/update/esp8266/esp32-esp8266_iot-manager_modules_firmware.ino.bin"));
+//#else
+//    ret = httpUpdate.update(client_for_upgrade, "http://91.204.228.124:1100/update/esp32/esp32-esp8266_iot-manager_modules_firmware.ino.bin");
+//#endif
+//    if (ret == HTTP_UPDATE_OK) {
+//        SerialPrint("I","module","done! restart...");
+//        ESP.restart();
+//    } else {
+//        SerialPrint("[E]","module","on firmware");
+//    }
+//}