Merge branch 'master' into development
This commit is contained in:
5 files changed
+9
-7
No files matched your search
+1
-1
@@ -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
|
||||
|
||||
@@ -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();
|
||||
|
||||
Reference in new issue
Block a user