andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 00:09:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

small changes to migration

Browse Source
This commit is contained in:
proddy
2020-09-01 13:48:22 +02:00
parent abfd1ae63a
commit 1c5b7fe1b9
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/system.cpp
View File

@@ -617,6 +617,7 @@ bool System::check_upgrade() {
file1.close(); file1.close();
file2.close(); file2.close();
SPIFFS.end(); SPIFFS.end();
Serial.end();
return false; // can't open files return false; // can't open files
} }
@@ -628,18 +629,19 @@ bool System::check_upgrade() {
error = deserializeJson(doc1, file1); error = deserializeJson(doc1, file1);
if (error) { if (error) {
Serial.printf("Error. Failed to deserialize json, doc1, error %s", error.c_str()); Serial.printf(PSTR("Error. Failed to deserialize json, doc1, error %s"), error.c_str());
failed = true; failed = true;
} }
error = deserializeJson(doc2, file2); error = deserializeJson(doc2, file2);
if (error) { if (error) {
Serial.printf("Error. Failed to deserialize json, doc2, error %s", error.c_str()); Serial.printf(PSTR("Error. Failed to deserialize json, doc2, error %s"), error.c_str());
failed = true; failed = true;
} }
file1.close(); file1.close();
file2.close(); file2.close();
SPIFFS.end(); SPIFFS.end();
Serial.end();
if (failed) { if (failed) {
return false; // parse error return false; // parse error
@@ -675,10 +677,11 @@ bool System::check_upgrade() {
}, },
"local"); "local");
// ignoring publish_time
EMSESP::esp8266React.getMqttSettingsService()->update( EMSESP::esp8266React.getMqttSettingsService()->update(
[&](MqttSettings & mqttSettings) { [&](MqttSettings & mqttSettings) {
mqttSettings.host = mqtt["ip"] | FACTORY_MQTT_HOST; mqttSettings.host = mqtt["ip"] | FACTORY_MQTT_HOST;
mqttSettings.mqtt_format = (mqtt["nestedjson"] ? 2 : 1); mqttSettings.mqtt_format = (mqtt["nestedjson"] ? MQTT_format::NESTED : MQTT_format::SINGLE);
mqttSettings.mqtt_qos = mqtt["qos"] | 0; mqttSettings.mqtt_qos = mqtt["qos"] | 0;
mqttSettings.username = mqtt["user"] | ""; mqttSettings.username = mqtt["user"] | "";
mqttSettings.password = mqtt["password"] | ""; mqttSettings.password = mqtt["password"] | "";
@@ -718,7 +721,8 @@ bool System::check_upgrade() {
"local"); "local");
Serial.println(F("Restarting...")); Serial.println(F("Restarting..."));
Serial.end(); Serial.flush();
delay(2000);
restart(); // force a restart, nice and tidy restart(); // force a restart, nice and tidy
return true; return true;
#else #else