Home Accessory Architect v12.13.1 Merlin

RavenSystem · Aug 25, 2024 · 3be8e7c · 3be8e7c
1 parent 4de4bf7
commit 3be8e7c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 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.13.0"
+#define HAA_FIRMWARE_VERSION                "12.13.1"
 #define HAA_FIRMWARE_BETA_REVISION          ""          // Format: "b01"
 #define HAA_FIRMWARE_CODENAME               "Merlin"
 
@@ -859,7 +859,7 @@
 #endif
 
 #ifdef LIGHT_DEBUG
-#define L_DEBUG(message, ...)               printf(message "\n", ##__VA_ARGS__)
+#define L_DEBUG(message, ...)               INFO(message, ##__VA_ARGS__)
 #else
 #define L_DEBUG(message, ...)
 #endif

diff --git a/HAA/HAA_Main/main/main.c b/HAA/HAA_Main/main/main.c
@@ -3423,13 +3423,14 @@ void hsi2rgbw(uint16_t h, float s, uint8_t v, ch_group_t* ch_group) {
             pair_transform(mat2, edge, edge, p5, p6); // this defines mat2
             gamut_transform(p, mat2, d); // this performs the shift by d, applies mat2, then shifts back
 
-            L_DEBUG("LED_RGB+k: [%g, %g]", (LED_RGB+k)[0], (LED_RGB+k)[1]);
+            L_DEBUG("LED_RGB + k: [%g, %g]", *(LED_RGB + k)[0], *(LED_RGB + k)[1]);
             L_DEBUG("new_vertex: [%g, %g]", new_vertex[0], new_vertex[1]);
             L_DEBUG("p5: [%g, %g]", p5[0], p5[1]);
             L_DEBUG("p6: [%g, %g]", p6[0], p6[1]);
             L_DEBUG("mat2 = { {%g, %g}, {%g, %g} }", mat2[0][0], mat2[0][1], mat2[1][0], mat2[1][1]);
 
         }
+
         INFO("Chrom %g, %g", p[0], p[1]);
     }
 
@@ -7187,6 +7188,7 @@ void do_actions(ch_group_t* ch_group, uint8_t action) {
                             }
 
                             if (value_int == 8) {
+                                rs_esp_timer_stop(SEC_SYSTEM_REC_ALARM_TIMER);
                                 SEC_SYSTEM_CH_CURRENT_STATE->value.int_value = SEC_SYSTEM_CH_TARGET_STATE->value.int_value;
                                 do_actions(ch_group, 8);
                                 homekit_characteristic_notify_safe(SEC_SYSTEM_CH_CURRENT_STATE);