From bce8723ecf0bdee2a6e74185b2e13612b1c00378 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Tue, 5 Jan 2021 16:53:22 +0100 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B1=D0=B0=D0=B3=20=D1=81=20=D0=BE=D0=B1=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC=20=D0=BF=D0=BE=20?= =?UTF-8?q?=D0=B2=D0=BE=D0=B7=D0=B4=D1=83=D1=85=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platformio.ini | 2 +- src/UpgradeFirm.cpp | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/platformio.ini b/platformio.ini index 94ccba46..bb600258 100644 --- a/platformio.ini +++ b/platformio.ini @@ -11,7 +11,7 @@ ;To choose board please use one of definition: ;esp8266_1mb , esp8266_4mb , esp32_4mb [platformio] -default_envs = esp8266_1mb +default_envs = esp8266_4mb [common_env_data] diff --git a/src/UpgradeFirm.cpp b/src/UpgradeFirm.cpp index b3f57051..e3f2329b 100644 --- a/src/UpgradeFirm.cpp +++ b/src/UpgradeFirm.cpp @@ -1,8 +1,6 @@ -#include "Upgrade.h" - -#include "FileSystem.h" - #include "Class/NotAsync.h" +#include "FileSystem.h" +#include "Upgrade.h" #ifdef ESP8266 #include "ESP8266.h" #else @@ -45,12 +43,10 @@ void getLastVersion() { #endif if (tmp == "error") { lastVersion = -1; - } - else { + } else { lastVersion = tmp.toInt(); } - } - else { + } else { lastVersion = -2; } jsonWriteInt(configSetupJson, "last_version", lastVersion); @@ -97,7 +93,7 @@ bool upgradeFS() { Serial.printf("Start upgrade %s, please wait...", FS_NAME); #ifdef ESP8266 ESPhttpUpdate.rebootOnUpdate(false); - t_httpUpdate_return retFS = ESPhttpUpdate.updateSpiffs(wifiClient, serverIP + F("/projects/iotmanager/esp8266/") + FS_NAME + "/"+ FS_NAME+ ".bin"); + t_httpUpdate_return retFS = ESPhttpUpdate.updateSpiffs(wifiClient, serverIP + F("/projects/iotmanager/esp8266/littlefs/littlefs.bin")); #else httpUpdate.rebootOnUpdate(false); HTTPUpdateResult retFS = httpUpdate.updateSpiffs(wifiClient, serverIP + F("/projects/iotmanager/esp32/littlefs/spiffs.bin"));