Home Accessory Architect v12.14.4 Merlin

RavenSystem · Dec 24, 2024 · e1a90f9 · e1a90f9
1 parent 988aebb
commit e1a90f9
Show file tree

Hide file tree

Showing 6 changed files with 117 additions and 101 deletions.
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     ""      // Format: "b01"
-#define INSTALLER_VERSION           "7.12.3"INSTALLER_BETA_REVISION
+#define INSTALLER_VERSION           "7.12.4"INSTALLER_BETA_REVISION
 
 #endif  // __HAA_OTA_HEADER_H__
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.14.3"
+#define HAA_FIRMWARE_VERSION                "12.14.4"
 #define HAA_FIRMWARE_BETA_REVISION          ""          // Format: "b01"
 #define HAA_FIRMWARE_CODENAME               "Merlin"
 

diff --git a/HAA/HAA_Main/main/main.c b/HAA/HAA_Main/main/main.c
@@ -7718,7 +7718,6 @@ void normal_mode_init() {
 
     cJSON_rsf* json_haa = cJSON_rsf_Parse(txt_config);
 
-    cJSON_rsf* json_config = cJSON_rsf_GetObjectItemCaseSensitive(json_haa, GENERAL_CONFIG);
     cJSON_rsf* json_accessories = cJSON_rsf_GetObjectItemCaseSensitive(json_haa, ACCESSORIES_ARRAY);
 
     const unsigned int total_accessories = cJSON_rsf_GetArraySize(json_accessories);
@@ -7731,6 +7730,8 @@ void normal_mode_init() {
         sdk_system_restart();
     }
 
+    cJSON_rsf* json_config = cJSON_rsf_GetObjectItemCaseSensitive(json_haa, GENERAL_CONFIG);
+
     // Binary Inputs GPIO Setup function
     bool diginput_register(cJSON_rsf* json_buttons, void* callback, ch_group_t* ch_group, const uint8_t param) {
         unsigned int active = false;

diff --git a/libs/homekit-rsf/src/json.c b/libs/homekit-rsf/src/json.c
@@ -232,7 +232,6 @@ void json_float(json_stream *json, float x) {
         size_t len = snprintf(NULL, 0, "%1.7g", x);
         char *buffer = malloc(len + 1);
         if (buffer) {
-            char *buffer = malloc(len + 1);
             snprintf(buffer, len + 1, "%1.7g", x);
 
             json_write(json, buffer, len);

diff --git a/libs/homekit-rsf/src/json.h b/libs/homekit-rsf/src/json.h
@@ -13,7 +13,7 @@
 
 #define JSON_MAX_DEPTH              (30)
 
-#define HOMEKIT_JSON_BUFFER_SIZE    (1442)
+#define HOMEKIT_JSON_BUFFER_SIZE    (1024)
 
 
 typedef int (*json_flush_callback)(uint8_t *buffer, size_t size, void *context);