Bump version to 2025.7.3 [skip-versioning]

Fix rainbow effect loop by setting correct width per model.

.github/workflows/validate_esphome.yml

@@ -55,18 +55,6 @@ jobs:
           yaml-file: ".test/esphome_idf_core.yaml"
           version: latest
 
-  build_idf53_core:
-    name: Core (IDF v5.3)
-    needs: code_scan
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build Core (IDF v5.3)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_idf53_core.yaml"
-          version: latest
-
   build_ard_basic:
     name: Basic (Arduino)
     needs: build_ard_core
@@ -91,18 +79,6 @@ jobs:
           yaml-file: ".test/esphome_idf_basic.yaml"
           version: latest
 
-  build_idf53_basic:
-    name: Basic (IDF v5.3)
-    needs: build_idf53_core
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build Basic (IDF v5.3)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_idf53_basic.yaml"
-          version: latest
-
   build_ard_hw_relays:
     name: HW Relays (Arduino)
     needs: build_ard_core
@@ -127,18 +103,6 @@ jobs:
           yaml-file: ".test/esphome_idf_hw_relays.yaml"
           version: latest
 
-  build_idf53_hw_relays:
-    name: HW Relays (IDF v5.3)
-    needs: build_idf53_core
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build HW Relays (IDF v5.3)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_idf53_hw_relays.yaml"
-          version: latest
-
   build_ard_hw_speaker:
     name: HW Speaker (Arduino)
     needs: build_ard_core
@@ -163,18 +127,6 @@ jobs:
           yaml-file: ".test/esphome_idf_hw_speaker.yaml"
           version: latest
 
-  build_idf53_hw_speaker:
-    name: HW Speaker (IDF v5.3)
-    needs: build_idf53_core
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build HW Speaker (IDF v5.3)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_idf53_hw_speaker.yaml"
-          version: latest
-
   build_ard_hw_vibration:
     name: HW Vibration (Arduino)
     needs: build_ard_core
@@ -199,18 +151,6 @@ jobs:
           yaml-file: ".test/esphome_idf_hw_vibration.yaml"
           version: latest
 
-  build_idf53_hw_vibration:
-    name: HW Vibration (IDF v5.3)
-    needs: build_idf53_core
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build HW Vibration (IDF v5.3)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_idf53_hw_vibration.yaml"
-          version: latest
-
   build_ard_ble_proxy:
     name: Bluetooth Proxy (Ard)
     needs: build_ard_basic
@@ -235,18 +175,6 @@ jobs:
           yaml-file: ".test/esphome_idf_ble_proxy.yaml"
           version: latest
 
-  build_idf53_ble_proxy:
-    name: Bluetooth Proxy (IDF v5.3)
-    needs: build_idf53_basic
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build BLE Proxy (IDF v5.3)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_idf53_ble_proxy.yaml"
-          version: latest
-
   build_ard_media_player:
     name: Media Player (Ard)
     needs:

.github/workflows/validate_esphome_beta.yml

@@ -73,18 +73,6 @@ jobs:
           yaml-file: ".test/esphome_idf_core.yaml"
           version: beta
 
-  build_idf53_core:
-    name: Core (IDF v5.3)
-    needs: code_scan
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build Core (IDF v5.3)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_idf53_core.yaml"
-          version: beta
-
   build_ard_basic:
     name: Basic (Arduino)
     needs: build_ard_core
@@ -109,18 +97,6 @@ jobs:
           yaml-file: ".test/esphome_idf_basic.yaml"
           version: beta
 
-  build_idf53_basic:
-    name: Basic (IDF v5.3)
-    needs: build_idf53_core
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build Basic (IDF v5.3)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_idf53_basic.yaml"
-          version: beta
-
   build_ard_hw_relays:
     name: HW Relays (Arduino)
     needs: build_ard_core
@@ -145,18 +121,6 @@ jobs:
           yaml-file: ".test/esphome_idf_hw_relays.yaml"
           version: beta
 
-  build_idf53_hw_relays:
-    name: HW Relays (IDF v5.3)
-    needs: build_idf53_core
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build HW Relays (IDF v5.3)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_idf53_hw_relays.yaml"
-          version: beta
-
   build_ard_hw_speaker:
     name: HW Speaker (Arduino)
     needs: build_ard_core
@@ -181,18 +145,6 @@ jobs:
           yaml-file: ".test/esphome_idf_hw_speaker.yaml"
           version: beta
 
-  build_idf53_hw_speaker:
-    name: HW Speaker (IDF v5.3)
-    needs: build_idf53_core
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build HW Speaker (IDF v5.3)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_idf53_hw_speaker.yaml"
-          version: beta
-
   build_ard_hw_vibration:
     name: HW Vibration (Arduino)
     needs: build_ard_core
@@ -217,18 +169,6 @@ jobs:
           yaml-file: ".test/esphome_idf_hw_vibration.yaml"
           version: beta
 
-  build_idf53_hw_vibration:
-    name: HW Vibration (IDF v5.3)
-    needs: build_idf53_core
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build HW Vibration (IDF v5.3)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_idf53_hw_vibration.yaml"
-          version: beta
-
   build_ard_ble_proxy:
     name: Bluetooth Proxy (Ard)
     needs: build_ard_basic
@@ -253,18 +193,6 @@ jobs:
           yaml-file: ".test/esphome_idf_ble_proxy.yaml"
           version: beta
 
-  build_idf53_ble_proxy:
-    name: Bluetooth Proxy (IDF v5.3)
-    needs: build_idf53_basic
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build BLE Proxy (IDF v5.3)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_idf53_ble_proxy.yaml"
-          version: beta
-
   build_ard_media_player:
     name: Media Player (Ard)
     needs:

.github/workflows/validate_markdown.yml

@@ -17,23 +17,28 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@main
+        uses: actions/checkout@v4
         with:
-          fetch-depth: '0'
+          fetch-depth: 0  # Ensures full commit history for diff
 
-      # https://github.com/marketplace/actions/markdownlint-cli2-action
       - name: Identify changed files
-        uses: tj-actions/changed-files@v41
         id: changed-files
-        with:
+        run: |
-          files: '**/*.md'
+          BASE=${{ github.event.before }}
-          separator: ","
+          HEAD=${{ github.sha }}
-      # https://github.com/marketplace/actions/markdownlint-cli2-action
+          FILES=$(git diff --name-only $BASE $HEAD -- '**/*.md' | tr '\n' ',')
+          echo "changed_files=$FILES" >> $GITHUB_ENV
+          if [[ -n "$FILES" ]]; then
+            echo "any_changed=true" >> $GITHUB_ENV
+          else
+            echo "any_changed=false" >> $GITHUB_ENV
+          fi
+
       - name: Markdown Lint
         uses: DavidAnson/markdownlint-cli2-action@v14
-        if: steps.changed-files.outputs.any_changed == 'true'
+        if: env.any_changed == 'true'
         with:
-          globs: ${{ steps.changed-files.outputs.all_changed_files }}
+          globs: ${{ env.changed_files }}
           separator: ","
           config: '.rules/.markdownlint.jsonc'
           fix: true
@@ -43,15 +48,27 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@main
+        uses: actions/checkout@v4
         with:
-          fetch-depth: '0'
+          fetch-depth: 0
+
+      - name: Identify changed files
+        id: changed-files
+        run: |
+          BASE=${{ github.event.before }}
+          HEAD=${{ github.sha }}
+          FILES=$(git diff --name-only $BASE $HEAD -- '**/*.md' | tr '\n' ',')
+          echo "changed_files=$FILES" >> $GITHUB_ENV
+          if [[ -n "$FILES" ]]; then
+            echo "any_changed=true" >> $GITHUB_ENV
+          else
+            echo "any_changed=false" >> $GITHUB_ENV
+          fi
 
-      # https://github.com/gaurav-nelson/github-action-markdown-link-check
       - name: Markdown links
         uses: gaurav-nelson/github-action-markdown-link-check@v1
+        if: env.any_changed == 'true'
         with:
-          # yamllint disable-line rule:truthy
           check-modified-files-only: yes
           config-file: '.rules/mlc_config.json'
           base-branch: 'main'

.github/workflows/validate_yamllint.yml

@@ -19,24 +19,29 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@main
+        uses: actions/checkout@v4
         with:
-          fetch-depth: '0'
+          fetch-depth: 0  # Ensures full commit history for diff
 
       - name: Identify changed files
-        uses: tj-actions/changed-files@v41
         id: changed-files
-        with:
+        run: |
-          files: '**/*.y*ml'
+          BASE=${{ github.event.before }}
-          separator: ","
+          HEAD=${{ github.sha }}
+          FILES=$(git diff --name-only $BASE $HEAD -- '**/*.yml' '**/*.yaml' | tr '\n' ',')
+          echo "changed_files=$FILES" >> $GITHUB_ENV
+          if [[ -n "$FILES" ]]; then
+            echo "any_changed=true" >> $GITHUB_ENV
+          else
+            echo "any_changed=false" >> $GITHUB_ENV
+          fi
 
       - name: Validate YAML
-        if: steps.changed-files.outputs.any_changed == 'true'
+        if: env.any_changed == 'true'
         run: |
-          IFS=',' read -ra FILES <<< "${{ steps.changed-files.outputs.all_changed_files }}"
+          IFS=',' read -ra FILES <<< "${{ env.changed_files }}"
           for file in "${FILES[@]}"; do
-            if [[ "$file" =~ ^*\.yaml$ ]] || \
+            if [[ "$file" =~ ^.*\.yaml$ ]] || [[ "$file" =~ ^ESPHome/.*\.yaml$ ]]; then
-              [[ "$file" =~ ^ESPHome/*\.yaml$ ]]; then
               echo "Skipping $file"
               continue
             fi

.test/common_idf.yaml

@@ -10,7 +10,6 @@ light:
   - id: !extend light_full
     platform: esp32_rmt_led_strip
     rgb_order: GRB
-    rmt_channel: 1
     chipset: ws2812
     max_refresh_rate: 33ms
     use_psram: false

.test/esphome_idf53_basic.yaml

@@ -1,11 +0,0 @@
----
-packages:
-  common_idf53: !include common_idf53.yaml
-  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
-  standard_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml
-
-media_player: !remove
-
-switch:
-  - id: !remove sw_speaker_amplifier
-...

.test/esphome_idf53_ble_proxy.yaml

@@ -1,13 +0,0 @@
----
-packages:
-  common: !include common.yaml
-  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
-  standard_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml
-  addon_bluetooth_proxy: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_addon_ble_proxy.yaml
-
-esp32:
-  framework:
-    type: esp-idf
-    version: 5.3.1
-    platform_version: 6.9.0
-...

.test/esphome_idf53_core.yaml

@@ -1,5 +0,0 @@
----
-packages:
-  common_idf53: !include common_idf53.yaml
-  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
-...

.test/esphome_idf53_hw_relays.yaml

@@ -1,6 +0,0 @@
----
-packages:
-  common_idf53: !include common_idf53.yaml
-  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
-  standard_hw_relays_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_relays.yaml
-...

.test/esphome_idf53_hw_speaker.yaml

@@ -1,6 +0,0 @@
----
-packages:
-  common_idf53: !include common_idf53.yaml
-  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
-  standard_hw_speaker_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_speaker.yaml
-...

.test/esphome_idf53_hw_vibration.yaml

@@ -1,6 +0,0 @@
----
-packages:
-  common_idf53: !include common_idf53.yaml
-  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
-  standard_hw_vibration_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_vibration.yaml
-...

ESPHome/TX-Ultimate-Easy-ESPHome_addon_ble_proxy.yaml

@@ -31,7 +31,7 @@ light:
   - id: !extend light_full
     platform: esp32_rmt_led_strip
     rgb_order: GRB
-    rmt_channel: 1
+    # rmt_channel: 1  # Not supported with IDF 5
     chipset: ws2812
     max_refresh_rate: 33ms
     use_psram: false

ESPHome/TX-Ultimate-Easy-ESPHome_core_common.yaml

@@ -17,6 +17,8 @@ substitutions:
 
   <<: !include ../versioning/VERSION_YAML
 
+  EVENT_NAME: esphome.tx_ultimate_easy
+
   TX_MODEL_FORMAT_EU_TEXT: "EU (Square, T5-xC-86)"
   TX_MODEL_FORMAT_US_TEXT: "US (Rectangle, T5-xC-120)"
 
@@ -109,8 +111,6 @@ ota:
   platform: esphome
 
 psram:
-  mode: octal
-  speed: 80MHz
 
 script:
   - id: api_send_ha_event_boot
@@ -118,13 +118,15 @@ script:
     parameters:
       type: string
     then:
-      - homeassistant.event:
+      - lambda: |-
-          event: esphome.tx_ultimate_easy
+          // Send event to Home Assistant
-          data:
+          esphome::api::CustomAPIDevice ha_event;
-            device_name: !lambda return tx_device_name->state.c_str();
+          ha_event.fire_homeassistant_event("${EVENT_NAME}", {
-            firmware: ${version}
+            {"device_name", id(tx_device_name).state.c_str()},
-            domain: boot
+            {"firmware", "${version}"},
-            type: !lambda return type.c_str();
+            {"domain", "boot"},
+            {"type", type.c_str()}
+          });
 
   - id: boot_done
     mode: restart

ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml

@@ -112,18 +112,19 @@ script:
       action: string
       count: uint8_t
     then:
-      - homeassistant.event:
-          event: esphome.tx_ultimate_easy
-          data:
-            device_name: !lambda return tx_device_name->state.c_str();
-            firmware: ${version}
-            domain: touch
-            type: button
-            action: !lambda return action.c_str();
-            button_id: !lambda return button;
-            count: !lambda return count;
-            position: !lambda return id(button_press_position);
       - lambda: |-
+          // Send event to Home Assistant
+          esphome::api::CustomAPIDevice ha_event;
+          ha_event.fire_homeassistant_event("${EVENT_NAME}", {
+            {"device_name", id(tx_device_name).state.c_str()},
+            {"firmware", "${version}"},
+            {"domain", "touch"},
+            {"type", "button"},
+            {"action", action.c_str()},
+            {"button_id", std::to_string(button)},
+            {"count", std::to_string(count)},
+            {"position", std::to_string(id(button_press_position))}
+          });
           ESP_LOGI("core_hw_buttons", "Button %" PRIu8 " action: '%s'", button, action.c_str());
           if (action == "click") {
             switch (button) {

ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_leds.yaml

@@ -55,9 +55,9 @@ light:
     variant: WS2811
 
   # Those lights are available based on the model selections
-  - &light_partition_with_effects
+  - &light_partition_with_effects_eu
     id: light_eu
-    name: Light
+    name: Light EU
     platform: partition
     default_transition_length: ${default_transition_length}
     internal: true
@@ -65,8 +65,10 @@ light:
     effects:
       - addressable_rainbow:
           name: "Rainbow"
+          width: 28
       - addressable_rainbow:
           name: "Rainbow - Fast"
+          width: 28
           speed: 50
       - pulse:
           name: "Pulse"
@@ -105,35 +107,82 @@ light:
         from: 0
         to: 27
 
-  - id: light_us
+  - &light_partition_with_effects_us
-    name: Light
+    id: light_us
-    <<: *light_partition_with_effects
+    name: Light US
+    platform: partition
+    default_transition_length: ${default_transition_length}
+    internal: true
+    restore_mode: ${LIGHT_SIDES_RESTORE_MODE}
+    effects:
+      - addressable_rainbow:
+          name: "Rainbow"
+          width: 32
+      - addressable_rainbow:
+          name: "Rainbow - Fast"
+          width: 32
+          speed: 50
+      - pulse:
+          name: "Pulse"
+          transition_length: 1s
+          update_interval: 1s
+      - pulse:
+          name: "Pulse - Slow"
+          transition_length: 2s
+          update_interval: 2s
+      - addressable_scan:
+          name: "Scan"
+          move_interval: 100ms
+          scan_width: 3
+      - addressable_twinkle:
+          name: "Twinkle"
+          twinkle_probability: 5%
+          progress_interval: 4ms
+      - addressable_random_twinkle:
+          name: "Random Twinkle"
+          twinkle_probability: 20%
+          progress_interval: 32ms
+      - addressable_fireworks:
+          name: "Fireworks"
+          update_interval: 32ms
+          spark_probability: 10%
+          use_random_color: false
+          fade_out_rate: 120
+      - addressable_flicker:
+          name: "Flicker"
+          update_interval: 16ms
+          intensity: 5%
+      - random:
+          name: "Random"
     segments:
       - id: light_full
         from: 0
         to: 31
 
-  - &light_partition_with_effects_disabled
+  - &light_partition_no_effects_disabled
     id: light_eu_bottom
-    name: Light - Bottom
+    name: Light - Bottom EU
+    platform: partition
     disabled_by_default: true
-    <<: *light_partition_with_effects
+    default_transition_length: ${default_transition_length}
+    restore_mode: ${LIGHT_SIDES_RESTORE_MODE}
+    internal: true
     segments:
       - id: light_full
         from: 6
         to: 12
         reversed: true
   - id: light_eu_left
-    name: Light - Left
+    name: Light - Left EU
-    <<: *light_partition_with_effects_disabled
+    <<: *light_partition_no_effects_disabled
     segments:
       - id: light_full
         from: 13
         to: 19
         reversed: true
   - id: light_eu_right
-    name: Light - Right
+    name: Light - Right EU
-    <<: *light_partition_with_effects_disabled
+    <<: *light_partition_no_effects_disabled
     segments:
       - id: light_full
         from: 27
@@ -144,32 +193,32 @@ light:
         to: 5
         reversed: false
   - id: light_eu_top
-    name: Light - Top
+    name: Light - Top EU
-    <<: *light_partition_with_effects_disabled
+    <<: *light_partition_no_effects_disabled
     segments:
       - id: light_full
         from: 20
         to: 26
         reversed: false
   - id: light_us_bottom
-    name: Light - Bottom
+    name: Light - Bottom US
-    <<: *light_partition_with_effects_disabled
+    <<: *light_partition_no_effects_disabled
     segments:
       - id: light_full
         from: 9
         to: 14
         reversed: true
   - id: light_us_left
-    name: Light - Left
+    name: Light - Left US
-    <<: *light_partition_with_effects_disabled
+    <<: *light_partition_no_effects_disabled
     segments:
       - id: light_full
         from: 15
         to: 24
         reversed: true
   - id: light_us_right
-    name: Light - Right
+    name: Light - Right US
-    <<: *light_partition_with_effects_disabled
+    <<: *light_partition_no_effects_disabled
     segments:
       - id: light_full
         from: 31
@@ -180,8 +229,8 @@ light:
         to: 8
         reversed: false
   - id: light_us_top
-    name: Light - Top
+    name: Light - Top US
-    <<: *light_partition_with_effects_disabled
+    <<: *light_partition_no_effects_disabled
     segments:
       - id: light_full
         from: 25
@@ -567,7 +616,7 @@ select:
   # EU relay light mode template
   - &relay_light_mode_eu
     id: sl_relay_1_light_mode_eu
-    name: Relay 1 light mode
+    name: Relay 1 light mode EU
     platform: template
     options:
       - "${LIGHT_MODE_DISABLED_TEXT}"
@@ -582,19 +631,19 @@ select:
     disabled_by_default: false
     icon: mdi:dots-square
   - id: sl_relay_2_light_mode_eu
-    name: Relay 2 light mode
+    name: Relay 2 light mode EU
     <<: *relay_light_mode_eu
   - id: sl_relay_3_light_mode_eu
-    name: Relay 3 light mode
+    name: Relay 3 light mode EU
     <<: *relay_light_mode_eu
   - id: sl_relay_4_light_mode_eu
-    name: Relay 4 light mode
+    name: Relay 4 light mode EU
     <<: *relay_light_mode_eu
 
   # US relay light mode template
   - &relay_light_mode_us
     id: sl_relay_1_light_mode_us
-    name: Relay 1 light mode
+    name: Relay 1 light mode US
     platform: template
     options:
       - "${LIGHT_MODE_DISABLED_TEXT}"
@@ -609,12 +658,12 @@ select:
     disabled_by_default: false
     icon: mdi:dots-square
   - id: sl_relay_2_light_mode_us
-    name: Relay 2 light mode
+    name: Relay 2 light mode US
     <<: *relay_light_mode_us
   - id: sl_relay_3_light_mode_us
-    name: Relay 3 light mode
+    name: Relay 3 light mode US
     <<: *relay_light_mode_us
   - id: sl_relay_4_light_mode_us
-    name: Relay 4 light mode
+    name: Relay 4 light mode US
     <<: *relay_light_mode_us
 ...

ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml

@@ -386,19 +386,23 @@ tx_ultimate_easy:
         }
 
   on_multi_touch_release:
-    - homeassistant.event:
+    then:
-        event: esphome.tx_ultimate_easy
+      - lambda: |-
-        data:
+          // Send event to Home Assistant
-          device_name: !lambda return tx_device_name->state.c_str();
+          esphome::api::CustomAPIDevice ha_event;
-          firmware: ${version}
+          ha_event.fire_homeassistant_event("${EVENT_NAME}", {
-          domain: touch
+            {"device_name", id(tx_device_name).state.c_str()},
-          type: multi_touch
+            {"firmware", "${version}"},
-          action: release
+            {"domain", "touch"},
-          position: !lambda return touch.x;
+            {"type", "multi_touch"},
-    - lambda: ESP_LOGI("core_hw_touch", "Multi-touch released");
+            {"action", "release"},
-    - script.execute: touch_on_multi_touch_release
+            {"position", std::to_string(touch.x)}
+          });
+          ESP_LOGI("core_hw_touch", "Multi-touch released");
+          touch_on_multi_touch_release->execute();
 
   on_press:
+    then:
       - lambda: |-
           const uint8_t position = static_cast<uint8_t>(touch.x);
           if (position > ${TOUCH_POSITION_MAX_VALUE}) {  // Check for valid range
@@ -409,46 +413,45 @@ tx_ultimate_easy:
           }
 
   on_release:
+    then:
       - lambda: ESP_LOGI("core_hw_touch", "Released");
       - script.execute: touch_on_release
 
   on_swipe_left:
-    - homeassistant.event:
+    then:
-        event: esphome.tx_ultimate_easy
-        data:
-          device_name: !lambda return tx_device_name->state.c_str();
-          firmware: ${version}
-          domain: touch
-          type: swipe
-          action: !lambda |-
-            return sl_tx_model_format->state == "${TX_MODEL_FORMAT_EU_TEXT}" ? "left" : "down";
-          swipe-direction: !lambda |-
-            return sl_tx_model_format->state == "${TX_MODEL_FORMAT_EU_TEXT}" ? "left" : "down";
-          position: !lambda return touch.x;
       - lambda: |-
-        ESP_LOGI("core_hw_touch", "Swipe %s", sl_tx_model_format->state == "${TX_MODEL_FORMAT_EU_TEXT}"
+          std::string swipe_direction = (sl_tx_model_format->state == "${TX_MODEL_FORMAT_EU_TEXT}") ? "left" : "down";
-                                                  ? "left"
+          // Send event to Home Assistant
-                                                  : "down");
+          esphome::api::CustomAPIDevice ha_event;
-    - script.execute: touch_swipe_left
+          ha_event.fire_homeassistant_event("${EVENT_NAME}", {
+            {"device_name", id(tx_device_name).state.c_str()},
+            {"firmware", "${version}"},
+            {"domain", "touch"},
+            {"type", "swipe"},
+            {"action", swipe_direction.c_str()},
+            {"swipe-direction", swipe_direction.c_str()},
+            {"position", std::to_string(touch.x)}
+          });
+          ESP_LOGI("core_hw_touch", "Swipe %s", swipe_direction.c_str());
+          touch_swipe_left->execute();
 
   on_swipe_right:
-    - homeassistant.event:
+    then:
-        event: esphome.tx_ultimate_easy
-        data:
-          device_name: !lambda return tx_device_name->state.c_str();
-          firmware: ${version}
-          domain: touch
-          type: swipe
-          action: !lambda |-
-            return sl_tx_model_format->state == "${TX_MODEL_FORMAT_EU_TEXT}" ? "right" : "up";
-          swipe-direction: !lambda |-
-            return sl_tx_model_format->state == "${TX_MODEL_FORMAT_EU_TEXT}" ? "right" : "up";
-          position: !lambda return touch.x;
       - lambda: |-
-        ESP_LOGI("core_hw_touch", "Swipe %s", sl_tx_model_format->state == "${TX_MODEL_FORMAT_EU_TEXT}"
+          std::string swipe_direction = (sl_tx_model_format->state == "${TX_MODEL_FORMAT_EU_TEXT}") ? "right" : "up";
-                                                  ? "right"
+          // Send event to Home Assistant
-                                                  : "up");
+          esphome::api::CustomAPIDevice ha_event;
-    - script.execute: touch_swipe_right
+          ha_event.fire_homeassistant_event("${EVENT_NAME}", {
+            {"device_name", id(tx_device_name).state.c_str()},
+            {"firmware", "${version}"},
+            {"domain", "touch"},
+            {"type", "swipe"},
+            {"action", swipe_direction.c_str()},
+            {"swipe-direction", swipe_direction.c_str()},
+            {"position", std::to_string(touch.x)}
+          });
+          ESP_LOGI("core_hw_touch", "Swipe %s", swipe_direction.c_str());
+          touch_swipe_right->execute();
 
   on_touch_event:
     - lambda: |-

versioning/VERSION

@@ -1 +1 @@
-2025.1.4
+2025.7.3

versioning/VERSION_YAML

@@ -1 +1 @@
-version: 2025.1.4
+version: 2025.7.3