Home Accessory Architect v4.7.5

RavenSystem · Jan 18, 2021 · 0e5903f · 0e5903f
1 parent 0b7b985
commit 0e5903f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/devices/HAA/header.h b/devices/HAA/header.h
@@ -9,7 +9,7 @@
 #define __HAA_HEADER_H__
 
 // Version
-#define FIRMWARE_VERSION                    "4.7.4"
+#define FIRMWARE_VERSION                    "4.7.5"
 
 // Sysparam
 #define SYSPARAMSECTOR                      (0xF3000)
@@ -510,8 +510,7 @@
 #define WIFI_PING_ERRORS                    "w"
 
 #define WIFI_RECONNECTION_POLL_PERIOD_MS    (5000)
-#define WIFI_DISCONNECTED_LONG_TIME         (12)    // * WIFI_RECONNECTION_POLL_PERIOD_MS
-#define WIFI_RECONNECTION_ARP_RESEND_PERIOD (4)     // * WIFI_RECONNECTION_POLL_PERIOD_MS
+#define WIFI_DISCONNECTED_LONG_TIME         (6)    // * WIFI_RECONNECTION_POLL_PERIOD_MS
 
 #define WIFI_WATCHDOG_POLL_PERIOD_MS        (1500)
 #define WIFI_WATCHDOG_ARP_RESEND_PERIOD     (13)    // * WIFI_WATCHDOG_POLL_PERIOD_MS

diff --git a/devices/HAA/main.c b/devices/HAA/main.c
@@ -445,21 +445,20 @@ void wifi_reconnection_task(void* args) {
 
         } else if (main_config.wifi_status == WIFI_STATUS_DISCONNECTED) {
             INFO("Wifi reconnecting...");
-            wifi_config_smart_connect();
             main_config.wifi_status = WIFI_STATUS_CONNECTING;
+            wifi_config_smart_connect();
 
         } else {
             main_config.wifi_error_count++;
             if (main_config.wifi_error_count > WIFI_DISCONNECTED_LONG_TIME) {
                 ERROR("Wifi disconnected for a long time. Reconnecting...");
                 main_config.wifi_error_count = 0;
                 main_config.wifi_status = WIFI_STATUS_DISCONNECTED;
+                sdk_wifi_station_disconnect();
 
                 led_blink(6);
 
                 do_actions(ch_group_find_by_acc(ACC_TYPE_ROOT_DEVICE), 5);
-            } else if (main_config.wifi_error_count % WIFI_RECONNECTION_ARP_RESEND_PERIOD == 0) {
-                wifi_config_resend_arp();
             }
         }
     }

diff --git a/devices/HAA/setup_mode/content/index.html b/devices/HAA/setup_mode/content/index.html
@@ -22,7 +22,7 @@
 .nonetworks{text-align:center;margin:1em 0;}
 .field{margin-bottom:0.5em;}
 .field.required label::before{content:"*";color:red;}
-</style></head><body><div class="container"><h1>Home Accessory Architect v4.7.4</h1>
+</style></head><body><div class="container"><h1>Home Accessory Architect v4.7.5</h1>
 <form action="/settings" method="post">
 <div class="field required conf">
 <label for="conf">JSON Config:</label>