Home Accessory Architect v12.9.1 Merlin

RavenSystem · Oct 23, 2023 · eb2eec9 · eb2eec9
1 parent 417660c
commit eb2eec9
Show file tree

Hide file tree

Showing 24 changed files with 234 additions and 210 deletions.
diff --git a/HAA/HAA_Installer/main/Makefile b/HAA/HAA_Installer/main/Makefile
@@ -103,8 +103,7 @@ EXTRA_CFLAGS += -DWIFI_PARAM_SAVE=0
 EXTRA_CFLAGS += -DconfigMAX_TASK_NAME_LEN=7
 EXTRA_CFLAGS += -DconfigCHECK_FOR_STACK_OVERFLOW=2
 EXTRA_CFLAGS += -DconfigMINIMAL_STACK_SIZE=256
-#EXTRA_CFLAGS += -DconfigTIMER_TASK_PRIORITY=\(configMAX_PRIORITIES-1\)
-EXTRA_CFLAGS += -DconfigTIMER_TASK_PRIORITY=\(tskIDLE_PRIORITY+3\)
+EXTRA_CFLAGS += -DconfigTIMER_TASK_PRIORITY=\(configMAX_PRIORITIES-3\)
 EXTRA_CFLAGS += -DconfigTIMER_QUEUE_LENGTH=10
 EXTRA_CFLAGS += -DconfigTIMER_TASK_STACK_DEPTH=600
 

diff --git a/HAA/HAA_Installer/main/header.h b/HAA/HAA_Installer/main/header.h
@@ -11,6 +11,6 @@
 #include "../../common/common_headers.h"
 
 #define INSTALLER_BETA_REVISION     ""
-#define INSTALLER_VERSION           "7.7.0"INSTALLER_BETA_REVISION
+#define INSTALLER_VERSION           "7.7.1"INSTALLER_BETA_REVISION
 
 #endif  // __HAA_OTA_HEADER_H__
diff --git a/HAA/HAA_Installer/main/main.c.lcm b/HAA/HAA_Installer/main/main.c.lcm
@@ -628,7 +628,7 @@ void ota_task(void *arg) {
 
         ota_init(user_repo, is_ssl);
 
-        vTaskDelay(pdMS_TO_TICKS(2000));
+        vTaskDelay(2000 / portTICK_PERIOD_MS);
 
         sysparam_set_int8(HAA_SETUP_MODE_SYSPARAM, 0);
 
@@ -745,7 +745,7 @@ void ota_task(void *arg) {
                 break;
             }
 
-            vTaskDelay(pdMS_TO_TICKS(5000));
+            vTaskDelay(5000 / portTICK_PERIOD_MS);
         }
     } else {
         printf("\n! Reading HAAMAIN Version, fixing\n\n");

diff --git a/HAA/HAA_Installer/main/setup.c b/HAA/HAA_Installer/main/setup.c
@@ -1243,7 +1243,7 @@ static void wifi_config_sta_connect_timeout_task() {
 
             wifi_config_context_free(context);
 
-            rs_esp_timer_start_forced(rs_esp_timer_create(AUTO_REBOOT_ON_HANG_OTA_TIMEOUT, false, NULL, auto_reboot_run));
+            rs_esp_timer_start_forced(rs_esp_timer_create(AUTO_REBOOT_ON_HANG_OTA_TIMEOUT, pdFALSE, NULL, auto_reboot_run));
 
             break;
 
@@ -1457,7 +1457,7 @@ static void wifi_config_station_connect() {
         sysparam_set_int8(HAA_SETUP_MODE_SYSPARAM, 0);
 
         if (setup_mode == 1) {
-            context->auto_reboot_timer = rs_esp_timer_create(AUTO_REBOOT_TIMEOUT, false, NULL, auto_reboot_run);
+            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);
         }
     }

diff --git a/HAA/HAA_Main/main/Makefile b/HAA/HAA_Main/main/Makefile
@@ -69,6 +69,7 @@ EXTRA_CFLAGS += -DARP_TABLE_SIZE=10
 EXTRA_CFLAGS += -DDNS_MAX_RETRIES=2
 EXTRA_CFLAGS += -DDHCP_DOES_ARP_CHECK=0
 EXTRA_CFLAGS += -DLWIP_DHCP_AGGRESSIVE
+EXTRA_CFLAGS += -DLWIP_DHCP_RANDOMIZE_COARSE_TIME_SECS=10
 EXTRA_CFLAGS += -DDEFAULT_RAW_RECVMBOX_SIZE=5
 EXTRA_CFLAGS += -DMEMP_NUM_NETCONN=16
 #EXTRA_CFLAGS += -DCHECKSUM_CHECK_UDP=0
@@ -84,8 +85,7 @@ EXTRA_CFLAGS += -DWIFI_PARAM_SAVE=0
 EXTRA_CFLAGS += -DconfigMAX_TASK_NAME_LEN=7
 EXTRA_CFLAGS += -DconfigCHECK_FOR_STACK_OVERFLOW=2
 EXTRA_CFLAGS += -DconfigMINIMAL_STACK_SIZE=256
-#EXTRA_CFLAGS += -DconfigTIMER_TASK_PRIORITY=\(configMAX_PRIORITIES-1\)
-EXTRA_CFLAGS += -DconfigTIMER_TASK_PRIORITY=\(tskIDLE_PRIORITY+3\)
+EXTRA_CFLAGS += -DconfigTIMER_TASK_PRIORITY=\(configMAX_PRIORITIES-3\)
 EXTRA_CFLAGS += -DconfigTIMER_QUEUE_LENGTH=15
 EXTRA_CFLAGS += -DconfigTIMER_TASK_STACK_DEPTH=736
 

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.9.0"
+#define HAA_FIRMWARE_VERSION                "12.9.1"
 #define HAA_FIRMWARE_BETA_REVISION          ""
 #define HAA_FIRMWARE_CODENAME               "Merlin"
 
@@ -555,11 +555,12 @@
 #define FM_MATHS_GET_TIME_DAYYEAR           (-7)
 #define FM_MATHS_GET_TIME_YEAR              (-8)
 #define FM_MATHS_GET_TIME_IS_SAVING         (-9)
-#define FM_MATHS_GEN_RANDOM_NUMBER          (-10)
-#define FM_MATHS_GET_UPTIME                 (-11)
-#define FM_MATHS_GET_WIFI_RSSI              (-12)
-#define FM_MATHS_GET_HK_CLIENT_IPADDR       (-13)
-#define FM_MATHS_GET_HK_CLIENT_COUNT        (-14)
+#define FM_MATHS_GET_TIME_UNIX              (-10)
+#define FM_MATHS_GEN_RANDOM_NUMBER          (-11)
+#define FM_MATHS_GET_UPTIME                 (-12)
+#define FM_MATHS_GET_WIFI_RSSI              (-13)
+#define FM_MATHS_GET_HK_CLIENT_IPADDR       (-14)
+#define FM_MATHS_GET_HK_CLIENT_COUNT        (-15)
 #define FM_MATHS_OPERATIONS                 ch_group->num_i[1]
 #define FM_MATHS_FIRST_OPERATION            (2)
 #define FM_MATHS_INT                        ch_group->num_i