diff --git a/data/set.device.json b/data/set.device.json index f2bafcc3..68c1369c 100644 --- a/data/set.device.json +++ b/data/set.device.json @@ -43,7 +43,7 @@ }, { "type": "h4", - "title": "LittleFS version: 243" + "title": "LittleFS version: 245" }, { "type": "hr" diff --git a/include/Consts.h b/include/Consts.h index f0e9731f..89db66f1 100644 --- a/include/Consts.h +++ b/include/Consts.h @@ -2,7 +2,7 @@ //=================Firmeare================= #define FIRMWARE_NAME "esp8266-iotm" -#define FIRMWARE_VERSION 243 +#define FIRMWARE_VERSION 245 #define FLASH_4MB true //=================System=================== diff --git a/src/UpgradeFirm.cpp b/src/UpgradeFirm.cpp index a1e2c524..6d5b4086 100644 --- a/src/UpgradeFirm.cpp +++ b/src/UpgradeFirm.cpp @@ -27,7 +27,7 @@ void upgradeInit() { void getLastVersion() { if ((WiFi.status() == WL_CONNECTED)) { - String tmp = getURL(F("http://95.128.182.133/projects/iotmanager/esp8266/esp8266ver.txt")); + String tmp = getURL(F("http://95.128.182.133/projects/iotmanager/esp8266/esp8266ver/esp8266ver.txt")); if (tmp == "error") { lastVersion = -1; } else { @@ -58,7 +58,7 @@ bool upgradeFS() { 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")); + t_httpUpdate_return retFS = ESPhttpUpdate.updateSpiffs(wifiClient, F("http://95.128.182.133/projects/iotmanager/esp8266/littlefs/littlefs.bin")); if (retFS == HTTP_UPDATE_OK) { //если FS обновилась успешно SerialPrint("I", "Update", "LittleFS upgrade done!"); ret = true; @@ -71,7 +71,7 @@ bool upgradeBuild() { 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")); + t_httpUpdate_return retBuild = ESPhttpUpdate.update(wifiClient, F("http://95.128.182.133/projects/iotmanager/esp8266/firmware/firmware.bin")); if (retBuild == HTTP_UPDATE_OK) { //если BUILD обновился успешно SerialPrint("I", "Update", "BUILD upgrade done!"); ret = true; diff --git a/src/Web.cpp b/src/Web.cpp index 72d2b803..20d13cd9 100644 --- a/src/Web.cpp +++ b/src/Web.cpp @@ -258,7 +258,7 @@ void web_init() { if (lastVersion == FIRMWARE_VERSION) { msg = F("Актуальная версия прошивки уже установлена."); } else if (lastVersion > FIRMWARE_VERSION) { - msg = F("Новая версия прошивкиИдет обновление прошивки, после обновления страница перезагрузится автоматически...')\">Установить"); + msg = F("Новая версия прошивкиИдет обновление прошивки, после обновления страница перезагрузится автоматически...')\">Установить"); } else if (lastVersion == -1) { msg = F("Cервер не найден. Попробуйте повторить позже..."); } else if (lastVersion == -2) {