From d6cb8b8d9aab1696ee2e1dab07124fd3dea25ca8 Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com>
Date: Fri, 2 Oct 2020 01:37:40 +0300
Subject: [PATCH] 247

---
 data/set.device.json |  2 +-
 include/Consts.h     |  2 +-
 src/UpgradeFirm.cpp  | 27 ++++++++++++++++++++++++---
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/data/set.device.json b/data/set.device.json
index 85288925..abce3bac 100644
--- a/data/set.device.json
+++ b/data/set.device.json
@@ -43,7 +43,7 @@
         },
         {
             "type": "h4",
-            "title": "LittleFS version: 246"
+            "title": "LittleFS version: 247"
         },
         {
             "type": "hr"
diff --git a/include/Consts.h b/include/Consts.h
index 69438976..9391ddf2 100644
--- a/include/Consts.h
+++ b/include/Consts.h
@@ -2,7 +2,7 @@
 
 //=================Firmeare=================
 #define FIRMWARE_NAME "esp8266-iotm"
-#define FIRMWARE_VERSION 246
+#define FIRMWARE_VERSION 247
 #define FLASH_4MB true
 
 //=================System===================
diff --git a/src/UpgradeFirm.cpp b/src/UpgradeFirm.cpp
index 6d5b4086..da099ac1 100644
--- a/src/UpgradeFirm.cpp
+++ b/src/UpgradeFirm.cpp
@@ -40,12 +40,33 @@ void getLastVersion() {
 }
 
 void upgrade_firmware(int type) {
+    String scenario_ForUpdate;
+    String devconfig_ForUpdate;
+    String configSetup_ForUpdate;
+
+    scenario_ForUpdate = readFile(String(DEVICE_SCENARIO_FILE), 4000);
+    devconfig_ForUpdate = readFile(String(DEVICE_CONFIG_FILE), 4000);
+    configSetup_ForUpdate = configSetupJson;
+
     if (type == 1) {  //only build
         if (upgradeBuild()) restartEsp();
-    } else if (type == 2) {  //only spiffs
-        if (upgradeFS()) restartEsp();
-    } else if (type == 3) {  //spiffs and build
+    }
+
+    else if (type == 2) {  //only spiffs
         if (upgradeFS()) {
+            writeFile(String(DEVICE_SCENARIO_FILE), scenario_ForUpdate);
+            writeFile(String(DEVICE_CONFIG_FILE), devconfig_ForUpdate);
+            writeFile("config.json", configSetup_ForUpdate);
+            restartEsp();
+        }
+    }
+
+    else if (type == 3) {  //spiffs and build
+        if (upgradeFS()) {
+            writeFile(String(DEVICE_SCENARIO_FILE), scenario_ForUpdate);
+            writeFile(String(DEVICE_CONFIG_FILE), devconfig_ForUpdate);
+            writeFile("config.json", configSetup_ForUpdate);
+            saveConfig();
             if (upgradeBuild()) {
                 restartEsp();
             }