Home Accessory Architect v12.11.1 Merlin

RavenSystem · Jan 17, 2024 · f7d7da4 · f7d7da4
1 parent 16aabfc
commit f7d7da4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/HAA/HAA_Main/main/header.h b/HAA/HAA_Main/main/header.h
@@ -11,7 +11,7 @@
 #include "../../common/common_headers.h"
 
 // Version
-#define HAA_FIRMWARE_VERSION                "12.11.0"
+#define HAA_FIRMWARE_VERSION                "12.11.1"
 #define HAA_FIRMWARE_BETA_REVISION          ""          // Format: "b01"
 #define HAA_FIRMWARE_CODENAME               "Merlin"
 

diff --git a/HAA/HAA_Main/main/setup.c b/HAA/HAA_Main/main/setup.c
@@ -999,7 +999,9 @@ static void wifi_config_server_on_settings_update_task(void* args) {
                 wifi_config_remove_ap_settings();
 
             } else {
-                if (!wifi_ap_param) {
+                char* ssid = NULL;
+                sysparam_get_string(WIFI_STA_SSID_SYSPARAM, &ssid);
+                if (ssid && !nowifi_param) {
                     sysparam_set_int8(WIFI_AP_ENABLE_SYSPARAM, 0);
                     sysparam_erase(WIFI_AP_PASSWORD_SYSPARAM);
                 }
@@ -1596,11 +1598,11 @@ static void wifi_config_station_connect() {
         sysparam_set_int8(HAA_SETUP_MODE_SYSPARAM, 0);
 
         if (setup_mode == 1) {
-            INFO("Auto reboot");
+            // Auto reboot
             context->auto_reboot_timer = rs_esp_timer_create(AUTO_REBOOT_TIMEOUT, pdFALSE, NULL, auto_reboot_run);
             rs_esp_timer_start_forced(context->auto_reboot_timer);
         } else if (setup_mode == 2) {
-            ERROR("Script");
+            // Error in Script
             context->param += 100;
         }
     }