iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-27 14:42:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

changed json var names to more visible

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-06-19 14:50:34 +02:00
parent e6637dcd69
commit 48ba3c99dd
18 changed files with 428 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Upgrade.cpp
View File

@@ -24,7 +24,7 @@ const String getFirmwareUrl() {
void initUpgrade() {
String last_version = WiFi.status() == WL_CONNECTED ? getURL(getVersionUrl()) : "";
jsonWriteStr(configSetup, "last_version", last_version);
jsonWriteStr(configSetupJson, "last_version", last_version);
Serial.printf("[i] Last firmware version: %s\n", last_version.c_str());
@@ -73,17 +73,17 @@ void do_upgrade_url() {
if (upgrade_url) {
upgrade_url = false;
last_version = getURL(getVersionUrl());
jsonWriteStr(configSetup, "last_version", last_version);
jsonWriteStr(configSetupJson, "last_version", last_version);
}
}
void upgrade_firmware() {
String scenario_for_update;
String config_for_update;
String configSetup_for_update;
String configSetupJson_for_update;
scenario_for_update = readFile("firmware.s.txt", 4000);
config_for_update = readFile("firmware.c.txt", 4000);
configSetup_for_update = configSetup;
configSetupJson_for_update = configSetupJson;
Serial.println("Start upgrade SPIFFS, please wait...");
@@ -95,7 +95,7 @@ void upgrade_firmware() {
if (ret == HTTP_UPDATE_OK) {
writeFile("firmware.s.txt", scenario_for_update);
writeFile("firmware.c.txt", config_for_update);
writeFile("config.json", configSetup_for_update);
writeFile("config.json", configSetupJson_for_update);
saveConfig();
Serial.println("SPIFFS upgrade done!");
@@ -157,16 +157,16 @@ void do_upgrade() {
if (spiffsData != "") { // Если нужно прошить FS
String scenario_for_update;
String config_for_update;
String configSetup_for_update;
String configSetupJson_for_update;
Serial.println(spiffsData);
scenario_for_update = readFile("firmware.s.txt", 2048);
config_for_update = readFile("config.all.txt", 2048);
configSetup_for_update = configSetup;
configSetupJson_for_update = configSetupJson;
ESPhttpUpdate.rebootOnUpdate(false); // Отключим перезагрузку после обновления
updateHTTP(spiffsData, true);
writeFile("firmware.s.txt", scenario_for_update);
writeFile("config.all.txt", config_for_update);
writeFile("config.json", configSetup_for_update);
writeFile("config.json", configSetupJson_for_update);
saveConfig();
}