Merge branch 'master' into development

This commit is contained in:
Verkehrsrot authored and GitHub committed 2021-03-12 23:35:31 +01:00
commit 10ceb0ca4d
5 files changed
+9 -7

No files matched your search

+1 -1
View File
@@ -115,7 +115,7 @@ void start_boot_menu(void) {
WiFi.mode(WIFI_STA);
// Connect to WiFi network
// workaround applied here to avoid WIFI_AUTH failure
// workaround applied here to bypass WIFI_AUTH failure
// see https://github.com/espressif/arduino-esp32/issues/2501
// 1st try
+2 -1
View File
@@ -129,7 +129,8 @@ bool loadConfig() {
switch (version_compare(PROGVERSION, cfg.version)) {
case -1: // device configuration belongs to newer than current firmware
ESP_LOGE(TAG, "Incompatible device configuration");
return false;
eraseConfig();
return true;
case 1: // device configuration belongs to older than current firmware
ESP_LOGW(TAG, "Device was updated, attempt to migrate configuration");
migrateConfig();