From 5c4581563e29fba521afa1dd4db81f8f09c5709f Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sat, 21 Dec 2024 21:14:41 +0100
Subject: [PATCH 01/31] Rebuild Button click engine

The native engine from ESPHome cannot be used here as a button press event is triggered on touch, which would trigger the click even on swipe.
Other projects solved this by tracking only single click and only at release, so we decided to implement this in a different way, so we can handle multiple or long-clicks also.
This should finally solve #14, but some test is required to ensure nothing else was broken.
---
 ...Ultimate-Easy-ESPHome_core_hw_buttons.yaml | 235 +++++++++---------
 ...X-Ultimate-Easy-ESPHome_core_hw_touch.yaml |   8 +-
 2 files changed, 119 insertions(+), 124 deletions(-)

diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml
index 2e8a8a0..f65f53d 100644
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml
@@ -20,111 +20,53 @@ substitutions:
   BUTTON_3_ACTION_TEXT: "Relay 3 (toggle)"
   BUTTON_4_ACTION_TEXT: "Relay 4 (toggle)"
 
-binary_sensor:
-  - id: bs_button_1
-    name: Button 1
-    icon: mdi:gesture-tap-box
-    internal: false
-    platform: template
-    on_click:
-      then:
-        - script.execute:
-            id: button_action
-            component: bs_button_1
-            event: click
-    on_double_click:
-      then:
-        - script.execute:
-            id: button_action
-            component: bs_button_1
-            event: double_click
-    on_multi_click:
-      - timing: &long_click-timing
-          - ON for at least 0.8s
-        invalid_cooldown: ${invalid_cooldown}
-        then:
-          - script.execute:
-              id: button_action
-              component: bs_button_1
-              event: long_click
+  BUTTON_CLICK_MIN_LENGTH: '50'    # The minimum duration the click should last, in msec
+  BUTTON_CLICK_MAX_LENGTH: '350'   # The maximum duration the click should last, in msec
+  BUTTON_MULTI_CLICK_DELAY: '500'  # The time to wait for another click, in msec
+  BUTTON_PRESS_TIMEOUT: '10000'    # Ignore if buttor is pressed for longer than this time, in msec
+  BUTTON_LONG_PRESS_DELAY: '800'   # The time to wait to consider a long press, in msec
 
-  - id: bs_button_2
+binary_sensor:
+  - &binary_sensor_button_base
+    id: bs_button_2
     name: Button 2
     icon: mdi:gesture-tap-box
-    internal: true
     platform: template
-    on_click:
-      then:
-        - script.execute:
-            id: button_action
-            component: bs_button_2
-            event: click
-    on_double_click:
-      then:
-        - script.execute:
-            id: button_action
-            component: bs_button_2
-            event: double_click
-    on_multi_click:
-      - timing: *long_click-timing
-        invalid_cooldown: ${invalid_cooldown}
-        then:
-          - script.execute:
-              id: button_action
-              component: bs_button_2
-              event: long_click
+    internal: true
 
   - id: bs_button_3
     name: Button 3
-    icon: mdi:gesture-tap-box
-    internal: true
-    platform: template
-    on_click:
-      then:
-        - script.execute:
-            id: button_action
-            component: bs_button_3
-            event: click
-    on_double_click:
-      then:
-        - script.execute:
-            id: button_action
-            component: bs_button_3
-            event: double_click
-    on_multi_click:
-      - timing: *long_click-timing
-        invalid_cooldown: ${invalid_cooldown}
-        then:
-          - script.execute:
-              id: button_action
-              component: bs_button_3
-              event: long_click
+    <<: *binary_sensor_button_base
 
   - id: bs_button_4
     name: Button 4
-    icon: mdi:gesture-tap-box
-    internal: true
-    platform: template
-    on_click:
-      then:
-        - script.execute:
-            id: button_action
-            component: bs_button_4
-            event: click
-    on_double_click:
-      then:
-        - script.execute:
-            id: button_action
-            component: bs_button_4
-            event: double_click
-    on_multi_click:
-      - timing: *long_click-timing
-        invalid_cooldown: ${invalid_cooldown}
-        then:
-          - script.execute:
-              id: button_action
-              component: bs_button_4
-              event: long_click
+    <<: *binary_sensor_button_base
+
+  - id: bs_button_1
+    name: Button 1
+    internal: false
+    <<: *binary_sensor_button_base
+
+globals:
+  - id: button_press_button
+    type: uint8_t
+    restore_value: false
+    initial_value: '0'
+
+  - id: button_press_position
+    type: uint8_t
+    restore_value: false
+    initial_value: '0'
+
+  - id: button_press_start_time
+    type: uint32_t
+    restore_value: false
+    initial_value: '0'
+
+  - id: click_counter
+    type: uint8_t
+    restore_value: false
+    initial_value: '0'
 
 script:
   - id: !extend boot_initialize
@@ -162,9 +104,15 @@ script:
     parameters:
       component: string
       event: string
-    then:  # There's nothing here so far
-    # Extended by:
-    #   - core_api
+    then:
+      # Extended by:
+      #   - core_api
+      - lambda: |-
+          ESP_LOGI("core_hw_buttons", "Button '%s' action: '%s'", component.c_str(), event.c_str());
+          id(button_press_button) = 0;
+          id(click_counter) = 0;
+          id(button_press_start_time) = 0;
+          buttons_release->execute();
 
   - id: buttons_release
     mode: restart
@@ -195,34 +143,81 @@ script:
       touch_x: uint8_t
     then:
       - lambda: |-
+          id(button_press_start_time) = millis();
+          id(button_press_position) = touch_x;
+          uint8_t button = 0;
           auto model_index = sl_tx_model_gang->active_index();
           if (model_index.has_value()) {
-            uint8_t model_idx = model_index.value() + 1;
-            switch (model_idx) {
-              case 1:  // 1 Gang
-                bs_button_1->publish_state(true);
-                break;
-              case 2:  // 2 Gang
-                if (touch_x <= 5) bs_button_1->publish_state(true);
-                else bs_button_2->publish_state(true);
-                break;
-              case 3:  // 3 Gang
-                if (touch_x <= 3) bs_button_1->publish_state(true);
-                else if (touch_x <= 7) bs_button_2->publish_state(true);
-                else bs_button_3->publish_state(true);
-                break;
-              case 4:  // 4 Gang
-                if (touch_x <= 2) bs_button_1->publish_state(true);
-                else if (touch_x <= 5) bs_button_2->publish_state(true);
-                else if (touch_x <= 8) bs_button_3->publish_state(true);
-                else bs_button_4->publish_state(true);
-                break;
-            }
+              const uint8_t model_idx = model_index.value() + 1; // Increment for 1-based indexing
+              if (model_idx == 1) {
+                  button = 1; // Single button, always 1
+              } else {
+                  const uint8_t step = 10 / model_idx; // Calculate step size for regions
+                  button = (touch_x / step) + 1; // Determine button region
+                  if (button > model_idx)
+                    button = model_idx; // Clamp to max button count
+              }
+          }
+          // Update binary sensor
+          switch (button) {
+            case 1:
+              bs_button_1->publish_state(true);
+              break;
+            case 2:
+              bs_button_2->publish_state(true);
+              break;
+            case 3:
+              bs_button_3->publish_state(true);
+              break;
+            case 4:
+              bs_button_4->publish_state(true);
+              break;
+          }
+          // Update counters
+          if (id(button_press_button) == button) {
+            id(click_counter)++;
+          } else {
+            id(click_counter) = 1;
+            id(button_press_button) = button;
           }
 
   - id: !extend touch_on_release
     then:
-      - script.execute: buttons_release
+      - lambda: |-
+          uint32_t current_time = millis();
+          buttons_release->execute();
+          if (id(button_press_start_time) > 0 and
+              id(button_press_start_time) < current_time) {
+            uint32_t press_duration  = current_time - id(button_press_start_time);
+            // Handle overflow (optional, since it's unlikely to happen here)
+            ESP_LOGI("core_hw_buttons", "Button press duration: %" PRIu32 " ms", press_duration);
+            if (press_duration < ${BUTTON_CLICK_MIN_LENGTH}) {
+              ESP_LOGW("core_hw_buttons", "Ignoring button press (too short)");
+            } else if (press_duration >= ${BUTTON_CLICK_MIN_LENGTH} and
+                        press_duration <= ${BUTTON_CLICK_MAX_LENGTH}) { // Short/normal click
+              button_click_event->execute();
+            } else if (press_duration >= ${BUTTON_LONG_PRESS_DELAY} and press_duration <= ${BUTTON_PRESS_TIMEOUT}) {
+              button_action->execute(("bs_button_" + std::to_string(id(button_press_button))).c_str(), "long_click");
+            } else if (press_duration > ${BUTTON_PRESS_TIMEOUT}) { // Timeout or invalid
+              ESP_LOGW("core_hw_buttons", "Button press cancelled or timed out after ${BUTTON_PRESS_TIMEOUT} ms");
+            }
+          } else {
+            ESP_LOGW("core_hw_buttons", "Press event timestamp not recorded yet");
+          }
+          id(button_press_start_time) = 0;
+
+  - id: button_click_event
+    mode: restart
+    then:
+      - delay:
+          milliseconds: ${BUTTON_MULTI_CLICK_DELAY}
+      - lambda: |-
+          button_action->execute(
+            ("bs_button_" + std::to_string(id(button_press_button))).c_str(),
+            (id(click_counter) == 1 ? "click" :
+            (id(click_counter) == 2 ? "double_click" :
+            (std::to_string(id(click_counter)) + "_click").c_str()))
+          );
 
   - id: !extend touch_swipe_left
     then:
diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml
index 08c6490..ed5cf00 100644
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml
@@ -233,8 +233,8 @@ tx_ultimate_easy:
         ESP_LOGD("tx_ultimate_easy", "  Position: %i", touch.x);
 
 uart:
-  id: uart_touch
-  tx_pin: GPIO19
-  rx_pin: GPIO22
-  baud_rate: 115200
+  - id: uart_touch
+    tx_pin: GPIO19
+    rx_pin: GPIO22
+    baud_rate: 115200
 ...

From 35cc0c4a8e849240c906d7fe791368573250c390 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sat, 21 Dec 2024 21:18:54 +0100
Subject: [PATCH 02/31] Reorganize scripts for better clarity

---
 ...Ultimate-Easy-ESPHome_core_hw_buttons.yaml | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml
index f65f53d..a7bfec1 100644
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml
@@ -114,6 +114,19 @@ script:
           id(button_press_start_time) = 0;
           buttons_release->execute();
 
+  - id: button_click_event
+    mode: restart
+    then:
+      - delay:
+          milliseconds: ${BUTTON_MULTI_CLICK_DELAY}
+      - lambda: |-
+          button_action->execute(
+            ("bs_button_" + std::to_string(id(button_press_button))).c_str(),
+            (id(click_counter) == 1 ? "click" :
+            (id(click_counter) == 2 ? "double_click" :
+            (std::to_string(id(click_counter)) + "_click").c_str()))
+          );
+
   - id: buttons_release
     mode: restart
     then:
@@ -206,19 +219,6 @@ script:
           }
           id(button_press_start_time) = 0;
 
-  - id: button_click_event
-    mode: restart
-    then:
-      - delay:
-          milliseconds: ${BUTTON_MULTI_CLICK_DELAY}
-      - lambda: |-
-          button_action->execute(
-            ("bs_button_" + std::to_string(id(button_press_button))).c_str(),
-            (id(click_counter) == 1 ? "click" :
-            (id(click_counter) == 2 ? "double_click" :
-            (std::to_string(id(click_counter)) + "_click").c_str()))
-          );
-
   - id: !extend touch_swipe_left
     then:
       - script.execute: buttons_release

From 976a90311850c69a1aeb59df27dcf35d919b594a Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sat, 21 Dec 2024 21:25:29 +0100
Subject: [PATCH 03/31] Fix references

---
 .test/esphome_ard_basic.yaml             | 2 +-
 .test/esphome_idf53_bluetooth_proxy.yaml | 2 +-
 .test/esphome_idf_bluetooth_proxy.yaml   | 2 +-
 TX-Ultimate-Easy-ESPHome.yaml            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.test/esphome_ard_basic.yaml b/.test/esphome_ard_basic.yaml
index dbda8d8..ed32a8f 100644
--- a/.test/esphome_ard_basic.yaml
+++ b/.test/esphome_ard_basic.yaml
@@ -1,6 +1,6 @@
 ---
 packages:
-  basic_package: !include ../TX-Ultimate-Easy-ESPHome.yaml  # Basic package
+  basic_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml  # Basic package
 
 esp32:
   framework:
diff --git a/.test/esphome_idf53_bluetooth_proxy.yaml b/.test/esphome_idf53_bluetooth_proxy.yaml
index 1e8643f..a8d3868 100644
--- a/.test/esphome_idf53_bluetooth_proxy.yaml
+++ b/.test/esphome_idf53_bluetooth_proxy.yaml
@@ -1,6 +1,6 @@
 ---
 packages:
-  basic_package: !include ../TX-Ultimate-Easy-ESPHome.yaml  # Core package
+  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
   addon_bluetooth_proxy: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_addon_ble_proxy.yaml
 
 esp32:
diff --git a/.test/esphome_idf_bluetooth_proxy.yaml b/.test/esphome_idf_bluetooth_proxy.yaml
index a2f9a0b..3e434a5 100644
--- a/.test/esphome_idf_bluetooth_proxy.yaml
+++ b/.test/esphome_idf_bluetooth_proxy.yaml
@@ -1,5 +1,5 @@
 ---
 packages:
-  basic_package: !include ../TX-Ultimate-Easy-ESPHome.yaml  # Core package
+  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
   addon_bluetooth_proxy: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_addon_ble_proxy.yaml
 ...
diff --git a/TX-Ultimate-Easy-ESPHome.yaml b/TX-Ultimate-Easy-ESPHome.yaml
index 3b95ea8..0befff0 100644
--- a/TX-Ultimate-Easy-ESPHome.yaml
+++ b/TX-Ultimate-Easy-ESPHome.yaml
@@ -16,7 +16,7 @@ wifi:
 packages:
   remote_package:
     url: https://github.com/edwardtfn/TX-Ultimate-Easy
-    ref: dev
+    ref: latest
     refresh: 30s
     files:
       - ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml

From 8668fe8dc92967902a9b7b9899c0552e8c031a4d Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sat, 21 Dec 2024 21:29:05 +0100
Subject: [PATCH 04/31] Fix another bad reference

---
 ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml
index ed5cf00..86bf53c 100644
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml
@@ -61,7 +61,7 @@ external_components:
   - source:
       type: git
       url: https://github.com/edwardtfn/TX-Ultimate-Easy
-      ref: ${version}
+      ref: v${version}
     refresh: 1h
     components:
       - tx_ultimate_easy

From 857c43940dc82621a71c4c1aaa280e4ae7698f13 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sat, 21 Dec 2024 21:54:54 +0100
Subject: [PATCH 05/31] CodeRabbitAI Nitpick

---
 ...TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml | 16 ++++++++--------
 .../TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml  |  3 +++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml
index a7bfec1..072479e 100644
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml
@@ -23,7 +23,7 @@ substitutions:
   BUTTON_CLICK_MIN_LENGTH: '50'    # The minimum duration the click should last, in msec
   BUTTON_CLICK_MAX_LENGTH: '350'   # The maximum duration the click should last, in msec
   BUTTON_MULTI_CLICK_DELAY: '500'  # The time to wait for another click, in msec
-  BUTTON_PRESS_TIMEOUT: '10000'    # Ignore if buttor is pressed for longer than this time, in msec
+  BUTTON_PRESS_TIMEOUT: '10000'    # Ignore if button is pressed for longer than this time, in msec
   BUTTON_LONG_PRESS_DELAY: '800'   # The time to wait to consider a long press, in msec
 
 binary_sensor:
@@ -120,12 +120,12 @@ script:
       - delay:
           milliseconds: ${BUTTON_MULTI_CLICK_DELAY}
       - lambda: |-
-          button_action->execute(
-            ("bs_button_" + std::to_string(id(button_press_button))).c_str(),
-            (id(click_counter) == 1 ? "click" :
-            (id(click_counter) == 2 ? "double_click" :
-            (std::to_string(id(click_counter)) + "_click").c_str()))
-          );
+          const std::string button_name = "bs_button_" + std::to_string(id(button_press_button));
+          std::string event_name;
+          if (id(click_counter) == 1) event_name = "click";
+          else if (id(click_counter) == 2) event_name = "double_click";
+          else event_name = std::to_string(id(click_counter)) + "_click";
+          button_action->execute(button_name.c_str(), event_name.c_str());
 
   - id: buttons_release
     mode: restart
@@ -165,7 +165,7 @@ script:
               if (model_idx == 1) {
                   button = 1; // Single button, always 1
               } else {
-                  const uint8_t step = 10 / model_idx; // Calculate step size for regions
+                  const uint8_t step = ${TOUCH_POSITION_MAX_VALUE} / model_idx; // Width of each button region
                   button = (touch_x / step) + 1; // Determine button region
                   if (button > model_idx)
                     button = model_idx; // Clamp to max button count
diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml
index 86bf53c..b8c8b90 100644
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml
@@ -11,6 +11,9 @@
 ##### - For normal system use, modifications to this file are NOT required.                    #####
 ####################################################################################################
 ---
+substitutions:
+  TOUCH_POSITION_MAX_VALUE: '10'  # Maximum touch position value
+
 binary_sensor:
   - id: bs_multi_touch
     name: Multi-touch

From 5ae4564e6a7804e7d2e5c471a55fcf4613ed9006 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sat, 21 Dec 2024 22:08:19 +0100
Subject: [PATCH 06/31] CodeRabbitAI Nitpick 2

---
 .../TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml   |  8 ++++----
 ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml | 13 ++++++++-----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml
index 072479e..667b380 100644
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml
@@ -148,16 +148,16 @@ script:
     then:
       - script.execute:
           id: touch_on_press_buttons
-          touch_x: !lambda return touch_x;
+          touch_position: !lambda return touch_position;
 
   - id: touch_on_press_buttons
     mode: restart
     parameters:
-      touch_x: uint8_t
+      touch_position: uint8_t
     then:
       - lambda: |-
           id(button_press_start_time) = millis();
-          id(button_press_position) = touch_x;
+          id(button_press_position) = touch_position;
           uint8_t button = 0;
           auto model_index = sl_tx_model_gang->active_index();
           if (model_index.has_value()) {
@@ -166,7 +166,7 @@ script:
                   button = 1; // Single button, always 1
               } else {
                   const uint8_t step = ${TOUCH_POSITION_MAX_VALUE} / model_idx; // Width of each button region
-                  button = (touch_x / step) + 1; // Determine button region
+                  button = (touch_position / step) + 1; // Determine button region
                   if (button > model_idx)
                     button = model_idx; // Clamp to max button count
               }
diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml
index b8c8b90..81636b3 100644
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml
@@ -127,7 +127,7 @@ script:
   - id: touch_on_press
     mode: restart
     parameters:
-      touch_x: uint8_t
+      touch_position: uint8_t
     then:
     # Extended by:
     #   - HW Buttons
@@ -212,10 +212,13 @@ tx_ultimate_easy:
 
   on_press:
     - lambda: |-
-        ESP_LOGI("tx_ultimate_easy", "Pressed at position %" PRIu8, static_cast<uint8_t>(touch.x));
-    - script.execute:
-        id: touch_on_press
-        touch_x: !lambda return static_cast<uint8_t>(touch.x);
+        const uint8_t touch_position = static_cast<uint8_t>(touch.x);
+        if (touch_position > ${TOUCH_POSITION_MAX_VALUE}) {  // Check for valid range
+          ESP_LOGE("core_hw_buttons", "Invalid touch position: %" PRIu8, touch_position);
+        } else {
+          ESP_LOGI("tx_ultimate_easy", "Pressed at position %" PRIu8, touch_position);
+          touch_on_press->execute(touch_position);
+        }
 
   on_release:
     - lambda: ESP_LOGI("tx_ultimate_easy", "Released");

From 696e3bf28d65f27117efe8c6b2e5d9228ce83172 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sat, 21 Dec 2024 23:10:16 +0100
Subject: [PATCH 07/31] Component to provide button number

---
 components/tx_ultimate_easy/__init__.py       |  5 ++++
 .../tx_ultimate_easy/tx_ultimate_easy.cpp     | 28 ++++++++++++++++++-
 .../tx_ultimate_easy/tx_ultimate_easy.h       | 10 +++++++
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/components/tx_ultimate_easy/__init__.py b/components/tx_ultimate_easy/__init__.py
index 3a598ad..7120ead 100644
--- a/components/tx_ultimate_easy/__init__.py
+++ b/components/tx_ultimate_easy/__init__.py
@@ -13,6 +13,7 @@ DEPENDENCIES = ['uart']
 CONF_TX_ULTIMATE_EASY = "tx_ultimate_easy"
 
 CONF_UART = "uart"
+CONF_GANG_COUNT = "gang_count"
 
 CONF_ON_TOUCH_EVENT = "on_touch_event"
 CONF_ON_PRESS = "on_press"
@@ -33,6 +34,7 @@ CONFIG_SCHEMA = cv.Schema({
     cv.GenerateID(): cv.declare_id(TxUltimateTouch),
 
     cv.Required(CONF_UART): cv.use_id(uart),
+    cv.Optional(CONF_GANG_COUNT, default=1): cv.int_range(min=1, max=4),
 
     cv.Optional(CONF_ON_TOUCH_EVENT): automation.validate_automation(single=True),
     cv.Optional(CONF_ON_PRESS): automation.validate_automation(single=True),
@@ -49,6 +51,9 @@ async def register_tx_ultimate_easy(var, config):
     uart_component = await cg.get_variable(config[CONF_UART])
     cg.add(var.set_uart_component(uart_component))
 
+    if CONF_GANG_COUNT in config:
+        cg.add(var.set_gang_count(config[CONF_GANG_COUNT]))
+
     if CONF_ON_TOUCH_EVENT in config:
         await automation.build_automation(
             var.get_trigger_touch_event(),
diff --git a/components/tx_ultimate_easy/tx_ultimate_easy.cpp b/components/tx_ultimate_easy/tx_ultimate_easy.cpp
index 84150db..61be4f6 100644
--- a/components/tx_ultimate_easy/tx_ultimate_easy.cpp
+++ b/components/tx_ultimate_easy/tx_ultimate_easy.cpp
@@ -48,6 +48,30 @@ namespace esphome {
 
         void TxUltimateEasy::dump_config() {
             ESP_LOGCONFIG(TAG, "TX Ultimate Easy");
+            ESP_LOGCONFIG(TAG, "  Gang count: %" PRIu8, this->gang_count_);
+        }
+
+        bool TxUltimateEasy::set_gang_count(const uint8_t gang_count) {
+            if (gang_count < 1 or gang_count > 4)
+                return false;
+            this->gang_count_ = gang_count;
+            return true;
+        }
+
+        uint8_t TxUltimateEasy::get_button_from_position(const uint8_t position) {
+            if (position > TOUCH_MAX_POSITION)  // Invalid position
+                return 0;
+            if (this->gang_count_ == 1)  // For 1 Gang model, any position is button 1
+                return 1;
+            if (this->gang_count_ < 1 or this->gang_count_ > 4)  // Invalid gang count
+                return 0;
+            const uint8_t width = TOUCH_MAX_POSITION / this->gang_count_; // Width of each button region
+            if (width < 1 or width > this->gang_count_)  // Invalid width - and prevents division by zero
+                return 0;
+            uint8_t button = (position / width) + 1; // Determine button region
+            if (button > this->gang_count_)
+              button = this->gang_count_; // Clamp to max button count
+            return button;
         }
 
         void TxUltimateEasy::send_touch_(TouchPoint tp) {
@@ -103,7 +127,7 @@ namespace esphome {
                     state == TOUCH_STATE_SWIPE_LEFT ||
                     state == TOUCH_STATE_SWIPE_RIGHT ||
                     state == TOUCH_STATE_MULTI_TOUCH) &&
-                   (uart_received_bytes[6] >= 0 || state == TOUCH_STATE_MULTI_TOUCH);
+                    (uart_received_bytes[6] >= 0 || state == TOUCH_STATE_MULTI_TOUCH);
         }
 
         int TxUltimateEasy::get_touch_position_x(const std::array<int, UART_RECEIVED_BYTES_SIZE> &uart_received_bytes) {
@@ -133,6 +157,8 @@ namespace esphome {
         TouchPoint TxUltimateEasy::get_touch_point(const std::array<int, UART_RECEIVED_BYTES_SIZE> &uart_received_bytes) {
             TouchPoint tp;
             tp.x = this->get_touch_position_x(uart_received_bytes);
+            if (tp.x >= 0)
+                tp.button = this->get_button_from_position(static_cast<uint8_t>(tp.x));
             tp.state = this->get_touch_state(uart_received_bytes);
             switch (tp.state) {
                 case TOUCH_STATE_RELEASE:
diff --git a/components/tx_ultimate_easy/tx_ultimate_easy.h b/components/tx_ultimate_easy/tx_ultimate_easy.h
index 5d7b3a0..cfb9e8b 100644
--- a/components/tx_ultimate_easy/tx_ultimate_easy.h
+++ b/components/tx_ultimate_easy/tx_ultimate_easy.h
@@ -13,6 +13,9 @@
 
 namespace esphome {
     namespace tx_ultimate_easy {
+        // Touch Max Position
+        constexpr uint8_t TOUCH_MAX_POSITION = 10;
+
         // Touch State Constants
         constexpr uint8_t TOUCH_STATE_RELEASE = 0x01;
         constexpr uint8_t TOUCH_STATE_PRESS = 0x02;
@@ -32,6 +35,7 @@ namespace esphome {
         static const char *TAG = "tx_ultimate_easy";
 
         struct TouchPoint {
+            uint8_t button = 0;
             int8_t x = -1;
             int8_t state = -1;
             std::string state_str = "Unknown";
@@ -53,6 +57,10 @@ namespace esphome {
             void loop() override;
             void dump_config() override;
 
+            uint8_t get_gang_count() { return this->gang_count_; }
+            bool set_gang_count(const uint8_t gang_count);
+            uint8_t get_button_from_position(const uint8_t position);
+
         protected:
             void send_touch_(TouchPoint tp);
             void handle_touch(const std::array<int, UART_RECEIVED_BYTES_SIZE> &bytes);
@@ -70,6 +78,8 @@ namespace esphome {
             Trigger<TouchPoint> trigger_multi_touch_release_;
             Trigger<TouchPoint> trigger_long_touch_release_;
 
+            uint8_t gang_count_ = 1;
+
         }; // class TxUltimateEasy
 
     } // namespace tx_ultimate_easy

From 8c610a406a63d86d55f8d9c8c4cd114923bd718e Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sat, 21 Dec 2024 23:17:42 +0100
Subject: [PATCH 08/31] Log long-press from component

If this works fine, it could replace this part on the new implementation.
---
 .../TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml   |  6 ++++--
 ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml | 13 +++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml
index 667b380..50b7170 100644
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml
@@ -165,8 +165,10 @@ script:
               if (model_idx == 1) {
                   button = 1; // Single button, always 1
               } else {
-                  const uint8_t step = ${TOUCH_POSITION_MAX_VALUE} / model_idx; // Width of each button region
-                  button = (touch_position / step) + 1; // Determine button region
+                  const uint8_t width = ${TOUCH_POSITION_MAX_VALUE} / model_idx; // Width of each button region
+                  ESP_LOGV("core_hw_buttons", "Button regions: width=%" PRIu8 ", touch_position=%" PRIu8,
+                                              width, touch_position);
+                  button = (touch_position / width) + 1; // Determine button region
                   if (button > model_idx)
                     button = model_idx; // Clamp to max button count
               }
diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml
index 81636b3..0a47ab3 100644
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml
@@ -12,7 +12,7 @@
 ####################################################################################################
 ---
 substitutions:
-  TOUCH_POSITION_MAX_VALUE: '10'  # Maximum touch position value
+  TOUCH_POSITION_MAX_VALUE: '10'  # Maximum touch position value returned by the touch pad via uart
 
 binary_sensor:
   - id: bs_multi_touch
@@ -206,6 +206,15 @@ tx_ultimate_easy:
   id: tx_ultimate
   uart: uart_touch
 
+  on_long_touch_release:
+    - lambda: |-
+        const uint8_t touch_position = static_cast<uint8_t>(touch.x);
+        if (touch_position > ${TOUCH_POSITION_MAX_VALUE}) {  // Check for valid range
+          ESP_LOGE("tx_ultimate_easy", "Invalid long-touch position: %" PRIu8, touch_position);
+        } else {
+          ESP_LOGI("tx_ultimate_easy", "Long-touch released at position %" PRIu8, touch_position);
+        }
+
   on_multi_touch_release:
     - lambda: ESP_LOGI("tx_ultimate_easy", "Multi-touch released");
     - script.execute: touch_on_multi_touch_release
@@ -214,7 +223,7 @@ tx_ultimate_easy:
     - lambda: |-
         const uint8_t touch_position = static_cast<uint8_t>(touch.x);
         if (touch_position > ${TOUCH_POSITION_MAX_VALUE}) {  // Check for valid range
-          ESP_LOGE("core_hw_buttons", "Invalid touch position: %" PRIu8, touch_position);
+          ESP_LOGE("tx_ultimate_easy", "Invalid touch position: %" PRIu8, touch_position);
         } else {
           ESP_LOGI("tx_ultimate_easy", "Pressed at position %" PRIu8, touch_position);
           touch_on_press->execute(touch_position);

From 65bbd901b14c1b921d8f12c0ed61df750db54db9 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sat, 21 Dec 2024 23:32:15 +0100
Subject: [PATCH 09/31] Clean-up `get_button_from_position`

---
 .../tx_ultimate_easy/tx_ultimate_easy.cpp     | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/components/tx_ultimate_easy/tx_ultimate_easy.cpp b/components/tx_ultimate_easy/tx_ultimate_easy.cpp
index 61be4f6..6d90d4c 100644
--- a/components/tx_ultimate_easy/tx_ultimate_easy.cpp
+++ b/components/tx_ultimate_easy/tx_ultimate_easy.cpp
@@ -59,18 +59,22 @@ namespace esphome {
         }
 
         uint8_t TxUltimateEasy::get_button_from_position(const uint8_t position) {
-            if (position > TOUCH_MAX_POSITION)  // Invalid position
+            // Validate position bounds
+            if (position > TOUCH_MAX_POSITION)
                 return 0;
-            if (this->gang_count_ == 1)  // For 1 Gang model, any position is button 1
+
+            // Special case for single gang (only one button exists)
+            if (this->gang_count_ == 1)
                 return 1;
-            if (this->gang_count_ < 1 or this->gang_count_ > 4)  // Invalid gang count
-                return 0;
-            const uint8_t width = TOUCH_MAX_POSITION / this->gang_count_; // Width of each button region
+
+            // Calculate button number
+            const uint8_t width = (TOUCH_MAX_POSITION + 1) / this->gang_count_;  // Width of each button region
             if (width < 1 or width > this->gang_count_)  // Invalid width - and prevents division by zero
                 return 0;
-            uint8_t button = (position / width) + 1; // Determine button region
-            if (button > this->gang_count_)
-              button = this->gang_count_; // Clamp to max button count
+            const uint8_t button = std::min(
+                static_cast<uint8_t>((position / width) + 1), // Convert position to button index
+                this->gang_count_ // Clamp to max gang count
+            );
             return button;
         }
 

From 4d8107faf200e99d4b3b5da73c04030e5ca3787c Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sun, 22 Dec 2024 01:15:26 +0100
Subject: [PATCH 10/31] Remove relay from binary sensor

---
 ...-Ultimate-Easy-ESPHome_core_hw_relays.yaml | 82 ++++++++-----------
 1 file changed, 33 insertions(+), 49 deletions(-)

diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_relays.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_relays.yaml
index 79a92ce..7bb4e55 100644
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_relays.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_relays.yaml
@@ -11,55 +11,6 @@
 ##### - For normal system use, modifications to this file are NOT required.                    #####
 ####################################################################################################
 ---
-binary_sensor:
-  - id: !extend bs_button_1
-    on_click:
-      then:
-        - if:
-            condition:
-              - lambda: return sl_button_1_action->active_index().has_value();
-              - lambda: return sl_button_1_action->active_index().value() == 1;
-              - and: &button_click_no_other_click
-                  - lambda: return not bs_multi_touch->state;
-                  - lambda: return not bs_swipe_left->state;
-                  - lambda: return not bs_swipe_down->state;
-                  - lambda: return not bs_swipe_right->state;
-            then:
-              - switch.toggle: sw_relay_1
-
-  - id: !extend bs_button_2
-    on_click:
-      then:
-        - if:
-            condition:
-              - lambda: return sl_button_2_action->active_index().has_value();
-              - lambda: return sl_button_2_action->active_index().value() == 1;
-              - and: *button_click_no_other_click
-            then:
-              - switch.toggle: sw_relay_2
-
-  - id: !extend bs_button_3
-    on_click:
-      then:
-        - if:
-            condition:
-              - lambda: return sl_button_3_action->active_index().has_value();
-              - lambda: return sl_button_3_action->active_index().value() == 1;
-              - and: *button_click_no_other_click
-            then:
-              - switch.toggle: sw_relay_3
-
-  - id: !extend bs_button_4
-    on_click:
-      then:
-        - if:
-            condition:
-              - lambda: return sl_button_4_action->active_index().has_value();
-              - lambda: return sl_button_4_action->active_index().value() == 1;
-              - and: *button_click_no_other_click
-            then:
-              - switch.toggle: sw_relay_4
-
 globals:
   - id: boot_initialization_relays
     type: bool
@@ -159,6 +110,39 @@ script:
           }
           id(boot_initialization_relays) = true;
 
+  - id: !extend button_click_event
+    then:
+      - lambda: |-
+          if (id(click_counter) == 1) {  // Single click
+            if (!bs_multi_touch->state and
+                !bs_swipe_left->state and
+                !bs_swipe_down->state and
+                !bs_swipe_right->state) {  // Ignore if other events are active
+              switch (id(button_press_button)) {
+                case 1:
+                  if (sl_button_1_action->active_index().has_value() and
+                      sl_button_1_action->active_index().value() == 1)
+                    sw_relay_1->toggle();
+                  break;
+                case 2:
+                  if (sl_button_2_action->active_index().has_value() and
+                      sl_button_2_action->active_index().value() == 1)
+                    sw_relay_2->toggle();
+                  break;
+                case 3:
+                  if (sl_button_3_action->active_index().has_value() and
+                      sl_button_3_action->active_index().value() == 1)
+                    sw_relay_3->toggle();
+                  break;
+                case 4:
+                  if (sl_button_4_action->active_index().has_value() and
+                      sl_button_4_action->active_index().value() == 1)
+                    sw_relay_4->toggle();
+                  break;
+              }
+            }
+          }
+
   - id: show_relay_status
     mode: restart
     then:

From c65acc329876db6be7309aea53af27fe40993ce6 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sun, 22 Dec 2024 01:37:07 +0100
Subject: [PATCH 11/31] Pass parameters to `button_click_event`

---
 .../TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml   | 13 ++++++++-----
 .../TX-Ultimate-Easy-ESPHome_core_hw_relays.yaml    |  7 +++++--
 components/tx_ultimate_easy/tx_ultimate_easy.cpp    |  1 +
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml
index 50b7170..6de6fcf 100644
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml
@@ -116,15 +116,18 @@ script:
 
   - id: button_click_event
     mode: restart
+    parameters:
+      button_id: uint8_t
+      click_count: uint8_t
     then:
       - delay:
           milliseconds: ${BUTTON_MULTI_CLICK_DELAY}
       - lambda: |-
-          const std::string button_name = "bs_button_" + std::to_string(id(button_press_button));
+          const std::string button_name = "bs_button_" + std::to_string(button_id);
           std::string event_name;
-          if (id(click_counter) == 1) event_name = "click";
-          else if (id(click_counter) == 2) event_name = "double_click";
-          else event_name = std::to_string(id(click_counter)) + "_click";
+          if (click_count == 1) event_name = "click";
+          else if (click_count == 2) event_name = "double_click";
+          else event_name = std::to_string(click_count) + "_click";
           button_action->execute(button_name.c_str(), event_name.c_str());
 
   - id: buttons_release
@@ -210,7 +213,7 @@ script:
               ESP_LOGW("core_hw_buttons", "Ignoring button press (too short)");
             } else if (press_duration >= ${BUTTON_CLICK_MIN_LENGTH} and
                         press_duration <= ${BUTTON_CLICK_MAX_LENGTH}) { // Short/normal click
-              button_click_event->execute();
+              button_click_event->execute(id(button_press_button), id(click_counter));
             } else if (press_duration >= ${BUTTON_LONG_PRESS_DELAY} and press_duration <= ${BUTTON_PRESS_TIMEOUT}) {
               button_action->execute(("bs_button_" + std::to_string(id(button_press_button))).c_str(), "long_click");
             } else if (press_duration > ${BUTTON_PRESS_TIMEOUT}) { // Timeout or invalid
diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_relays.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_relays.yaml
index 7bb4e55..9bbf7a0 100644
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_relays.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_relays.yaml
@@ -113,12 +113,15 @@ script:
   - id: !extend button_click_event
     then:
       - lambda: |-
-          if (id(click_counter) == 1) {  // Single click
+          ESP_LOGW("DEBUG", "button_click_event");
+          ESP_LOGW("DEBUG", "  button_id:   %" PRIu8, button_id);
+          ESP_LOGW("DEBUG", "  click_count: %" PRIu8, click_count);
+          if (click_count == 1) {  // Single click
             if (!bs_multi_touch->state and
                 !bs_swipe_left->state and
                 !bs_swipe_down->state and
                 !bs_swipe_right->state) {  // Ignore if other events are active
-              switch (id(button_press_button)) {
+              switch (button_id) {
                 case 1:
                   if (sl_button_1_action->active_index().has_value() and
                       sl_button_1_action->active_index().value() == 1)
diff --git a/components/tx_ultimate_easy/tx_ultimate_easy.cpp b/components/tx_ultimate_easy/tx_ultimate_easy.cpp
index 6d90d4c..c6cce8d 100644
--- a/components/tx_ultimate_easy/tx_ultimate_easy.cpp
+++ b/components/tx_ultimate_easy/tx_ultimate_easy.cpp
@@ -131,6 +131,7 @@ namespace esphome {
                     state == TOUCH_STATE_SWIPE_LEFT ||
                     state == TOUCH_STATE_SWIPE_RIGHT ||
                     state == TOUCH_STATE_MULTI_TOUCH) &&
+                    // Multi-touch events may have x < 0, all other events require valid x position
                     (uart_received_bytes[6] >= 0 || state == TOUCH_STATE_MULTI_TOUCH);
         }
 

From fbc5cb79ccd2c701348c4ac74b2338f2ddc4d2fc Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sun, 22 Dec 2024 01:46:28 +0100
Subject: [PATCH 12/31] Reduce `BUTTON_MULTI_CLICK_DELAY` to 250ms

---
 ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml | 2 +-
 ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_relays.yaml  | 3 ---
 components/tx_ultimate_easy/tx_ultimate_easy.cpp      | 1 +
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml
index 6de6fcf..20eb5a7 100644
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml
@@ -22,7 +22,7 @@ substitutions:
 
   BUTTON_CLICK_MIN_LENGTH: '50'    # The minimum duration the click should last, in msec
   BUTTON_CLICK_MAX_LENGTH: '350'   # The maximum duration the click should last, in msec
-  BUTTON_MULTI_CLICK_DELAY: '500'  # The time to wait for another click, in msec
+  BUTTON_MULTI_CLICK_DELAY: '250'  # The time to wait for another click, in msec
   BUTTON_PRESS_TIMEOUT: '10000'    # Ignore if button is pressed for longer than this time, in msec
   BUTTON_LONG_PRESS_DELAY: '800'   # The time to wait to consider a long press, in msec
 
diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_relays.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_relays.yaml
index 9bbf7a0..e639876 100644
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_relays.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_relays.yaml
@@ -113,9 +113,6 @@ script:
   - id: !extend button_click_event
     then:
       - lambda: |-
-          ESP_LOGW("DEBUG", "button_click_event");
-          ESP_LOGW("DEBUG", "  button_id:   %" PRIu8, button_id);
-          ESP_LOGW("DEBUG", "  click_count: %" PRIu8, click_count);
           if (click_count == 1) {  // Single click
             if (!bs_multi_touch->state and
                 !bs_swipe_left->state and
diff --git a/components/tx_ultimate_easy/tx_ultimate_easy.cpp b/components/tx_ultimate_easy/tx_ultimate_easy.cpp
index c6cce8d..640f3db 100644
--- a/components/tx_ultimate_easy/tx_ultimate_easy.cpp
+++ b/components/tx_ultimate_easy/tx_ultimate_easy.cpp
@@ -52,6 +52,7 @@ namespace esphome {
         }
 
         bool TxUltimateEasy::set_gang_count(const uint8_t gang_count) {
+            // Hardware supports maximum of 4 touch-sensitive buttons
             if (gang_count < 1 or gang_count > 4)
                 return false;
             this->gang_count_ = gang_count;

From be0fc353f6bdfa5e2372322c714d3fec57628902 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sun, 22 Dec 2024 02:03:35 +0100
Subject: [PATCH 13/31] Simplify relay handler

---
 ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml    |  2 +-
 ...-Ultimate-Easy-ESPHome_core_hw_relays.yaml | 62 ++++++++++---------
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
index 12ecd7d..5911a02 100644
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
@@ -74,7 +74,7 @@ improv_serial:
   id: serial_improv
 
 logger:
-  level: INFO
+  level: DEBUG
 
 ota:
   platform: esphome
diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_relays.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_relays.yaml
index e639876..dc59f0a 100644
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_relays.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_relays.yaml
@@ -113,34 +113,40 @@ script:
   - id: !extend button_click_event
     then:
       - lambda: |-
-          if (click_count == 1) {  // Single click
-            if (!bs_multi_touch->state and
-                !bs_swipe_left->state and
-                !bs_swipe_down->state and
-                !bs_swipe_right->state) {  // Ignore if other events are active
-              switch (button_id) {
-                case 1:
-                  if (sl_button_1_action->active_index().has_value() and
-                      sl_button_1_action->active_index().value() == 1)
-                    sw_relay_1->toggle();
-                  break;
-                case 2:
-                  if (sl_button_2_action->active_index().has_value() and
-                      sl_button_2_action->active_index().value() == 1)
-                    sw_relay_2->toggle();
-                  break;
-                case 3:
-                  if (sl_button_3_action->active_index().has_value() and
-                      sl_button_3_action->active_index().value() == 1)
-                    sw_relay_3->toggle();
-                  break;
-                case 4:
-                  if (sl_button_4_action->active_index().has_value() and
-                      sl_button_4_action->active_index().value() == 1)
-                    sw_relay_4->toggle();
-                  break;
-              }
-            }
+          // Handle only single clicks
+          if (click_count != 1)
+            return;
+
+          // Ignore if other touch events are active
+          if (bs_multi_touch->state ||
+              bs_swipe_left->state ||
+              bs_swipe_down->state ||
+              bs_swipe_right->state) {
+            return;
+          }
+
+          // Toggle relay if corresponding button action is enabled
+          switch (button_id) {
+            case 1:
+              if (sl_button_1_action->active_index().has_value() and
+                  sl_button_1_action->active_index().value() == 1)
+                sw_relay_1->toggle();
+              break;
+            case 2:
+              if (sl_button_2_action->active_index().has_value() and
+                  sl_button_2_action->active_index().value() == 1)
+                sw_relay_2->toggle();
+              break;
+            case 3:
+              if (sl_button_3_action->active_index().has_value() and
+                  sl_button_3_action->active_index().value() == 1)
+                sw_relay_3->toggle();
+              break;
+            case 4:
+              if (sl_button_4_action->active_index().has_value() and
+                  sl_button_4_action->active_index().value() == 1)
+                sw_relay_4->toggle();
+              break;
           }
 
   - id: show_relay_status

From e5d941c460bd3e720998edaa6ca4748a4ed94c79 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Sun, 22 Dec 2024 01:12:50 +0000
Subject: [PATCH 14/31] Bump version to 2024.12.4 [skip-versioning]

---
 versioning/VERSION      | 2 +-
 versioning/VERSION_YAML | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/versioning/VERSION b/versioning/VERSION
index 13d8c70..f8089ce 100644
--- a/versioning/VERSION
+++ b/versioning/VERSION
@@ -1 +1 @@
-2024.12.3
+2024.12.4
diff --git a/versioning/VERSION_YAML b/versioning/VERSION_YAML
index 823f360..336ae72 100644
--- a/versioning/VERSION_YAML
+++ b/versioning/VERSION_YAML
@@ -1 +1 @@
-version: 2024.12.3
+version: 2024.12.4

From 669cc2f2c255387249b7a92d74d8ef7e8ddb0bce Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sun, 22 Dec 2024 16:03:39 +0100
Subject: [PATCH 15/31] Use `main` as reference for remote package

---
 TX-Ultimate-Easy-ESPHome.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TX-Ultimate-Easy-ESPHome.yaml b/TX-Ultimate-Easy-ESPHome.yaml
index 0befff0..f3b95c3 100644
--- a/TX-Ultimate-Easy-ESPHome.yaml
+++ b/TX-Ultimate-Easy-ESPHome.yaml
@@ -16,7 +16,7 @@ wifi:
 packages:
   remote_package:
     url: https://github.com/edwardtfn/TX-Ultimate-Easy
-    ref: latest
+    ref: main
     refresh: 30s
     files:
       - ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml

From b1187332fb8b2a9686780599d6a1961dc1624ade Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sun, 22 Dec 2024 16:17:07 +0100
Subject: [PATCH 16/31] Ensure `latest` and `stable` tags are updated on `push`
 to `main`

---
 .github/workflows/release_tag.yml | 36 ++++++++++++++-----------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/release_tag.yml b/.github/workflows/release_tag.yml
index 6dce8f0..b4b7bc4 100644
--- a/.github/workflows/release_tag.yml
+++ b/.github/workflows/release_tag.yml
@@ -1,40 +1,36 @@
 # This GitHub Actions workflow updates the "stable" and "latest" Git tags
-# to point to the tag associated with a newly published release. It performs
-# the following steps:
-# 1. Checks out the repository code with full history.
-# 2. Configures Git with a generic user for the action.
+# to point to the latest commit on the main branch whenever code is merged.
+# It performs the following steps:
+# 1. Checks out the repository code with full history
+# 2. Configures Git with a generic user for the action
 # 3. Moves and forcibly pushes the "stable" and "latest" tags to align with
-#    the tag of the newly published release.
-# This ensures that "stable" and "latest" always point to the most recent release.
+#    the latest main branch commit
 ---
 name: Update Tags
 
-# yamllint disable-line rule:truthy
-on:
-  release:
-    types: [published]
+on:  # yamllint disable-line rule:truthy
+  push:
+    branches:
+      - main
 
 jobs:
   update-tags:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@main
+        uses: actions/checkout@v4
         with:
-          fetch-depth: '0'
+          fetch-depth: 0
 
       - name: Set up Git
         run: |
           git config --local user.email "action@github.com"
           git config --local user.name "GitHub Action"
 
-      - name: Move and push stable tag
+      - name: Move and push tags
         run: |
-          git tag -f stable ${{ github.event.release.tag_name }}
-          git push -f origin stable
-
-      - name: Move and push latest tag
-        run: |
-          git tag -f latest ${{ github.event.release.tag_name }}
-          git push -f origin latest
+          echo "Creating/updating stable and latest tags pointing to latest main commit"
+          git tag -fa stable -m "Update stable tag to latest main"
+          git tag -fa latest -m "Update latest tag to latest main"
+          git push origin stable latest --force
 ...

From 23b633cdcbb79ab2bdbfec0febdabe399636ebd0 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sun, 22 Dec 2024 16:20:51 +0100
Subject: [PATCH 17/31] Run all tests in parallel

Let's see if this saves some time.
---
 .github/workflows/validate_esphome.yml      | 4 ----
 .github/workflows/validate_esphome_beta.yml | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/.github/workflows/validate_esphome.yml b/.github/workflows/validate_esphome.yml
index 9aa4fb7..9ff3b92 100644
--- a/.github/workflows/validate_esphome.yml
+++ b/.github/workflows/validate_esphome.yml
@@ -30,8 +30,6 @@ jobs:
 
   build_basic:
     name: Basic
-    needs:
-      - code_scan
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@main
@@ -42,7 +40,6 @@ jobs:
 
   build_bluetooth_proxy_4:
     name: Bluetooth Proxy (IDF)
-    needs: build_basic
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@main
@@ -53,7 +50,6 @@ jobs:
 
   build_bluetooth_proxy_53:
     name: Bluetooth Proxy (IDF v5.3)
-    needs: build_basic
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@main
diff --git a/.github/workflows/validate_esphome_beta.yml b/.github/workflows/validate_esphome_beta.yml
index 5d16d51..3f01fd1 100644
--- a/.github/workflows/validate_esphome_beta.yml
+++ b/.github/workflows/validate_esphome_beta.yml
@@ -47,8 +47,6 @@ jobs:
 
   build_basic:
     name: Basic
-    needs:
-      - code_scan
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@main
@@ -60,7 +58,6 @@ jobs:
 
   build_bluetooth_proxy_4:
     name: Bluetooth Proxy (IDF)
-    needs: build_basic
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@main
@@ -72,7 +69,6 @@ jobs:
 
   build_bluetooth_proxy_53:
     name: Bluetooth Proxy (IDF v5.3)
-    needs: build_basic
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@main

From 0e53dfd3cd3083d540c370f7340f91dc63a45691 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sun, 22 Dec 2024 16:26:49 +0100
Subject: [PATCH 18/31] CodeRabbitAI

---
 .github/workflows/release_tag.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/release_tag.yml b/.github/workflows/release_tag.yml
index b4b7bc4..2d4c6de 100644
--- a/.github/workflows/release_tag.yml
+++ b/.github/workflows/release_tag.yml
@@ -16,6 +16,9 @@ on:  # yamllint disable-line rule:truthy
 jobs:
   update-tags:
     runs-on: ubuntu-latest
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: true
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

From 5d780f162ee014d930370261fec65965c31af1d4 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sun, 22 Dec 2024 16:37:05 +0100
Subject: [PATCH 19/31] Add `version` badge

---
 README.md | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 80a5575..e7f52d2 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,23 @@
 # TX Ultimate Easy
 
-<!-- markdownlint-disable MD033 -->
-<a href="https://github.com/edwardtfn/TX-Ultimate-Easy/commits/main" target="_blank">![GitHub Activity][commits-shield]</a>
-<a href="LICENSE" target="_blank">![License][license-shield]</a>
-<a href="https://github.com/edwardtfn/TX-Ultimate-Easy/commits/main" target="_blank">![GitHub Last Commit][last-commit-shield]</a>
-<a href="https://esphome.io/" target="_blank">![ESPHome][esphome-shield]</a>
-<a href="https://discord.gg/Db6WJWzWuf" target="_blank">![Discord][discord-shield]</a>
-<a href="https://www.buymeacoffee.com/edwardfirmo" target="_blank">![Buy me an ice-cream][buymeacoffee-shield]</a>
-<!-- markdownlint-enable MD033 -->
+[![Version][version-shield]](https://github.com/edwardtfn/TX-Ultimate-Easy/tags)
+[![GitHub Activity][commits-shield]](https://github.com/edwardtfn/TX-Ultimate-Easy/commits/main)
+[![License][license-shield]](LICENSE)
+[![GitHub Last Commit][last-commit-shield]](https://github.com/edwardtfn/TX-Ultimate-Easy/commits/main)
+[![ESPHome][esphome-shield]](https://esphome.io/)
+[![Discord][discord-shield]](https://discord.gg/Db6WJWzWuf)
+[![Buy me an ice-cream][buymeacoffee-shield]](https://www.buymeacoffee.com/edwardfirmo)
+
+[version-shield]: https://img.shields.io/github/v/tag/edwardtfn/TX-Ultimate-Easy?label=version
+[version]: https://github.com/edwardtfn/TX-Ultimate-Easy/tags
 
 <!-- markdownlint-disable MD013 -->
 | &nbsp;![TX Ultimate Easy Logo](Assets/Logo.webp) | TX Ultimate Easy provides custom ESPHome firmware for Sonoff TX Ultimate devices. Our project focuses on user-friendly configuration through the Home Assistant UI, eliminating the need for manual YAML editing. Whether you're new to home automation or an experienced user, TX Ultimate Easy makes it simple to manage your device. |
 | --- | :-- |
 <!-- markdownlint-enable MD013 -->
 
+[version-shield]: https://img.shields.io/github/v/tag/edwardtfn/TX-Ultimate-Easy?label=version
+[version]: https://github.com/edwardtfn/TX-Ultimate-Easy/tags
 [commits-shield]: https://img.shields.io/github/commit-activity/y/edwardtfn/TX-Ultimate-Easy
 [commits]: https://github.com/edwardtfn/TX-Ultimate-Easy/commits/main
 [license-shield]: https://img.shields.io/github/license/edwardtfn/TX-Ultimate-Easy

From d403bc2aa9e869cef0d350742626dbc3058fd8b6 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sun, 22 Dec 2024 16:41:21 +0100
Subject: [PATCH 20/31] CodeRabbitAI - Remove duplicated badge reference

---
 README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/README.md b/README.md
index e7f52d2..f3b3926 100644
--- a/README.md
+++ b/README.md
@@ -8,9 +8,6 @@
 [![Discord][discord-shield]](https://discord.gg/Db6WJWzWuf)
 [![Buy me an ice-cream][buymeacoffee-shield]](https://www.buymeacoffee.com/edwardfirmo)
 
-[version-shield]: https://img.shields.io/github/v/tag/edwardtfn/TX-Ultimate-Easy?label=version
-[version]: https://github.com/edwardtfn/TX-Ultimate-Easy/tags
-
 <!-- markdownlint-disable MD013 -->
 | &nbsp;![TX Ultimate Easy Logo](Assets/Logo.webp) | TX Ultimate Easy provides custom ESPHome firmware for Sonoff TX Ultimate devices. Our project focuses on user-friendly configuration through the Home Assistant UI, eliminating the need for manual YAML editing. Whether you're new to home automation or an experienced user, TX Ultimate Easy makes it simple to manage your device. |
 | --- | :-- |

From 3b7f811876130da1d7f8f0b30cd237c8d792e7a3 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sun, 22 Dec 2024 17:04:52 +0100
Subject: [PATCH 21/31] Tag latest and stable only after versioning

---
 .github/workflows/release_tag.yml | 39 ----------------
 .github/workflows/versioning.yml  | 78 +++++++++++++++++++++++++------
 2 files changed, 63 insertions(+), 54 deletions(-)
 delete mode 100644 .github/workflows/release_tag.yml

diff --git a/.github/workflows/release_tag.yml b/.github/workflows/release_tag.yml
deleted file mode 100644
index 2d4c6de..0000000
--- a/.github/workflows/release_tag.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-# This GitHub Actions workflow updates the "stable" and "latest" Git tags
-# to point to the latest commit on the main branch whenever code is merged.
-# It performs the following steps:
-# 1. Checks out the repository code with full history
-# 2. Configures Git with a generic user for the action
-# 3. Moves and forcibly pushes the "stable" and "latest" tags to align with
-#    the latest main branch commit
----
-name: Update Tags
-
-on:  # yamllint disable-line rule:truthy
-  push:
-    branches:
-      - main
-
-jobs:
-  update-tags:
-    runs-on: ubuntu-latest
-    concurrency:
-      group: ${{ github.workflow }}-${{ github.ref }}
-      cancel-in-progress: true
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Set up Git
-        run: |
-          git config --local user.email "action@github.com"
-          git config --local user.name "GitHub Action"
-
-      - name: Move and push tags
-        run: |
-          echo "Creating/updating stable and latest tags pointing to latest main commit"
-          git tag -fa stable -m "Update stable tag to latest main"
-          git tag -fa latest -m "Update latest tag to latest main"
-          git push origin stable latest --force
-...
diff --git a/.github/workflows/versioning.yml b/.github/workflows/versioning.yml
index 2e49b1a..1c019a0 100644
--- a/.github/workflows/versioning.yml
+++ b/.github/workflows/versioning.yml
@@ -1,6 +1,9 @@
-# Workflow for managing versioning and tagging
+# This GitHub Actions workflow handles version bumping and tag updates.
+# It can be triggered either by:
+# 1. Pushing to main branch - automatically bumps version and updates tags
+# 2. Manual dispatch - allows independent control over stable and latest tags
 ---
-name: Version Bump and Tag
+name: Version and Tags
 
 on:  # yamllint disable-line rule:truthy
   push:
@@ -9,34 +12,79 @@ on:  # yamllint disable-line rule:truthy
     paths-ignore:
       - '**/VERSION'
       - '**/VERSION_YAML'
+
   workflow_dispatch:
     inputs:
       update_stable:
         description: "Update stable tag?"
         required: true
-        default: "false"
+        default: false
+        type: boolean
+      update_latest:
+        description: "Update latest tag?"
+        required: true
+        default: false
+        type: boolean
 
 jobs:
-  versioning:
+  version-and-tag:
     runs-on: ubuntu-latest
-
     steps:
-      - uses: "actions/checkout@v4"
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Set up Git
         run: |
           git config user.name "GitHub Actions"
           git config user.email "actions@github.com"
 
-      - name: Bump Version
-        run: |
-          chmod +x "./versioning/bump_version.sh"
-          "./versioning/bump_version.sh"
+      - name: Bump version and push tag
+        id: version
+        uses: mathieudutour/github-tag-action@v6.1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          release_branches: main
+          default_bump: patch
+          tag_prefix: ""
+          dry_run: true
 
-      - name: Push Changes and Tags
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Update version in files
+        if: steps.version.outputs.new_tag
         run: |
-          git push "https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git" main
-          git push "https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git" --tags
+          chmod +x ./bump_version.sh
+          ./bump_version.sh ${{ steps.version.outputs.new_tag }}
+          git add .
+          git commit -m "chore: bump version to ${{ steps.version.outputs.new_tag }}"
+          git push
+
+      - name: Create version tag
+        if: steps.version.outputs.new_tag
+        run: |
+          echo "Creating version tag ${{ steps.version.outputs.new_tag }}"
+          git tag -fa ${{ steps.version.outputs.new_tag }} -m "Version ${{ steps.version.outputs.new_tag }}"
+          git push origin ${{ steps.version.outputs.new_tag }} --force
+
+      - name: Update stable tag
+        if: |
+          steps.version.outputs.new_tag && (
+            github.event_name == 'workflow_dispatch' && inputs.update_stable ||
+            github.event_name == 'push'
+          )
+        run: |
+          echo "Updating stable tag to point to ${{ steps.version.outputs.new_tag }}"
+          git tag -fa stable -m "Update stable tag to ${{ steps.version.outputs.new_tag }}"
+          git push origin stable --force
+
+      - name: Update latest tag
+        if: |
+          steps.version.outputs.new_tag && (
+            github.event_name == 'workflow_dispatch' && inputs.update_latest ||
+            github.event_name == 'push'
+          )
+        run: |
+          echo "Updating latest tag to point to ${{ steps.version.outputs.new_tag }}"
+          git tag -fa latest -m "Update latest tag to ${{ steps.version.outputs.new_tag }}"
+          git push origin latest --force
 ...

From 75f4245fe10aabe893d32834b8f03ad1e30751fd Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sun, 22 Dec 2024 17:16:09 +0100
Subject: [PATCH 22/31] No need another versioning action

---
 .github/workflows/versioning.yml | 35 ++++++--------------------------
 1 file changed, 6 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/versioning.yml b/.github/workflows/versioning.yml
index 1c019a0..029d2e1 100644
--- a/.github/workflows/versioning.yml
+++ b/.github/workflows/versioning.yml
@@ -40,51 +40,28 @@ jobs:
           git config user.name "GitHub Actions"
           git config user.email "actions@github.com"
 
-      - name: Bump version and push tag
-        id: version
-        uses: mathieudutour/github-tag-action@v6.1
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          release_branches: main
-          default_bump: patch
-          tag_prefix: ""
-          dry_run: true
-
-      - name: Update version in files
-        if: steps.version.outputs.new_tag
+      - name: Bump version
         run: |
           chmod +x ./bump_version.sh
-          ./bump_version.sh ${{ steps.version.outputs.new_tag }}
-          git add .
-          git commit -m "chore: bump version to ${{ steps.version.outputs.new_tag }}"
-          git push
-
-      - name: Create version tag
-        if: steps.version.outputs.new_tag
-        run: |
-          echo "Creating version tag ${{ steps.version.outputs.new_tag }}"
-          git tag -fa ${{ steps.version.outputs.new_tag }} -m "Version ${{ steps.version.outputs.new_tag }}"
-          git push origin ${{ steps.version.outputs.new_tag }} --force
+          ./bump_version.sh
 
       - name: Update stable tag
         if: |
-          steps.version.outputs.new_tag && (
+          success() && (
             github.event_name == 'workflow_dispatch' && inputs.update_stable ||
             github.event_name == 'push'
           )
         run: |
-          echo "Updating stable tag to point to ${{ steps.version.outputs.new_tag }}"
-          git tag -fa stable -m "Update stable tag to ${{ steps.version.outputs.new_tag }}"
+          git tag -fa stable -m "Update stable tag"
           git push origin stable --force
 
       - name: Update latest tag
         if: |
-          steps.version.outputs.new_tag && (
+          success() && (
             github.event_name == 'workflow_dispatch' && inputs.update_latest ||
             github.event_name == 'push'
           )
         run: |
-          echo "Updating latest tag to point to ${{ steps.version.outputs.new_tag }}"
-          git tag -fa latest -m "Update latest tag to ${{ steps.version.outputs.new_tag }}"
+          git tag -fa latest -m "Update latest tag"
           git push origin latest --force
 ...

From dd25e5dbbad9be936774e1818135f18d001abd59 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sun, 22 Dec 2024 17:19:59 +0100
Subject: [PATCH 23/31] Use `bump_version.sh` from folder `versioning`

---
 .github/workflows/versioning.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/versioning.yml b/.github/workflows/versioning.yml
index 029d2e1..ac9ce8d 100644
--- a/.github/workflows/versioning.yml
+++ b/.github/workflows/versioning.yml
@@ -42,8 +42,8 @@ jobs:
 
       - name: Bump version
         run: |
-          chmod +x ./bump_version.sh
-          ./bump_version.sh
+          chmod +x ./versioning/bump_version.sh
+          ./versioning/bump_version.sh
 
       - name: Update stable tag
         if: |

From 7850d16aeb110a9a39cc3395d1afbdb1677b7592 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sun, 22 Dec 2024 17:40:45 +0100
Subject: [PATCH 24/31] Push tag before setting latest and stable

---
 .github/workflows/versioning.yml | 39 ++++++++++++++++++++++++++++++++
 versioning/VERSION               |  2 +-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/versioning.yml b/.github/workflows/versioning.yml
index ac9ce8d..31a94d5 100644
--- a/.github/workflows/versioning.yml
+++ b/.github/workflows/versioning.yml
@@ -2,7 +2,9 @@
 # It can be triggered either by:
 # 1. Pushing to main branch - automatically bumps version and updates tags
 # 2. Manual dispatch - allows independent control over stable and latest tags
+
 ---
+
 name: Version and Tags
 
 on:  # yamllint disable-line rule:truthy
@@ -45,6 +47,13 @@ jobs:
           chmod +x ./versioning/bump_version.sh
           ./versioning/bump_version.sh
 
+      - name: Push Changes and Tags
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          git push origin main
+          git push origin --tags --force
+
       - name: Update stable tag
         if: |
           success() && (
@@ -52,6 +61,21 @@ jobs:
             github.event_name == 'push'
           )
         run: |
+          # Verify version bump was successful
+          if [ ! -f "./versioning/VERSION" ]; then
+            echo "Error: VERSION file not found. Version bump may have failed."
+            exit 1
+          fi
+
+          # Backup existing tag
+          if git rev-parse --verify stable >/dev/null 2>&1; then
+            OLD_STABLE=$(git rev-parse stable)
+            echo "Backing up current stable tag ($OLD_STABLE)"
+          fi
+
+          # Update tag
+          NEW_VERSION=$(cat ./versioning/VERSION)
+          echo "Updating stable tag to $NEW_VERSION"
           git tag -fa stable -m "Update stable tag"
           git push origin stable --force
 
@@ -62,6 +86,21 @@ jobs:
             github.event_name == 'push'
           )
         run: |
+          # Verify version bump was successful
+          if [ ! -f "./versioning/VERSION" ]; then
+            echo "Error: VERSION file not found. Version bump may have failed."
+            exit 1
+          fi
+
+          # Backup existing tag
+          if git rev-parse --verify latest >/dev/null 2>&1; then
+            OLD_LATEST=$(git rev-parse latest)
+            echo "Backing up current latest tag ($OLD_LATEST)"
+          fi
+
+          # Update tag
+          NEW_VERSION=$(cat ./versioning/VERSION)
+          echo "Updating latest tag to $NEW_VERSION"
           git tag -fa latest -m "Update latest tag"
           git push origin latest --force
 ...
diff --git a/versioning/VERSION b/versioning/VERSION
index f8089ce..b4bba13 100644
--- a/versioning/VERSION
+++ b/versioning/VERSION
@@ -1 +1 @@
-2024.12.4
+2024.12.5
\ No newline at end of file

From 09e9d340fcd0e4d4680cac6487805e7e07820909 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Sun, 22 Dec 2024 16:41:40 +0000
Subject: [PATCH 25/31] Bump version to 2024.12.6 [skip-versioning]

---
 versioning/VERSION      | 2 +-
 versioning/VERSION_YAML | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/versioning/VERSION b/versioning/VERSION
index b4bba13..0e63862 100644
--- a/versioning/VERSION
+++ b/versioning/VERSION
@@ -1 +1 @@
-2024.12.5
\ No newline at end of file
+2024.12.6
diff --git a/versioning/VERSION_YAML b/versioning/VERSION_YAML
index 336ae72..e1888d2 100644
--- a/versioning/VERSION_YAML
+++ b/versioning/VERSION_YAML
@@ -1 +1 @@
-version: 2024.12.4
+version: 2024.12.6

From 42afe71365eef04bd52c4caf84ea079114891db2 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sun, 22 Dec 2024 23:20:39 +0100
Subject: [PATCH 26/31] Add event based automation overview

Helps with #51
---
 README.md | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/README.md b/README.md
index f3b3926..5ddc50f 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,40 @@ TX Ultimate Easy exposes your device's components (sensors, touch panel, relays,
 
 All automation capabilities are handled through Home Assistant's native automation system - this project focuses on providing reliable device integration rather than implementing its own automation tools.
 
+### Event-Based Automation
+
+TX Ultimate Easy uses Home Assistant's native Events system for reliable automation triggers. While sensors show the current state (e.g., button pressed/not pressed), events capture specific actions like clicks, swipes, and long presses.
+
+To view available events:
+
+1. Go to Developer Tools in Home Assistant
+2. Select the "Events" tab
+3. Enter `esphome.tx_ultimate_easy` in the "Event to subscribe to" field
+4. Click "Start listening"
+5. Interact with your device to see events in real-time
+
+Example event trigger in automation (YAML):
+
+```yaml
+trigger:
+  platform: event
+  event_type: esphome.tx_ultimate_easy
+  event_data:
+    device_name: your_device_name
+    component: bs_button_1
+    event: click
+```
+
+You can also create event-based automations through the Home Assistant UI by selecting "Event" as the trigger type and filtering by your device.
+
+### Device Configuration
+
+- **Relay Modes**: Choose between "Light" and "Switch" modes to control how the relay appears in Home Assistant
+- **Button Actions**: 
+  - "None": Button presses only generate events, allowing full automation control
+  - "Relay Toggle": Button directly controls the relay, independent of Home Assistant
+- **Automation Flexibility**: All automations can be managed through Home Assistant without relying on local device triggers
+
 ## Key Features
 
 - **Home Assistant UI Configuration**: Manage all device settings directly through the Home Assistant interface
@@ -104,6 +138,7 @@ We welcome contributions from the community! Here's how you can help:
 4. Submit a pull request targeting the `main` branch
 
 Please ensure your code follows our standards:
+
 - Passes all lint checks (YAML, C++, Markdown)
 - Includes appropriate documentation
 - Follows existing code style

From f11840d2bc54ef301effb187e8dad80361ead17a Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sun, 22 Dec 2024 23:23:22 +0100
Subject: [PATCH 27/31] markdownlint

---
 README.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 5ddc50f..7d9238c 100644
--- a/README.md
+++ b/README.md
@@ -36,11 +36,13 @@ TX Ultimate Easy exposes your device's components (sensors, touch panel, relays,
 - Use device triggers and states in your Home Assistant automations and scripts
 - Configure device behavior through Home Assistant's service calls
 
-All automation capabilities are handled through Home Assistant's native automation system - this project focuses on providing reliable device integration rather than implementing its own automation tools.
+All automation capabilities are handled through Home Assistant's native automation system - this project focuses on providing reliable
+device integration rather than implementing its own automation tools.
 
 ### Event-Based Automation
 
-TX Ultimate Easy uses Home Assistant's native Events system for reliable automation triggers. While sensors show the current state (e.g., button pressed/not pressed), events capture specific actions like clicks, swipes, and long presses.
+TX Ultimate Easy uses Home Assistant's native Events system for reliable automation triggers.
+While sensors show the current state (e.g., button pressed/not pressed), events capture specific actions like clicks, swipes, and long presses.
 
 To view available events:
 
@@ -151,7 +153,8 @@ Need help? Here are your options:
 - **Community Chat**: Join our [Discord Server](https://discord.gg/Db6WJWzWuf) for discussions and community interaction
 - **Support the Project**: Consider supporting through Buy Me a Coffee
 
-Note: For proper tracking and resolution, all bug reports and feature requests must be submitted through GitHub Issues, not Discord. The Issues page can be found at: [Issues · edwardtfn/TX-Ultimate-Easy](https://github.com/edwardtfn/TX-Ultimate-Easy/issues)
+Note: For proper tracking and resolution, all bug reports and feature requests must be submitted through GitHub Issues, not Discord.
+The Issues page can be found at: [Issues · edwardtfn/TX-Ultimate-Easy](https://github.com/edwardtfn/TX-Ultimate-Easy/issues)
 
 [![Buy Me a Coffee](https://www.buymeacoffee.com/assets/img/custom_images/yellow_img.png)](https://www.buymeacoffee.com/edwardfirmo)
 

From d87b86bfcaf05355166174753748984e0f30a54b Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sun, 22 Dec 2024 23:41:02 +0100
Subject: [PATCH 28/31] CodeRabbitAI

---
 README.md | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 7d9238c..c5a68bf 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ device integration rather than implementing its own automation tools.
 ### Event-Based Automation
 
 TX Ultimate Easy uses Home Assistant's native Events system for reliable automation triggers.
-While sensors show the current state (e.g., button pressed/not pressed), events capture specific actions like clicks, swipes, and long presses.
+While sensors show the current state (e.g., button pressed/not pressed), events capture-specific actions like clicks, swipes, and long presses.
 
 To view available events:
 
@@ -55,23 +55,35 @@ To view available events:
 Example event trigger in automation (YAML):
 
 ```yaml
-trigger:
-  platform: event
-  event_type: esphome.tx_ultimate_easy
-  event_data:
-    device_name: your_device_name
-    component: bs_button_1
-    event: click
+triggers:
+  - platform: event
+    event_type: esphome.tx_ultimate_easy
+    event_data:
+      device_name: your_device_name
+      component: bs_button_1
+      event: click
+actions:
+  - action: light.toggle
+    target:
+      entity_id: light.living_room
+
+# Additional common event types:
+# event: double_click
+# event: long_press
+# event: swipe_left
+# event: swipe_right
 ```
 
 You can also create event-based automations through the Home Assistant UI by selecting "Event" as the trigger type and filtering by your device.
 
 ### Device Configuration
 
-- **Relay Modes**: Choose between "Light" and "Switch" modes to control how the relay appears in Home Assistant
+- **Relay Modes**: 
+  - "Light": Appears as a light entity with brightness controls (if supported)
+  - "Switch": Appears as a simple on/off switch entity
 - **Button Actions**: 
-  - "None": Button presses only generate events, allowing full automation control
-  - "Relay Toggle": Button directly controls the relay, independent of Home Assistant
+  - "None": Example: Use button events to trigger scenes or complex automations
+  - "Relay Toggle": Example: Press to turn on, press again to turn off, regardless of Home Assistant state
 - **Automation Flexibility**: All automations can be managed through Home Assistant without relying on local device triggers
 
 ## Key Features

From f1f545198bbc81a09ea5054e978ea1d6df1dde51 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sun, 22 Dec 2024 23:47:03 +0100
Subject: [PATCH 29/31] CodeRabbitAI

---
 README.md | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index c5a68bf..91a7dcd 100644
--- a/README.md
+++ b/README.md
@@ -66,25 +66,30 @@ actions:
   - action: light.toggle
     target:
       entity_id: light.living_room
-
-# Additional common event types:
-# event: double_click
-# event: long_press
-# event: swipe_left
-# event: swipe_right
 ```
 
+**Common event types**:
+- `click`: Single press and release
+- `double_click`: Two quick presses
+- `long_press`: Press and hold
+- `swipe_left`: Left swipe gesture
+- `swipe_right`: Right swipe gesture
+
 You can also create event-based automations through the Home Assistant UI by selecting "Event" as the trigger type and filtering by your device.
 
 ### Device Configuration
+#### Relay Modes
+- **Light Mode**: Exposes the relay as a light entity with brightness controls (if supported)
+- **Switch Mode**: Exposes the relay as a simple on/off switch entity
 
-- **Relay Modes**: 
-  - "Light": Appears as a light entity with brightness controls (if supported)
-  - "Switch": Appears as a simple on/off switch entity
-- **Button Actions**: 
-  - "None": Example: Use button events to trigger scenes or complex automations
-  - "Relay Toggle": Example: Press to turn on, press again to turn off, regardless of Home Assistant state
-- **Automation Flexibility**: All automations can be managed through Home Assistant without relying on local device triggers
+#### Button Actions
+- **None**: Allows using button events for custom automations
+  Example: Trigger scenes or complex automations through Home Assistant
+- **Relay Toggle**: Direct control of the associated relay
+  Example: Toggle relay state with each press, independent of Home Assistant
+
+#### Automation
+All device behaviors can be customized through Home Assistant automations without relying on local device triggers.
 
 ## Key Features
 
@@ -165,8 +170,9 @@ Need help? Here are your options:
 - **Community Chat**: Join our [Discord Server](https://discord.gg/Db6WJWzWuf) for discussions and community interaction
 - **Support the Project**: Consider supporting through Buy Me a Coffee
 
-Note: For proper tracking and resolution, all bug reports and feature requests must be submitted through GitHub Issues, not Discord.
-The Issues page can be found at: [Issues · edwardtfn/TX-Ultimate-Easy](https://github.com/edwardtfn/TX-Ultimate-Easy/issues)
+Note: For proper tracking and resolution:
+- All bug reports and feature requests must be submitted through GitHub Issues, not Discord
+- Submit issues here: [Issues · edwardtfn/TX-Ultimate-Easy](https://github.com/edwardtfn/TX-Ultimate-Easy/issues)
 
 [![Buy Me a Coffee](https://www.buymeacoffee.com/assets/img/custom_images/yellow_img.png)](https://www.buymeacoffee.com/edwardfirmo)
 

From c07e4f195a51ede00ac0386925aa0ed8aa19d85e Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sun, 22 Dec 2024 23:55:18 +0100
Subject: [PATCH 30/31] CodeRabbitAI

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 91a7dcd..79b2db7 100644
--- a/README.md
+++ b/README.md
@@ -59,8 +59,8 @@ triggers:
   - platform: event
     event_type: esphome.tx_ultimate_easy
     event_data:
-      device_name: your_device_name
-      component: bs_button_1
+      device_name: your_device_name  # Replace with your specific device name
+      component: bs_button_1         # Button identifier (e.g., bs_button_1, bs_button_2, bs_button_3 or bs_button_4)
       event: click
 actions:
   - action: light.toggle

From bbbaeeb0d4d12bae92b5b1b6eaab71b66fe44570 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Sun, 22 Dec 2024 23:02:49 +0000
Subject: [PATCH 31/31] Bump version to 2024.12.7 [skip-versioning]

---
 versioning/VERSION      | 2 +-
 versioning/VERSION_YAML | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/versioning/VERSION b/versioning/VERSION
index 0e63862..e47b131 100644
--- a/versioning/VERSION
+++ b/versioning/VERSION
@@ -1 +1 @@
-2024.12.6
+2024.12.7
diff --git a/versioning/VERSION_YAML b/versioning/VERSION_YAML
index e1888d2..72211d6 100644
--- a/versioning/VERSION_YAML
+++ b/versioning/VERSION_YAML
@@ -1 +1 @@
-version: 2024.12.6
+version: 2024.12.7