From 0685a943684b0445472839e74a665f59691a5cf6 Mon Sep 17 00:00:00 2001
From: RavenSystem <josea.jimenez@ravensystem.es>
Date: Wed, 22 Jan 2025 18:08:34 +0100
Subject: [PATCH] Home Accessory Architect v12.14.8 Merlin

---
 HAA/HAA_Installer/main/header.h   |  2 +-
 HAA/HAA_Installer/main/setup.html |  2 +-
 HAA/HAA_Main/main/header.h        |  4 +++-
 HAA/HAA_Main/main/main.c          | 15 +++++++++++++++
 HAA/HAA_Main/main/setup.html      |  2 +-
 HAA/HAA_Main/main/types.h         |  2 ++
 6 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/HAA/HAA_Installer/main/header.h b/HAA/HAA_Installer/main/header.h
index ecdee934..5beb3f92 100644
--- 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.6"INSTALLER_BETA_REVISION
+#define INSTALLER_VERSION           "7.12.7"INSTALLER_BETA_REVISION
 
 #endif  // __HAA_OTA_HEADER_H__
diff --git a/HAA/HAA_Installer/main/setup.html b/HAA/HAA_Installer/main/setup.html
index 145697d5..54892d3a 100644
--- a/HAA/HAA_Installer/main/setup.html
+++ b/HAA/HAA_Installer/main/setup.html
@@ -78,7 +78,7 @@ <h2>Please, support this project by <a href="https://paypal.me/ravensystem">dona
 <input type="checkbox" name="ssl" value="y" <!-- part HTML_SETTINGS_REPOSSL -->> HTTPS<br>
 </div>
 </form>
-<center>© 2018-2024 Jos&eacute; A. Jim&eacute;nez Campos</center>
+<center>© 2018-2025 Jos&eacute; A. Jim&eacute;nez Campos</center>
 <h2>If you have paid for this firmware or for a device with it installed, you have been scammed. <a href="https://github.com/RavenSystem/esp-homekit-devices">Read LICENSE</a></h2>
 </div><script>
 var ssid_field,bssid_field,pass_block,pass_field,join_button;
diff --git a/HAA/HAA_Main/main/header.h b/HAA/HAA_Main/main/header.h
index 0c048341..8a4f7eb6 100644
--- 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.7"
+#define HAA_FIRMWARE_VERSION                "12.14.8"
 #define HAA_FIRMWARE_BETA_REVISION          ""          // Format: "b01"
 #define HAA_FIRMWARE_CODENAME               "Merlin"
 
@@ -777,6 +777,8 @@
 #define SERV_TYPE_DATA_HISTORY              (95)
 #define SERV_TYPE_IAIRZONING                (99)
 
+#define ZERO_CROSS_INTERRUPT_DELAY_MS_SET   "zd"
+
 #define SERIAL_STRING                       "sn"
 #define SERIAL_STRING_LEN                   (11)
 
diff --git a/HAA/HAA_Main/main/main.c b/HAA/HAA_Main/main/main.c
index 0c91c46f..4af6b624 100644
--- a/HAA/HAA_Main/main/main.c
+++ b/HAA/HAA_Main/main/main.c
@@ -161,6 +161,7 @@ main_config_t main_config = {
     .mcp23017s = NULL,
     
     .delayed_binary_outputs = NULL,
+    .zc_delay = 0,
 };
 
 #ifdef ESP_PLATFORM
@@ -411,13 +412,22 @@ static void IRAM delayed_binary_output_interrupt(const uint8_t trigger_gpio) {
 #endif
     int trigger_gpio_read_inverted_value = !gpio_read(trigger_gpio);
     
+    unsigned int delay = true;
+    
     delayed_binary_output_t* delayed_binary_output = main_config.delayed_binary_outputs;
     while (delayed_binary_output) {
         if (delayed_binary_output->enable &&
             delayed_binary_output->trigger_gpio == trigger_gpio &&
             (delayed_binary_output->trigger_gpio_mode == 3 ||
              (delayed_binary_output->trigger_gpio_mode - 1) == trigger_gpio_read_inverted_value)) {
+            
+            if (main_config.zc_delay > 0 && delay) {
+                sdk_os_delay_us(main_config.zc_delay);
+                delay = false;
+            }
+            
             gpio_write(delayed_binary_output->gpio, delayed_binary_output->value);
+            
             delayed_binary_output->enable = false;
         }
         
@@ -9490,6 +9500,11 @@ void normal_mode_init() {
         led_create(led_gpio, led_inverted);
     }
     
+    // Zero-Cross Interrupt delay
+    if (cJSON_rsf_GetObjectItemCaseSensitive(json_config, ZERO_CROSS_INTERRUPT_DELAY_MS_SET) != NULL) {
+        main_config.zc_delay = cJSON_rsf_GetObjectItemCaseSensitive(json_config, ZERO_CROSS_INTERRUPT_DELAY_MS_SET)->valuefloat * 1000.f;
+    }
+    
     // IR TX LED GPIO
     if (cJSON_rsf_GetObjectItemCaseSensitive(json_config, IR_ACTION_TX_GPIO) != NULL) {
         // IR TX LED Frequency
diff --git a/HAA/HAA_Main/main/setup.html b/HAA/HAA_Main/main/setup.html
index 704c8452..8e500c76 100644
--- a/HAA/HAA_Main/main/setup.html
+++ b/HAA/HAA_Main/main/setup.html
@@ -118,7 +118,7 @@ <h2>Please, support this project by <a href="https://paypal.me/ravensystem">dona
 <label for="bssid">BSSID</label>
 <input type="text" id="bssid" name="bid" maxlength="12">
 </div></form>
-<center>© 2018-2024 Jos&eacute; A. Jim&eacute;nez Campos</center>
+<center>© 2018-2025 Jos&eacute; A. Jim&eacute;nez Campos</center>
 <h2>If you have paid for this firmware or for a device with it installed, you have been scammed. <a href="https://github.com/RavenSystem/esp-homekit-devices">Read LICENSE</a></h2>
 </div><script>
 var ssid_field,bssid_field,pass_block,pass_field,join_button;
diff --git a/HAA/HAA_Main/main/types.h b/HAA/HAA_Main/main/types.h
index 3b2a277e..09a5c91a 100644
--- a/HAA/HAA_Main/main/types.h
+++ b/HAA/HAA_Main/main/types.h
@@ -376,6 +376,8 @@ typedef struct _main_config {
     int8_t setup_mode_toggle_counter;
     int8_t setup_mode_toggle_counter_max;
     
+    uint32_t zc_delay;
+    
     uint16_t setup_mode_time;
     uint16_t wifi_roaming_count;