Bump version to 2025.8.2 [skip-versioning]

Return last position on swipe

.github/workflows/validate_esphome.yml

@@ -1,12 +1,36 @@
 ---
-name: Validate ESPHome (Latest)
+name: Validate ESPHome
 
 permissions:
   contents: read
   pull-requests: read
 
 on:  # yamllint disable-line rule:truthy
+  push:
+    paths:
+      - "**/*.yml"
+      - "**/*.yaml"
+      - "**/*.h"
+      - "**/*.cpp"
+      - "**/*.c"
+      - "**/*.py"
+
+  pull_request:
+    paths:
+      - "**/*.yml"
+      - "**/*.yaml"
+      - "**/*.h"
+      - "**/*.cpp"
+      - "**/*.c"
+      - "**/*.py"
+
   workflow_dispatch:
+    inputs:
+      skip_dev:
+        description: 'Skip dev testing (test only on latest)'
+        required: false
+        default: false
+        type: boolean
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -15,250 +39,383 @@ concurrency:
 jobs:
   code_scan:
     name: Code scan (YAML)
-    runs-on: "ubuntu-latest"
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
         uses: actions/checkout@main
-
       - name: Setup Python
         uses: actions/setup-python@main
         with:
-          python-version: '3.8'
-
+          python-version: '3.11'
       - name: Install Yamllint
         run: pip install yamllint
-
       - name: Validate YAML files
         run: find . -name "*.yaml" -exec yamllint -c ./.rules/yamllint.yml {} +
 
+  # Arduino Framework - Foundation (latest)
   build_ard_core:
-    name: Core (Arduino)
+    name: "🏗️ Arduino Core (latest)"
     needs: code_scan
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@main
-      - name: Build Core (Arduino)
+      - name: Build Arduino Core - latest
         uses: esphome/build-action@main
         with:
           yaml-file: ".test/esphome_ard_core.yaml"
           version: latest
 
-  build_idf_core:
-    name: Core (IDF)
-    needs: code_scan
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build Core (IDF)
-        uses: esphome/build-action@main
-        with:
-          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)
+    name: "📦 Arduino Basic (latest)"
     needs: build_ard_core
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@main
-      - name: Build Basic (Arduino)
+      - name: Build Arduino Basic - latest
         uses: esphome/build-action@main
         with:
           yaml-file: ".test/esphome_ard_basic.yaml"
           version: latest
 
-  build_idf_basic:
-    name: Basic (IDF)
-    needs: build_idf_core
+  build_ard_basic_dev:
+    name: "📦 Arduino Basic (dev)"
+    needs: build_ard_core
+    if: success() && !github.event.inputs.skip_dev
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@main
-      - name: Build Basic (IDF)
+      - name: Build Arduino Basic - dev
         uses: esphome/build-action@main
         with:
-          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
+          yaml-file: ".test/esphome_ard_basic.yaml"
+          version: dev
 
   build_ard_hw_relays:
-    name: HW Relays (Arduino)
-    needs: build_ard_core
+    name: "🔌 Arduino HW Relays (latest)"
+    needs: build_ard_basic
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@main
-      - name: Build HW Relays (Arduino)
+      - name: Build Arduino HW Relays - latest
         uses: esphome/build-action@main
         with:
           yaml-file: ".test/esphome_ard_hw_relays.yaml"
           version: latest
 
-  build_idf_hw_relays:
-    name: HW Relays (IDF)
-    needs: build_idf_core
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build HW Relays (IDF)
-        uses: esphome/build-action@main
-        with:
-          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
+    name: "🔌 Arduino HW Speaker (latest)"
+    needs: build_ard_basic
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@main
-      - name: Build HW Speaker (Arduino)
+      - name: Build Arduino HW Speaker - latest
         uses: esphome/build-action@main
         with:
           yaml-file: ".test/esphome_ard_hw_speaker.yaml"
           version: latest
 
-  build_idf_hw_speaker:
-    name: HW Speaker (IDF)
-    needs: build_idf_core
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build HW Speaker (IDF)
-        uses: esphome/build-action@main
-        with:
-          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
+    name: "🔌 Arduino HW Vibration (latest)"
+    needs: build_ard_basic
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@main
-      - name: Build HW Vibration (Arduino)
+      - name: Build Arduino HW Vibration - latest
         uses: esphome/build-action@main
         with:
           yaml-file: ".test/esphome_ard_hw_vibration.yaml"
           version: latest
 
-  build_idf_hw_vibration:
-    name: HW Vibration (IDF)
-    needs: build_idf_core
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build HW Vibration (IDF)
-        uses: esphome/build-action@main
-        with:
-          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)
+  build_ard_ble_proxy_latest:
+    name: "⚡ Arduino BLE Proxy (latest)"
     needs: build_ard_basic
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@main
-      - name: Build BLE Proxy (Ard)
+      - name: Build Arduino BLE Proxy - latest
         uses: esphome/build-action@main
         with:
           yaml-file: ".test/esphome_ard_ble_proxy.yaml"
           version: latest
 
-  build_idf_ble_proxy:
-    name: Bluetooth Proxy (IDF)
+  build_ard_ble_proxy_dev:
+    name: "⚡ Arduino BLE Proxy (dev)"
+    needs: build_ard_basic_dev
+    if: success() && !github.event.inputs.skip_dev
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@main
+      - name: Build Arduino BLE Proxy - dev
+        uses: esphome/build-action@main
+        with:
+          yaml-file: ".test/esphome_ard_ble_proxy.yaml"
+          version: dev
+
+  # IDF Framework - Foundation (latest)
+  build_idf_core:
+    name: "🏗️ IDF Core (latest)"
+    needs: code_scan
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@main
+      - name: Build IDF Core - latest
+        uses: esphome/build-action@main
+        with:
+          yaml-file: ".test/esphome_idf_core.yaml"
+          version: latest
+
+  build_idf_basic:
+    name: "📦 IDF Basic (latest)"
+    needs: build_idf_core
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@main
+      - name: Build IDF Basic - latest
+        uses: esphome/build-action@main
+        with:
+          yaml-file: ".test/esphome_idf_basic.yaml"
+          version: latest
+
+  build_idf_basic_dev:
+    name: "📦 IDF Basic (dev)"
+    needs: build_idf_core
+    if: success() && !github.event.inputs.skip_dev
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@main
+      - name: Build IDF Basic - dev
+        uses: esphome/build-action@main
+        with:
+          yaml-file: ".test/esphome_idf_basic.yaml"
+          version: dev
+
+  build_idf_hw_relays:
+    name: "🔌 IDF HW Relays (latest)"
     needs: build_idf_basic
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@main
-      - name: Build BLE Proxy (IDF)
+      - name: Build IDF HW Relays - latest
+        uses: esphome/build-action@main
+        with:
+          yaml-file: ".test/esphome_idf_hw_relays.yaml"
+          version: latest
+
+  build_idf_hw_speaker:
+    name: "🔌 IDF HW Speaker (latest)"
+    needs: build_idf_basic
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@main
+      - name: Build IDF HW Speaker - latest
+        uses: esphome/build-action@main
+        with:
+          yaml-file: ".test/esphome_idf_hw_speaker.yaml"
+          version: latest
+
+  build_idf_hw_vibration:
+    name: "🔌 IDF HW Vibration (latest)"
+    needs: build_idf_basic
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@main
+      - name: Build IDF HW Vibration - latest
+        uses: esphome/build-action@main
+        with:
+          yaml-file: ".test/esphome_idf_hw_vibration.yaml"
+          version: latest
+
+  build_idf_ble_proxy_latest:
+    name: "⚡ IDF BLE Proxy (latest)"
+    needs: build_idf_basic
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@main
+      - name: Build IDF BLE Proxy - latest
         uses: esphome/build-action@main
         with:
           yaml-file: ".test/esphome_idf_ble_proxy.yaml"
           version: latest
 
-  build_idf53_ble_proxy:
-    name: Bluetooth Proxy (IDF v5.3)
-    needs: build_idf53_basic
+  build_idf_ble_proxy_dev:
+    name: "⚡ IDF BLE Proxy (dev)"
+    needs: build_idf_basic_dev
+    if: success() && !github.event.inputs.skip_dev
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@main
-      - name: Build BLE Proxy (IDF v5.3)
+      - name: Build IDF BLE Proxy - dev
         uses: esphome/build-action@main
         with:
-          yaml-file: ".test/esphome_idf53_ble_proxy.yaml"
-          version: latest
+          yaml-file: ".test/esphome_idf_ble_proxy.yaml"
+          version: dev
 
-  build_ard_media_player:
-    name: Media Player (Ard)
+  # Summary Jobs - Grouped by framework and environment
+  summary_arduino:
+    name: "📊 Arduino Framework"
     needs:
+      - build_ard_core
+      - build_ard_basic
+      - build_ard_basic_dev
+      - build_ard_hw_relays
+      - build_ard_hw_speaker
+      - build_ard_hw_vibration
+      - build_ard_ble_proxy_latest
+      - build_ard_ble_proxy_dev
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      - name: Arduino Framework Results
+        run: |
+          SUCCESS=0
+          TOTAL=0
+
+          # Count latest builds (always run)
+          [ "${{ needs.build_ard_core.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+          [ "${{ needs.build_ard_basic.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+          [ "${{ needs.build_ard_hw_relays.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+          [ "${{ needs.build_ard_hw_speaker.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+          [ "${{ needs.build_ard_hw_vibration.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+          [ "${{ needs.build_ard_ble_proxy_latest.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+          TOTAL=$((TOTAL + 6))
+
+          # Count dev builds (if not skipped)
+          if [ "${{ github.event.inputs.skip_dev }}" != "true" ]; then
+            [ "${{ needs.build_ard_basic_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+            [ "${{ needs.build_ard_ble_proxy_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+            TOTAL=$((TOTAL + 2))
+          fi
+
+          echo "🤖 Arduino Framework: $SUCCESS/$TOTAL builds passed"
+
+          if [ "$SUCCESS" -eq "$TOTAL" ]; then
+            echo "✅ All Arduino builds successful!"
+          else
+            echo "❌ Some Arduino builds failed"
+            exit 1
+          fi
+
+  summary_idf:
+    name: "📊 ESP-IDF Framework"
+    needs:
+      - build_idf_core
+      - build_idf_basic
+      - build_idf_basic_dev
+      - build_idf_hw_relays
+      - build_idf_hw_speaker
+      - build_idf_hw_vibration
+      - build_idf_ble_proxy_latest
+      - build_idf_ble_proxy_dev
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      - name: ESP-IDF Framework Results
+        run: |
+          SUCCESS=0
+          TOTAL=0
+
+          # Count latest builds (always run)
+          [ "${{ needs.build_idf_core.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+          [ "${{ needs.build_idf_basic.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+          [ "${{ needs.build_idf_hw_relays.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+          [ "${{ needs.build_idf_hw_speaker.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+          [ "${{ needs.build_idf_hw_vibration.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+          [ "${{ needs.build_idf_ble_proxy_latest.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+          TOTAL=$((TOTAL + 6))
+
+          # Count dev builds (if not skipped)
+          if [ "${{ github.event.inputs.skip_dev }}" != "true" ]; then
+            [ "${{ needs.build_idf_basic_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+            [ "${{ needs.build_idf_ble_proxy_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+            TOTAL=$((TOTAL + 2))
+          fi
+
+          echo "🔧 ESP-IDF Framework: $SUCCESS/$TOTAL builds passed"
+
+          if [ "$SUCCESS" -eq "$TOTAL" ]; then
+            echo "✅ All ESP-IDF builds successful!"
+          else
+            echo "❌ Some ESP-IDF builds failed"
+            exit 1
+          fi
+
+  summary_latest:
+    name: "📊 ESPHome (Latest)"
+    needs:
+      - build_ard_core
       - build_ard_basic
       - build_ard_hw_relays
+      - build_ard_hw_speaker
       - build_ard_hw_vibration
+      - build_ard_ble_proxy_latest
+      - build_idf_core
+      - build_idf_basic
+      - build_idf_hw_relays
+      - build_idf_hw_speaker
+      - build_idf_hw_vibration
+      - build_idf_ble_proxy_latest
+    if: always()
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@main
-      - name: Build Media Player (Ard)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_ard_media_player.yaml"
-          version: latest
+      - name: Latest ESPHome Results
+        run: |
+          SUCCESS=0
+          TOTAL=12
+
+          # Arduino Latest builds
+          [ "${{ needs.build_ard_core.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+          [ "${{ needs.build_ard_basic.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+          [ "${{ needs.build_ard_hw_relays.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+          [ "${{ needs.build_ard_hw_speaker.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+          [ "${{ needs.build_ard_hw_vibration.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+          [ "${{ needs.build_ard_ble_proxy_latest.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+
+          # ESP-IDF Latest builds
+          [ "${{ needs.build_idf_core.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+          [ "${{ needs.build_idf_basic.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+          [ "${{ needs.build_idf_hw_relays.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+          [ "${{ needs.build_idf_hw_speaker.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+          [ "${{ needs.build_idf_hw_vibration.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+          [ "${{ needs.build_idf_ble_proxy_latest.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+
+          echo "📋 ESPHome (Latest): $SUCCESS/$TOTAL builds passed"
+
+          if [ "$SUCCESS" -eq "$TOTAL" ]; then
+            echo "✅ All builds on latest ESPHome successful!"
+          else
+            echo "❌ Some builds on latest ESPHome failed"
+            exit 1
+          fi
+
+  summary_dev:
+    name: "📊 ESPHome (Dev)"
+    needs:
+      - build_ard_basic_dev
+      - build_ard_ble_proxy_dev
+      - build_idf_basic_dev
+      - build_idf_ble_proxy_dev
+    if: always() && !github.event.inputs.skip_dev
+    runs-on: ubuntu-latest
+    steps:
+      - name: Dev ESPHome Results
+        run: |
+          SUCCESS=0
+          TOTAL=4
+
+          # Arduino Dev builds
+          [ "${{ needs.build_ard_basic_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+          [ "${{ needs.build_ard_ble_proxy_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+
+          # ESP-IDF Dev builds
+          [ "${{ needs.build_idf_basic_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+          [ "${{ needs.build_idf_ble_proxy_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+
+          echo "🚀 ESPHome (Dev): $SUCCESS/$TOTAL builds passed"
+
+          if [ "$SUCCESS" -eq "$TOTAL" ]; then
+            echo "✅ All builds on dev ESPHome successful!"
+          else
+            echo "❌ Some builds on dev ESPHome failed"
+            exit 1
+          fi
 ...

.github/workflows/validate_esphome_beta.yml

@@ -1,282 +0,0 @@
----
-name: Validate ESPHome (Beta)
-
-permissions:
-  contents: read
-  pull-requests: read
-
-on:  # yamllint disable-line rule:truthy
-  push:
-    paths:
-      - "*.{yml,yaml,h,cpp,c,py}"
-      - ".github/workflows/*.{yml,yaml,h,cpp,c,py}"
-      - ".test/*.{yml,yaml,h,cpp,c,py}"
-      - "components/*.{yml,yaml,h,cpp,c,py}"
-      - "components/tx_ultimate_easy/*.{yml,yaml,h,cpp,c,py}"
-      - "ESPHome/*.{yml,yaml,h,cpp,c,py}"
-    branches:
-      - main
-  pull_request:
-    paths:
-      - "*.{yml,yaml,h,cpp,c,py}"
-      - ".github/workflows/*.{yml,yaml,h,cpp,c,py}"
-      - ".test/*.{yml,yaml,h,cpp,c,py}"
-      - "components/*.{yml,yaml,h,cpp,c,py}"
-      - "components/tx_ultimate_easy/*.{yml,yaml,h,cpp,c,py}"
-      - "ESPHome/*.{yml,yaml,h,cpp,c,py}"
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  code_scan:
-    name: Code scan (YAML)
-    runs-on: "ubuntu-latest"
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@main
-
-      - name: Setup Python
-        uses: actions/setup-python@main
-        with:
-          python-version: '3.8'
-
-      - name: Install Yamllint
-        run: pip install yamllint
-
-      - name: Validate YAML files
-        run: find . -name "*.yaml" -exec yamllint -c ./.rules/yamllint.yml {} +
-
-  build_ard_core:
-    name: Core (Arduino)
-    needs: code_scan
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build Core (Arduino)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_ard_core.yaml"
-          version: beta
-
-  build_idf_core:
-    name: Core (IDF)
-    needs: code_scan
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build Core (IDF)
-        uses: esphome/build-action@main
-        with:
-          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
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build Basic (Arduino)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_ard_basic.yaml"
-          version: beta
-
-  build_idf_basic:
-    name: Basic (IDF)
-    needs: build_idf_core
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build Basic (IDF)
-        uses: esphome/build-action@main
-        with:
-          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
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build HW Relays (Arduino)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_ard_hw_relays.yaml"
-          version: beta
-
-  build_idf_hw_relays:
-    name: HW Relays (IDF)
-    needs: build_idf_core
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build HW Relays (IDF)
-        uses: esphome/build-action@main
-        with:
-          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
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build HW Speaker (Arduino)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_ard_hw_speaker.yaml"
-          version: beta
-
-  build_idf_hw_speaker:
-    name: HW Speaker (IDF)
-    needs: build_idf_core
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build HW Speaker (IDF)
-        uses: esphome/build-action@main
-        with:
-          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
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build HW Vibration (Arduino)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_ard_hw_vibration.yaml"
-          version: beta
-
-  build_idf_hw_vibration:
-    name: HW Vibration (IDF)
-    needs: build_idf_core
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build HW Vibration (IDF)
-        uses: esphome/build-action@main
-        with:
-          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
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build BLE Proxy (Ard)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_ard_ble_proxy.yaml"
-          version: beta
-
-  build_idf_ble_proxy:
-    name: Bluetooth Proxy (IDF)
-    needs: build_idf_basic
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build BLE Proxy (IDF)
-        uses: esphome/build-action@main
-        with:
-          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:
-      - build_ard_basic
-      - build_ard_hw_relays
-      - build_ard_hw_vibration
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build Media Player (Ard)
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_ard_media_player.yaml"
-          version: beta
-...

.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:
-          files: '**/*.md'
-          separator: ","
-      # https://github.com/marketplace/actions/markdownlint-cli2-action
+        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
+
       - 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:
-          files: '**/*.y*ml'
-          separator: ","
+        run: |
+          BASE=${{ github.event.before }}
+          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$ ]] || \
-              [[ "$file" =~ ^ESPHome/*\.yaml$ ]]; then
+            if [[ "$file" =~ ^.*\.yaml$ ]] || [[ "$file" =~ ^ESPHome/.*\.yaml$ ]]; then
               echo "Skipping $file"
               continue
             fi

.github/workflows/versioning.yml

@@ -4,7 +4,6 @@
 # 2. Manual dispatch - allows independent control over stable and latest tags
 
 ---
-
 name: Version and Tags
 
 on:  # yamllint disable-line rule:truthy
@@ -76,7 +75,7 @@ jobs:
           # Update tag
           NEW_VERSION=$(cat ./versioning/VERSION)
           echo "Updating stable tag to $NEW_VERSION"
-          git tag -fa stable -m "Update stable tag"
+          git tag -fa stable -m "Update stable tag to $NEW_VERSION"
           git push origin stable --force
 
       - name: Update latest tag
@@ -101,6 +100,6 @@ jobs:
           # Update tag
           NEW_VERSION=$(cat ./versioning/VERSION)
           echo "Updating latest tag to $NEW_VERSION"
-          git tag -fa latest -m "Update latest tag"
+          git tag -fa latest -m "Update latest tag to $NEW_VERSION"
           git push origin latest --force
 ...

.test/common.yaml

@@ -0,0 +1,5 @@
+---
+wifi:
+  ssid: !secret wifi_ssid
+  password: !secret wifi_password
+...

.test/common_ard.yaml

@@ -0,0 +1,8 @@
+---
+packages:
+  common: !include common.yaml
+
+esp32:
+  framework:
+    type: arduino
+...

.test/common_idf.yaml

@@ -0,0 +1,8 @@
+---
+packages:
+  common: !include common.yaml
+
+esp32:
+  framework:
+    type: esp-idf
+...

.test/esphome_ard_basic.yaml

@@ -1,13 +1,6 @@
 ---
 packages:
+  common_arduino: !include common_ard.yaml
   core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
   standard_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml
-
-esp32:
-  framework:
-    type: arduino
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...

.test/esphome_ard_ble_proxy.yaml

@@ -1,14 +1,8 @@
 ---
 packages:
+  common_arduino: !include common_ard.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: arduino
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
+bluetooth_proxy:
 ...

.test/esphome_ard_core.yaml

@@ -1,12 +1,5 @@
 ---
 packages:
+  common_arduino: !include common_ard.yaml
   core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
-
-esp32:
-  framework:
-    type: arduino
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...

.test/esphome_ard_hw_relays.yaml

@@ -1,13 +1,6 @@
 ---
 packages:
+  common_arduino: !include common_ard.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
-
-esp32:
-  framework:
-    type: arduino
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...

.test/esphome_ard_hw_speaker.yaml

@@ -1,13 +1,6 @@
 ---
 packages:
+  common_arduino: !include common_ard.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
-
-esp32:
-  framework:
-    type: arduino
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...

.test/esphome_ard_hw_vibration.yaml

@@ -1,13 +1,6 @@
 ---
 packages:
+  common_arduino: !include common_ard.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
-
-esp32:
-  framework:
-    type: arduino
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...

.test/esphome_ard_media_player.yaml

@@ -1,15 +0,0 @@
----
-packages:
-  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
-  standard_hw_relays_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_relays.yaml
-  standard_hw_vibration_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_vibration.yaml
-  addon_media_player: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_addon_media_player.yaml
-
-esp32:
-  framework:
-    type: arduino
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
-...

.test/esphome_idf53_basic.yaml

@@ -1,15 +0,0 @@
----
-packages:
-  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
-  standard_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml
-
-esp32:
-  framework:
-    type: esp-idf
-    version: 5.3.1
-    platform_version: 6.9.0
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
-...

.test/esphome_idf53_ble_proxy.yaml

@@ -1,16 +0,0 @@
----
-packages:
-  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
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
-...

.test/esphome_idf53_core.yaml

@@ -1,14 +0,0 @@
----
-packages:
-  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
-
-esp32:
-  framework:
-    type: esp-idf
-    version: 5.3.1
-    platform_version: 6.9.0
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
-...

.test/esphome_idf53_hw_relays.yaml

@@ -1,15 +0,0 @@
----
-packages:
-  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
-  standard_hw_relays_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_relays.yaml
-
-esp32:
-  framework:
-    type: esp-idf
-    version: 5.3.1
-    platform_version: 6.9.0
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
-...

.test/esphome_idf53_hw_speaker.yaml

@@ -1,15 +0,0 @@
----
-packages:
-  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
-  standard_hw_speaker_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_speaker.yaml
-
-esp32:
-  framework:
-    type: esp-idf
-    version: 5.3.1
-    platform_version: 6.9.0
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
-...

.test/esphome_idf53_hw_vibration.yaml

@@ -1,15 +0,0 @@
----
-packages:
-  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
-  standard_hw_vibration_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_vibration.yaml
-
-esp32:
-  framework:
-    type: esp-idf
-    version: 5.3.1
-    platform_version: 6.9.0
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
-...

.test/esphome_idf_basic.yaml

@@ -1,13 +1,6 @@
 ---
 packages:
+  common_idf: !include common_idf.yaml
   core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
   standard_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml
-
-esp32:
-  framework:
-    type: esp-idf
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...

.test/esphome_idf_ble_proxy.yaml

@@ -1,14 +1,8 @@
 ---
 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
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
+bluetooth_proxy:
 ...

.test/esphome_idf_core.yaml

@@ -1,12 +1,5 @@
 ---
 packages:
+  common_idf: !include common_idf.yaml
   core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
-
-esp32:
-  framework:
-    type: esp-idf
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...

.test/esphome_idf_hw_relays.yaml

@@ -1,13 +1,6 @@
 ---
 packages:
+  common_idf: !include common_idf.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
-
-esp32:
-  framework:
-    type: esp-idf
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...

.test/esphome_idf_hw_speaker.yaml

@@ -1,13 +1,6 @@
 ---
 packages:
+  common_idf: !include common_idf.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
-
-esp32:
-  framework:
-    type: esp-idf
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...

.test/esphome_idf_hw_vibration.yaml

@@ -1,13 +1,6 @@
 ---
 packages:
+  common_idf: !include common_idf.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
-
-esp32:
-  framework:
-    type: esp-idf
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...

ESPHome/TX-Ultimate-Easy-ESPHome.yaml

@@ -2,7 +2,7 @@
 #####                              TX Ultimate Easy for ESPHome                                #####
 #####                  Repository: https://github.com/edwardtfn/TX-Ultimate-Easy               #####
 ####################################################################################################
-##### Purpose: ESPHome Core - Hardware - Media player                                          #####
+##### Purpose: ESPHome Basic (includes core plus non-essential, but recommended packages)      #####
 ####################################################################################################
 ##### Author: edwardtfn - https://github.com/edwardtfn - https://buymeacoffee.com/edwardfirmo  #####
 ####################################################################################################
@@ -11,19 +11,9 @@
 ##### - For normal system use, modifications to this file are NOT required.                    #####
 ####################################################################################################
 ---
-i2s_audio:
-  id: if_i2s_audio
-  i2s_bclk_pin: GPIO2
-  i2s_lrclk_pin: GPIO4
-
-media_player:
-  - id: mp_media_player
-    name: Media Player
-    internal: false
-    platform: i2s_audio
-    i2s_dout_pin: GPIO15
-    i2s_audio_id: if_i2s_audio
-    i2s_comm_fmt: msb  # Experimental - It was 'lsb' until v2024.12.12
-    dac_type: external
-    mode: mono
+packages:
+  # yamllint disable rule:colons
+  core:     !include TX-Ultimate-Easy-ESPHome_core.yaml
+  standard: !include TX-Ultimate-Easy-ESPHome_standard.yaml
+  # yamllint enable rule:colons
 ...

ESPHome/TX-Ultimate-Easy-ESPHome_addon_ble_proxy.yaml

@@ -2,32 +2,22 @@
 #####                              TX Ultimate Easy for ESPHome                                #####
 #####                  Repository: https://github.com/edwardtfn/TX-Ultimate-Easy               #####
 ####################################################################################################
-##### Purpose: ESPHome Core - Add-on - BLE Proxy                                               #####
+##### Purpose: ESPHome Core - Add-on - BLE Proxy (REMOVED)                                     #####
 ####################################################################################################
 ##### Author: edwardtfn - https://github.com/edwardtfn - https://buymeacoffee.com/edwardfirmo  #####
 ####################################################################################################
-##### NOTE:                                                                                    #####
-##### - Make changes ONLY if absolutely necessary and you have the required knowledge.         #####
-##### - For normal system use, modifications to this file are NOT required.                    #####
+##### REMOVAL NOTICE:                                                                          #####
+##### This package has been removed. Please update your configuration.                        #####
+##### Add BLE proxy functionality directly in your YAML configuration instead:                #####
+#####   bluetooth_proxy:                                                                       #####
 ####################################################################################################
 ---
-bluetooth_proxy:
-
-esphome:
-  platformio_options:
-    build_flags:
-      - -D TX_ULTIMATE_EASY_ADDON_BLE_PROXY
-
+# Trigger the error at compile time
 script:
-  - id: !extend dump_config_list_packages
+  - id: force_compilation_error
     then:
-      - script.wait: dump_config
       - lambda: |-
-          // Check for requirements
-          #if !defined(TX_ULTIMATE_EASY_CORE)
-            #error "The package TX-Ultimate-Easy-ESPHome_core.yaml is required."
-          #endif
-
-          // Identify itself
-          ESP_LOGCONFIG(ESPHOME_PROJECT_NAME, "  - Add-on - BLE Proxy");
+          #error "The package TX-Ultimate-Easy-ESPHome_addon_ble_proxy.yaml has been removed." \
+                 "Please remove this package from your configuration and add" \
+                 "'bluetooth_proxy:' directly to your YAML instead."
 ...

ESPHome/TX-Ultimate-Easy-ESPHome_addon_media_player.yaml

@@ -1,68 +0,0 @@
-####################################################################################################
-#####                              TX Ultimate Easy for ESPHome                                #####
-#####                  Repository: https://github.com/edwardtfn/TX-Ultimate-Easy               #####
-####################################################################################################
-##### Purpose: ESPHome - Add-on - Media player                                                 #####
-####################################################################################################
-##### Author: edwardtfn - https://github.com/edwardtfn - https://buymeacoffee.com/edwardfirmo  #####
-####################################################################################################
-##### NOTE:                                                                                    #####
-##### - Make changes ONLY if absolutely necessary and you have the required knowledge.         #####
-##### - For normal system use, modifications to this file are NOT required.                    #####
-####################################################################################################
----
-packages:
-  standard_hw_audio: !include TX-Ultimate-Easy-ESPHome_standard_hw_audio.yaml
-
-esp32:
-  framework:
-    type: arduino
-
-esphome:
-  platformio_options:
-    build_flags:
-      - -D TX_ULTIMATE_EASY_ADDON_MEDIA_PLAYER
-
-media_player:
-  - id: mp_media_player
-    name: Media Player
-    internal: false
-    platform: i2s_audio
-    i2s_dout_pin: GPIO15
-    i2s_audio_id: if_i2s_audio
-    i2s_comm_fmt: msb
-    dac_type: external
-    mode: mono
-    mute_pin:
-      number: GPIO26
-      inverted: true
-      allow_other_uses: true
-
-script:
-  - id: !extend dump_config_list_packages
-    then:
-      - script.wait: dump_config
-      - lambda: |-
-          // Check for requirements
-          #if !defined(TX_ULTIMATE_EASY_CORE)
-            #error "The package TX-Ultimate-Easy-ESPHome_core.yaml is required."
-          #endif
-          #if !defined(TX_ULTIMATE_EASY_STANDARD_HW_AUDIO)
-            #error "The package TX-Ultimate-Easy-ESPHome_standard_hw_audio.yaml is required."
-          #endif
-
-          // Identify itself
-          ESP_LOGCONFIG(ESPHOME_PROJECT_NAME, "  - Add-on - Media Player");
-
-switch:
-  - id: sw_speaker_amplifier
-    name: Speaker - Amplifier
-    platform: gpio
-    pin:
-      number: GPIO26
-      inverted: true
-      allow_other_uses: true
-    restore_mode: RESTORE_DEFAULT_ON
-    internal: true
-    entity_category: config
-...

ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml

@@ -11,312 +11,11 @@
 ##### - For normal system use, modifications to this file are NOT required.                    #####
 ####################################################################################################
 ---
-substitutions:
-  name: tx-ultimate-easy
-  friendly_name: TX Ultimate Easy
-
-  <<: !include ../versioning/VERSION_YAML
-
-  TX_MODEL_FORMAT_EU_TEXT: "EU (Square, T5-xC-86)"
-  TX_MODEL_FORMAT_US_TEXT: "US (Rectangle, T5-xC-120)"
-
-  TX_MODEL_1_GANG_TEXT: "1 Gang"
-  TX_MODEL_2_GANG_TEXT: "2 Gang"
-  TX_MODEL_3_GANG_TEXT: "3 Gang"
-  TX_MODEL_4_GANG_TEXT: "4 Gang"
-
-  DUMP_CONFIG_CALLER_DELAY: 10s  # Delay to dump config after requested
-
 packages:
   # yamllint disable rule:colons
+  core_common:     !include TX-Ultimate-Easy-ESPHome_core_common.yaml
   core_hw_buttons: !include TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml
   core_hw_leds:    !include TX-Ultimate-Easy-ESPHome_core_hw_leds.yaml
   core_hw_touch:   !include TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml
   # yamllint enable rule:colons
-
-api:
-  id: api_server
-  on_client_connected:
-    then:
-      - script.execute: dump_config_caller
-      - script.execute: publish_device_info
-
-binary_sensor:
-  - id: bs_pending_restart
-    name: Pending Restart Status
-    internal: false
-    disabled_by_default: false
-    platform: template
-    entity_category: diagnostic
-    device_class: problem
-    on_state:
-      then:
-        - lambda: |-
-            if (x)
-              ESP_LOGW("core", "Pending restart: YES");
-            else
-              ESP_LOGCONFIG("core", "Pending restart: No");
-        - script.execute: dump_config_caller
-
-esp32:
-  board: esp32dev  # adafruit_feather_esp32_v2  # esp32dev
-  flash_size: 8MB
-  framework:
-    type: esp-idf
-
-esphome:
-  name: ${name}
-  friendly_name: ${friendly_name}
-  comment: TX Ultimate Easy
-  project:
-    name: "edwardtfn.tx_ultimate_easy"
-    version: ${version}
-  platformio_options:
-    build_flags:
-      - -D TX_ULTIMATE_EASY_CORE
-
-  on_boot:
-    - priority: 700
-      then:
-        - script.execute: boot_initialize
-
-    - priority: 600  # This is where most sensors are set up.
-      then:
-        - script.execute: boot_sequence
-
-    - priority: -100  # At this priority, pretty much everything should already be initialized.
-      then:
-        - script.execute: boot_done
-
-globals:
-  - id: is_us_model
-    type: bool
-    restore_value: true
-    initial_value: 'false'
-
-  - id: gang_count
-    type: uint8_t
-    restore_value: true
-    initial_value: '0'
-
-  - id: gang_count_plural_suffix
-    type: std::string
-    restore_value: true
-    max_restore_data_length: 3
-    # initial_value: "''"
-
-logger:
-  level: DEBUG
-
-ota:
-  platform: esphome
-
-psram:
-  mode: octal
-  speed: 80MHz
-
-script:
-  - id: api_send_ha_event_boot
-    mode: queued
-    parameters:
-      type: string
-    then:
-      - homeassistant.event:
-          event: esphome.tx_ultimate_easy
-          data:
-            device_name: !lambda return tx_device_name->state.c_str();
-            firmware: ${version}
-            domain: boot
-            type: !lambda return type.c_str();
-
-  - id: boot_done
-    mode: restart
-    then:
-      - script.execute:
-          id: api_send_ha_event_boot
-          type: done
-
-  - id: boot_initialize
-    mode: restart
-    then:
-      # Extended by:
-      #   - HW Buttons
-      #   - HW Relays
-      #   - HW Touch
-      - script.execute:
-          id: api_send_ha_event_boot
-          type: start
-      - wait_until:
-          condition:
-            - lambda: return sl_tx_model_format->active_index().has_value();
-            - lambda: return sl_tx_model_gang->active_index().has_value();
-      - lambda: |-
-          id(is_us_model) = (sl_tx_model_format->state == "${TX_MODEL_FORMAT_US_TEXT}");
-          id(gang_count) = sl_tx_model_gang->active_index().value() + 1;
-          if (id(gang_count) < 1 || id(gang_count) > 4) {
-            ESP_LOGE("core_hw_leds", "Invalid number of gangs: %" PRIu8, id(gang_count));
-          }
-          id(gang_count_plural_suffix) = id(gang_count) > 1 ? "s" : "";
-
-  - id: boot_sequence
-    mode: restart
-    then:
-      - script.execute: publish_device_info
-      - binary_sensor.template.publish:
-          id: bs_pending_restart
-          state: false
-
-  - id: dump_config
-    mode: restart
-    then:
-      # Extended by all modules
-      - lambda: |-
-          // Device identification
-          ESP_LOGCONFIG("core", "Device friendly name: ${friendly_name}");
-          ESP_LOGCONFIG("core", "Device name: ${name}");
-          ESP_LOGCONFIG("core", "Device name (HA): %s", tx_device_name->state.c_str());
-          ESP_LOGCONFIG("core", "Device hostname: %s", App.get_name().c_str());
-
-          dump_config_versions->execute();
-
-          // Framework detection
-          #ifdef USE_ARDUINO
-          ESP_LOGCONFIG("core", "Framework: Arduino");
-          #elif defined(USE_ESP_IDF)
-          ESP_LOGCONFIG("core", "Framework: ESP-IDF");
-          #else
-          ESP_LOGW("core", "Framework: UNKNOWN");
-          #endif
-
-          // Model configuration
-          ESP_LOGCONFIG("core", "Model format (selected): %s", sl_tx_model_format->state.c_str());
-          ESP_LOGCONFIG("core", "Model format (detected): %s", id(is_us_model) ? "US" : "EU");
-          ESP_LOGCONFIG("core", "Gangs (selected): %s", sl_tx_model_gang->state.c_str());
-          ESP_LOGCONFIG("core", "Gangs (detected): %" PRIu8 "-Gang%s", id(gang_count), id(gang_count_plural_suffix).c_str());
-
-          // System state
-          if (bs_pending_restart->state)
-            ESP_LOGW("core", "Pending restart: YES");
-          else
-            ESP_LOGCONFIG("core", "Pending restart: No");
-
-  - id: dump_config_caller
-    mode: restart
-    then:
-      - delay: ${DUMP_CONFIG_CALLER_DELAY}
-      - script.execute: dump_config
-      - script.wait: dump_config
-      - script.execute: dump_config_list_packages
-
-  - id: dump_config_list_packages
-    mode: restart
-    then:
-      - script.wait: dump_config
-      - lambda: |-
-          ESP_LOGCONFIG(ESPHOME_PROJECT_NAME, "Installed packages:");
-
-          // Identify itself
-          ESP_LOGCONFIG(ESPHOME_PROJECT_NAME, "  - Core");
-
-  - id: dump_config_versions
-    mode: restart
-    then:
-      - lambda: |-
-          // Version information
-          ESP_LOGCONFIG("core", "TX Ultimate firmware version: ${version}");
-
-  - id: publish_device_info
-    mode: restart
-    then:
-      - lambda: |-
-          tx_fw_version->publish_state("${version}");
-          tx_device_name->publish_state(App.get_name().c_str());
-
-select:
-  - id: sl_tx_model_format
-    name: Model (Format)
-    platform: template
-    options:
-      - "${TX_MODEL_FORMAT_EU_TEXT}"
-      - "${TX_MODEL_FORMAT_US_TEXT}"
-    initial_option: "${TX_MODEL_FORMAT_EU_TEXT}"
-    optimistic: true
-    restore_value: true
-    internal: false
-    entity_category: config
-    disabled_by_default: false
-    icon: mdi:tablet-cellphone
-    on_value:
-      then:
-        - binary_sensor.template.publish:
-            id: bs_pending_restart
-            state: true
-        - lambda: |-
-            id(is_us_model) = (x == "${TX_MODEL_FORMAT_US_TEXT}");
-            ESP_LOGI("core", "New model selected: %s", id(is_us_model) ? "US" : "EU");
-
-  - id: sl_tx_model_gang
-    name: Model (Gang)
-    platform: template
-    options:
-      - "${TX_MODEL_1_GANG_TEXT}"
-      - "${TX_MODEL_2_GANG_TEXT}"
-      - "${TX_MODEL_3_GANG_TEXT}"
-      - "${TX_MODEL_4_GANG_TEXT}"
-    initial_option: "${TX_MODEL_1_GANG_TEXT}"
-    optimistic: true
-    restore_value: true
-    internal: false
-    entity_category: config
-    disabled_by_default: false
-    icon: mdi:dip-switch
-    on_value:
-      then:
-        - binary_sensor.template.publish:
-            id: bs_pending_restart
-            state: true
-        - lambda: |-
-            id(gang_count) = static_cast<uint8_t>(i) + 1;
-            ESP_LOGI("core", "New model selected: %" PRIu8 "-%s", id(gang_count), id(gang_count) > 1 ? "Gangs" : "Gang");
-            tx_ultimate->set_gang_count(id(gang_count));
-
-text_sensor:
-  - id: tx_fw_version
-    name: TX Ultimate Easy Firmware Version
-    platform: template
-    entity_category: diagnostic
-    icon: mdi:tag-text-outline
-    internal: false
-    update_interval: never
-    lambda: |-
-      return {"${version}"};
-
-  - id: tx_device_name
-    name: Device Name
-    platform: template
-    icon: mdi:identifier
-    entity_category: diagnostic
-    internal: false
-    disabled_by_default: false
-    update_interval: never
-    lambda: |-
-      return {"${name}"};
-    filters:
-      - lambda: |-
-          const std::string raw_name = x;
-          std::string result;
-          bool last_was_underscore = false;
-          for (const char& c : raw_name) {
-            if (isalnum(c)) {
-              result += tolower(c);  // Add alphanumeric characters as lowercase
-              last_was_underscore = false;
-            } else if (!last_was_underscore) {  // Replace non-alphanumeric with '_' but avoid consecutive '_'
-              result += '_';
-              last_was_underscore = true;
-            }
-          }
-          return result;
-
-wifi:
-  id: wifi_component
 ...

ESPHome/TX-Ultimate-Easy-ESPHome_core_common.yaml

@@ -0,0 +1,319 @@
+####################################################################################################
+#####                              TX Ultimate Easy for ESPHome                                #####
+#####                  Repository: https://github.com/edwardtfn/TX-Ultimate-Easy               #####
+####################################################################################################
+##### Purpose: ESPHome Core - Common                                                           #####
+####################################################################################################
+##### Author: edwardtfn - https://github.com/edwardtfn - https://buymeacoffee.com/edwardfirmo  #####
+####################################################################################################
+##### NOTE:                                                                                    #####
+##### - Make changes ONLY if absolutely necessary and you have the required knowledge.         #####
+##### - For normal system use, modifications to this file are NOT required.                    #####
+####################################################################################################
+---
+substitutions:
+  name: tx-ultimate-easy
+  friendly_name: TX Ultimate Easy
+
+  <<: !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)"
+
+  TX_MODEL_1_GANG_TEXT: "1 Gang"
+  TX_MODEL_2_GANG_TEXT: "2 Gang"
+  TX_MODEL_3_GANG_TEXT: "3 Gang"
+  TX_MODEL_4_GANG_TEXT: "4 Gang"
+
+  DUMP_CONFIG_CALLER_DELAY: 10s  # Delay to dump config after requested
+
+api:
+  id: api_server
+  on_client_connected:
+    then:
+      - script.execute: dump_config_caller
+      - script.execute: publish_device_info
+
+binary_sensor:
+  - id: bs_pending_restart
+    name: Pending Restart Status
+    internal: false
+    disabled_by_default: false
+    platform: template
+    entity_category: diagnostic
+    device_class: problem
+    on_state:
+      then:
+        - lambda: |-
+            if (x)
+              ESP_LOGW("core", "Pending restart: YES");
+            else
+              ESP_LOGCONFIG("core", "Pending restart: No");
+        - script.execute: dump_config_caller
+
+button:
+  - id: bt_restart
+    name: Restart
+    internal: false
+    platform: restart
+
+esp32:
+  board: esp32dev
+  flash_size: 8MB
+  framework:
+    type: esp-idf
+
+esphome:
+  name: ${name}
+  friendly_name: ${friendly_name}
+  comment: TX Ultimate Easy
+  project:
+    name: "edwardtfn.tx_ultimate_easy"
+    version: ${version}
+  platformio_options:
+    build_flags:
+      - -D TX_ULTIMATE_EASY_CORE
+
+  on_boot:
+    - priority: 700
+      then:
+        - script.execute: boot_initialize
+
+    - priority: 600  # This is where most sensors are set up.
+      then:
+        - script.execute: boot_sequence
+
+    - priority: -100  # At this priority, pretty much everything should already be initialized.
+      then:
+        - script.execute: boot_done
+
+globals:
+  - id: is_us_model
+    type: bool
+    restore_value: true
+    initial_value: 'false'
+
+  - id: gang_count
+    type: uint8_t
+    restore_value: true
+    initial_value: '0'
+
+logger:
+  level: DEBUG
+
+ota:
+  platform: esphome
+
+psram:
+
+script:
+  - id: api_send_ha_event_boot
+    mode: queued
+    parameters:
+      type: string
+    then:
+      - 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", "boot"},
+            {"type", type.c_str()}
+          });
+
+  - id: boot_done
+    mode: restart
+    then:
+      - script.execute:
+          id: api_send_ha_event_boot
+          type: done
+
+  - id: boot_initialize
+    mode: restart
+    then:
+      # Extended by:
+      #   - HW Buttons
+      #   - HW Relays
+      #   - HW Touch
+      - script.execute:
+          id: api_send_ha_event_boot
+          type: start
+      - wait_until:
+          condition:
+            - lambda: return sl_tx_model_format->active_index().has_value();
+            - lambda: return sl_tx_model_gang->active_index().has_value();
+      - lambda: |-
+          id(is_us_model) = (sl_tx_model_format->state == "${TX_MODEL_FORMAT_US_TEXT}");
+          id(gang_count) = sl_tx_model_gang->active_index().value() + 1;
+          if (id(gang_count) < 1 || id(gang_count) > 4) {
+            ESP_LOGE("core_hw_leds", "Invalid number of gangs: %" PRIu8, id(gang_count));
+          }
+
+  - id: boot_sequence
+    mode: restart
+    then:
+      - script.execute: publish_device_info
+      - binary_sensor.template.publish:
+          id: bs_pending_restart
+          state: false
+
+  - id: dump_config
+    mode: restart
+    then:
+      # Extended by all modules
+      - lambda: |-
+          // Device identification
+          ESP_LOGCONFIG("core", "Device friendly name: ${friendly_name}");
+          ESP_LOGCONFIG("core", "Device name: ${name}");
+          ESP_LOGCONFIG("core", "Device name (HA): %s", tx_device_name->state.c_str());
+          ESP_LOGCONFIG("core", "Device hostname: %s", App.get_name().c_str());
+
+          dump_config_versions->execute();
+
+          // Framework detection
+          #ifdef USE_ARDUINO
+          ESP_LOGCONFIG("core", "Framework: Arduino");
+          #elif defined(USE_ESP_IDF)
+          ESP_LOGCONFIG("core", "Framework: ESP-IDF");
+          #else
+          ESP_LOGW("core", "Framework: UNKNOWN");
+          #endif
+
+          // Model configuration
+          ESP_LOGCONFIG("core", "Model format (selected): %s", sl_tx_model_format->state.c_str());
+          ESP_LOGCONFIG("core", "Model format (detected): %s", id(is_us_model) ? "US" : "EU");
+          ESP_LOGCONFIG("core", "Gangs (selected): %s", sl_tx_model_gang->state.c_str());
+          ESP_LOGCONFIG("core", "Gangs (detected): %" PRIu8 "-Gang%s", id(gang_count), id(gang_count) > 1 ? "s" : "");
+
+          // System state
+          if (bs_pending_restart->state)
+            ESP_LOGW("core", "Pending restart: YES");
+          else
+            ESP_LOGCONFIG("core", "Pending restart: No");
+
+  - id: dump_config_caller
+    mode: restart
+    then:
+      - delay: ${DUMP_CONFIG_CALLER_DELAY}
+      - script.execute: dump_config
+      - script.wait: dump_config
+      - script.execute: dump_config_list_packages
+
+  - id: dump_config_list_packages
+    mode: restart
+    then:
+      - script.wait: dump_config
+      - lambda: |-
+          ESP_LOGCONFIG(ESPHOME_PROJECT_NAME, "Installed packages:");
+
+          // Identify itself
+          ESP_LOGCONFIG(ESPHOME_PROJECT_NAME, "  - Core");
+
+  - id: dump_config_versions
+    mode: restart
+    then:
+      - lambda: |-
+          // Version information
+          ESP_LOGCONFIG("core", "TX Ultimate firmware version: ${version}");
+          // ESPHome builder information
+          ESP_LOGCONFIG("core", "ESPHome builder: " ESPHOME_VERSION);
+          ESP_LOGCONFIG("core", "ESPHome build timestamp: %s", App.get_compilation_time().c_str());
+
+  - id: publish_device_info
+    mode: restart
+    then:
+      - lambda: |-
+          tx_fw_version->publish_state("${version}");
+          tx_device_name->publish_state(App.get_name().c_str());
+
+select:
+  - id: sl_tx_model_format
+    name: Model (Format)
+    platform: template
+    options:
+      - "${TX_MODEL_FORMAT_EU_TEXT}"
+      - "${TX_MODEL_FORMAT_US_TEXT}"
+    initial_option: "${TX_MODEL_FORMAT_EU_TEXT}"
+    optimistic: true
+    restore_value: true
+    internal: false
+    entity_category: config
+    disabled_by_default: false
+    icon: mdi:tablet-cellphone
+    on_value:
+      then:
+        - binary_sensor.template.publish:
+            id: bs_pending_restart
+            state: true
+        - lambda: |-
+            id(is_us_model) = (x == "${TX_MODEL_FORMAT_US_TEXT}");
+            ESP_LOGI("core", "New model selected: %s", id(is_us_model) ? "US" : "EU");
+
+  - id: sl_tx_model_gang
+    name: Model (Gang)
+    platform: template
+    options:
+      - "${TX_MODEL_1_GANG_TEXT}"
+      - "${TX_MODEL_2_GANG_TEXT}"
+      - "${TX_MODEL_3_GANG_TEXT}"
+      - "${TX_MODEL_4_GANG_TEXT}"
+    initial_option: "${TX_MODEL_1_GANG_TEXT}"
+    optimistic: true
+    restore_value: true
+    internal: false
+    entity_category: config
+    disabled_by_default: false
+    icon: mdi:dip-switch
+    on_value:
+      then:
+        - binary_sensor.template.publish:
+            id: bs_pending_restart
+            state: true
+        - lambda: |-
+            id(gang_count) = static_cast<uint8_t>(i) + 1;
+            ESP_LOGI("core", "New model selected: %" PRIu8 "-%s", id(gang_count), id(gang_count) > 1 ? "Gangs" : "Gang");
+            tx_ultimate->set_gang_count(id(gang_count));
+
+text_sensor:
+  - id: tx_fw_version
+    name: TX Ultimate Easy Firmware Version
+    platform: template
+    entity_category: diagnostic
+    icon: mdi:tag-text-outline
+    internal: false
+    update_interval: never
+    lambda: |-
+      return {"${version}"};
+
+  - id: tx_device_name
+    name: Device Name
+    platform: template
+    icon: mdi:identifier
+    entity_category: diagnostic
+    internal: false
+    disabled_by_default: false
+    update_interval: never
+    lambda: |-
+      return {"${name}"};
+    filters:
+      - lambda: |-
+          const std::string raw_name = x;
+          std::string result;
+          bool last_was_underscore = false;
+          for (const char& c : raw_name) {
+            if (isalnum(c)) {
+              result += tolower(c);  // Add alphanumeric characters as lowercase
+              last_was_underscore = false;
+            } else if (!last_was_underscore) {  // Replace non-alphanumeric with '_' but avoid consecutive '_'
+              result += '_';
+              last_was_underscore = true;
+            }
+          }
+          return result;
+
+wifi:
+  id: wifi_component
+...

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) {
@@ -208,10 +209,11 @@ script:
   - id: !extend dump_config
     then:
       - lambda: |-
+          std::string gang_count_plural_suffix = id(gang_count) > 1 ? "s" : "";
           // Button's actions
           ESP_LOGCONFIG("core_hw_buttons", "Button%s action%s:",
-                        id(gang_count_plural_suffix).c_str(),
-                        id(gang_count_plural_suffix).c_str());
+                        gang_count_plural_suffix.c_str(),
+                        gang_count_plural_suffix.c_str());
           ESP_LOGCONFIG("core_hw_buttons", "  Relay 1: %s", sl_button_1_action->has_state()
                                                               ? sl_button_1_action->state.c_str()
                                                               : "Unknown");

ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_leds.yaml

@@ -47,20 +47,22 @@ light:
   - id: light_full
     name: Light - All
     internal: true
-    platform: esp32_rmt_led_strip
-    rgb_order: GRB
-    rmt_channel: 1
-    chipset: ws2812
     num_leds: 32
     pin: GPIO13
     restore_mode: ${LIGHT_FULL_RESTORE_MODE}
+    platform: esp32_rmt_led_strip
+    rgb_order: GRB
+    chipset: ws2812
     max_refresh_rate: 33ms
-    use_psram: true
+    use_psram: false
+    # platform: neopixelbus
+    # type: GRB
+    # 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
@@ -68,8 +70,10 @@ light:
     effects:
       - addressable_rainbow:
           name: "Rainbow"
+          width: 28
       - addressable_rainbow:
           name: "Rainbow - Fast"
+          width: 28
           speed: 50
       - pulse:
           name: "Pulse"
@@ -108,35 +112,82 @@ light:
         from: 0
         to: 27
 
-  - id: light_us
-    name: Light
-    <<: *light_partition_with_effects
+  - &light_partition_with_effects_us
+    id: light_us
+    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
-    <<: *light_partition_with_effects_disabled
+    name: Light - Left EU
+    <<: *light_partition_no_effects_disabled
     segments:
       - id: light_full
         from: 13
         to: 19
         reversed: true
   - id: light_eu_right
-    name: Light - Right
-    <<: *light_partition_with_effects_disabled
+    name: Light - Right EU
+    <<: *light_partition_no_effects_disabled
     segments:
       - id: light_full
         from: 27
@@ -147,32 +198,32 @@ light:
         to: 5
         reversed: false
   - id: light_eu_top
-    name: Light - Top
-    <<: *light_partition_with_effects_disabled
+    name: Light - Top EU
+    <<: *light_partition_no_effects_disabled
     segments:
       - id: light_full
         from: 20
         to: 26
         reversed: false
   - id: light_us_bottom
-    name: Light - Bottom
-    <<: *light_partition_with_effects_disabled
+    name: Light - Bottom US
+    <<: *light_partition_no_effects_disabled
     segments:
       - id: light_full
         from: 9
         to: 14
         reversed: true
   - id: light_us_left
-    name: Light - Left
-    <<: *light_partition_with_effects_disabled
+    name: Light - Left US
+    <<: *light_partition_no_effects_disabled
     segments:
       - id: light_full
         from: 15
         to: 24
         reversed: true
   - id: light_us_right
-    name: Light - Right
-    <<: *light_partition_with_effects_disabled
+    name: Light - Right US
+    <<: *light_partition_no_effects_disabled
     segments:
       - id: light_full
         from: 31
@@ -183,8 +234,8 @@ light:
         to: 8
         reversed: false
   - id: light_us_top
-    name: Light - Top
-    <<: *light_partition_with_effects_disabled
+    name: Light - Top US
+    <<: *light_partition_no_effects_disabled
     segments:
       - id: light_full
         from: 25
@@ -446,10 +497,11 @@ script:
   - id: !extend dump_config
     then:
       - lambda: |-
+          std::string gang_count_plural_suffix = id(gang_count) > 1 ? "s" : "";
           // Relay's LEDs modes
           ESP_LOGCONFIG("core_hw_leds", "Relay%s LEDs mode%s:",
-                        id(gang_count_plural_suffix).c_str(),
-                        id(gang_count_plural_suffix).c_str());
+                        gang_count_plural_suffix.c_str(),
+                        gang_count_plural_suffix.c_str());
           ESP_LOGCONFIG("core_hw_leds", "  Relay 1: %s", id(is_us_model)
                                                           ? sl_relay_1_light_mode_us->state.c_str()
                                                           : sl_relay_1_light_mode_eu->state.c_str());
@@ -570,7 +622,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}"
@@ -585,19 +637,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}"
@@ -612,12 +664,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

@@ -318,7 +318,7 @@ script:
       #   - HW Vibration
       - binary_sensor.template.publish:
           id: bs_multi_touch
-          state: OFF  # yamllint disable-line rule:truthy
+          state: ON  # yamllint disable-line rule:truthy
 
   - id: touch_on_press
     mode: restart
@@ -386,69 +386,85 @@ tx_ultimate_easy:
         }
 
   on_multi_touch_release:
-    - homeassistant.event:
-        event: esphome.tx_ultimate_easy
-        data:
-          device_name: !lambda return tx_device_name->state.c_str();
-          firmware: ${version}
-          domain: touch
-          type: multi_touch
-          action: release
-          position: !lambda return touch.x;
-    - lambda: ESP_LOGI("core_hw_touch", "Multi-touch released");
-    - script.execute: touch_on_multi_touch_release
+    then:
+      - homeassistant.event:
+          event: ${EVENT_NAME}
+          data:
+            device_name: !lambda return id(tx_device_name).state.c_str();
+            firmware: ${version}
+            domain: touch
+            type: multi_touch
+            action: release
+            position: !lambda return std::to_string(touch.x);
+      - lambda: |-
+          ESP_LOGI("core_hw_touch", "Multi-touch released");
+          touch_on_multi_touch_release->execute();
 
   on_press:
-    - lambda: |-
-        const uint8_t position = static_cast<uint8_t>(touch.x);
-        if (position > ${TOUCH_POSITION_MAX_VALUE}) {  // Check for valid range
-          ESP_LOGE("core_hw_touch", "Invalid touch position: %" PRIu8, position);
-        } else {
-          ESP_LOGI("core_hw_touch", "Pressed at position %" PRIu8, position);
-          touch_on_press->execute(static_cast<uint8_t>(touch.button), position);
-        }
+    then:
+      - lambda: |-
+          const uint8_t position = static_cast<uint8_t>(touch.x);
+          if (position > ${TOUCH_POSITION_MAX_VALUE}) {  // Check for valid range
+            ESP_LOGE("core_hw_touch", "Invalid touch position: %" PRIu8, position);
+          } else {
+            ESP_LOGI("core_hw_touch", "Pressed at position %" PRIu8, position);
+            touch_on_press->execute(static_cast<uint8_t>(touch.button), position);
+          }
 
   on_release:
-    - lambda: ESP_LOGI("core_hw_touch", "Released");
-    - script.execute: touch_on_release
+    then:
+      - lambda: ESP_LOGI("core_hw_touch", "Released");
+      - script.execute: touch_on_release
 
   on_swipe_left:
-    - homeassistant.event:
-        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}"
-                                                  ? "left"
-                                                  : "down");
-    - script.execute: touch_swipe_left
+    then:
+      - homeassistant.event:
+          event: ${EVENT_NAME}
+          data:
+            device_name: !lambda return id(tx_device_name).state.c_str();
+            firmware: ${version}
+            domain: touch
+            type: swipe
+            action: !lambda |-
+              if (sl_tx_model_format->state == "${TX_MODEL_FORMAT_EU_TEXT}")
+                return "left";
+              else
+                return "down";
+            swipe-direction: !lambda |-
+              if (sl_tx_model_format->state == "${TX_MODEL_FORMAT_EU_TEXT}")
+                return "left";
+              else
+                return "down";
+            position: !lambda return std::to_string(touch.x);
+      - lambda: |-
+          ESP_LOGI("core_hw_touch", "Swipe %s",
+                    (sl_tx_model_format->state == "${TX_MODEL_FORMAT_EU_TEXT}") ? "left" : "down");
+          touch_swipe_left->execute();
 
   on_swipe_right:
-    - homeassistant.event:
-        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}"
-                                                  ? "right"
-                                                  : "up");
-    - script.execute: touch_swipe_right
+    then:
+      - homeassistant.event:
+          event: ${EVENT_NAME}
+          data:
+            device_name: !lambda return id(tx_device_name).state.c_str();
+            firmware: ${version}
+            domain: touch
+            type: swipe
+            action: !lambda |-
+              if (sl_tx_model_format->state == "${TX_MODEL_FORMAT_EU_TEXT}")
+                return "right";
+              else
+                return "up";
+            swipe-direction: !lambda |-
+              if (sl_tx_model_format->state == "${TX_MODEL_FORMAT_EU_TEXT}")
+                return "right";
+              else
+                return "up";
+            position: !lambda return std::to_string(touch.x);
+      - lambda: |-
+          ESP_LOGI("core_hw_touch", "Swipe %s",
+                    (sl_tx_model_format->state == "${TX_MODEL_FORMAT_EU_TEXT}") ? "right" : "up");
+          touch_swipe_right->execute();
 
   on_touch_event:
     - lambda: |-

ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml

@@ -13,60 +13,8 @@
 ---
 packages:
   # yamllint disable rule:colons
-  core_hw_relays:    !include TX-Ultimate-Easy-ESPHome_standard_hw_relays.yaml
-  core_hw_speaker:   !include TX-Ultimate-Easy-ESPHome_standard_hw_speaker.yaml
-  core_hw_vibration: !include TX-Ultimate-Easy-ESPHome_standard_hw_vibration.yaml
+  standard_hw_relays:    !include TX-Ultimate-Easy-ESPHome_standard_hw_relays.yaml
+  standard_hw_vibration: !include TX-Ultimate-Easy-ESPHome_standard_hw_vibration.yaml
+  standard_media_player: !include TX-Ultimate-Easy-ESPHome_standard_media_player.yaml
   # yamllint enable rule:colons
-
-button:
-  - id: bt_restart
-    name: Restart
-    internal: false
-    platform: restart
-
-captive_portal:
-  id: ap_captive_portal
-
-esphome:
-  platformio_options:
-    build_flags:
-      - -D TX_ULTIMATE_EASY_STANDARD
-
-script:
-  - id: !extend dump_config_list_packages
-    then:
-      - script.wait: dump_config
-      - lambda: |-
-          // Check for requirements
-          #if !defined(TX_ULTIMATE_EASY_CORE)
-            #error "The package TX-Ultimate-Easy-ESPHome_core.yaml is required."
-          #endif
-
-          // Identify itself
-          ESP_LOGCONFIG(ESPHOME_PROJECT_NAME, "  - Standard");
-
-  - id: !extend dump_config_versions
-    then:
-      - lambda: |-
-          // Version information
-          ESP_LOGCONFIG("standard", "ESPHome builder: %s", esphome_fw_version->state.c_str());
-
-improv_serial:
-  id: serial_improv
-
-text_sensor:
-  - id: esphome_fw_version
-    name: ESPHome Version
-    platform: version
-    entity_category: diagnostic
-    internal: false
-
-time:
-  - id: time_source
-    platform: homeassistant
-
-web_server:
-
-wifi:
-  ap:
 ...

ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_audio.yaml

@@ -11,15 +11,18 @@
 ##### - For normal system use, modifications to this file are NOT required.                    #####
 ####################################################################################################
 ---
+substitutions:
+  SWITCH_AUDIO_AMPLIFIER_RESTORE_MODE: RESTORE_DEFAULT_ON
+
 esphome:
   platformio_options:
     build_flags:
       - -D TX_ULTIMATE_EASY_STANDARD_HW_AUDIO
 
 i2s_audio:
-  id: if_i2s_audio
-  i2s_bclk_pin: GPIO2
-  i2s_lrclk_pin: GPIO4
+  - id: if_i2s_audio
+    i2s_bclk_pin: GPIO2
+    i2s_lrclk_pin: GPIO4
 
 script:
   - id: !extend dump_config_list_packages
@@ -33,4 +36,15 @@ script:
 
           // Identify itself
           ESP_LOGCONFIG(ESPHOME_PROJECT_NAME, "  - Standard - Hardware - Audio");
+
+switch:
+  - id: sw_audio_amplifier
+    name: Audio Amplifier
+    platform: gpio
+    pin:
+      number: GPIO26
+      inverted: false
+    restore_mode: ${SWITCH_AUDIO_AMPLIFIER_RESTORE_MODE}
+    internal: true
+    entity_category: config
 ...

ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_relays.yaml

@@ -703,10 +703,11 @@ script:
   - id: !extend dump_config
     then:
       - lambda: |-
+          std::string gang_count_plural_suffix = id(gang_count) > 1 ? "s" : "";
           // Relay's modes
           ESP_LOGCONFIG("standard_hw_relays", "Relay%s mode%s:",
-                        id(gang_count_plural_suffix).c_str(),
-                        id(gang_count_plural_suffix).c_str());
+                        gang_count_plural_suffix.c_str(),
+                        gang_count_plural_suffix.c_str());
           ESP_LOGCONFIG("standard_hw_relays", "  Relay 1: %s", sl_relay_1_mode->has_state()
                                                             ? sl_relay_1_mode->state.c_str()
                                                             : "Unknown");
@@ -725,8 +726,8 @@ script:
 
           // Relay's states
           ESP_LOGCONFIG("standard_hw_relays", "Relay%s state%s:",
-                        id(gang_count_plural_suffix).c_str(),
-                        id(gang_count_plural_suffix).c_str());
+                        gang_count_plural_suffix.c_str(),
+                        gang_count_plural_suffix.c_str());
           ESP_LOGCONFIG("standard_hw_relays", "  Relay 1: %s", sw_relay_1->state ? "ON" : "OFF");
           if (id(gang_count) >= 2)
             ESP_LOGCONFIG("standard_hw_relays", "  Relay 2: %s", sw_relay_2->state ? "ON" : "OFF");

ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_speaker.yaml

@@ -38,11 +38,11 @@ api:
 esphome:
   platformio_options:
     build_flags:
-      - -D TX_ULTIMATE_EASY_STANDARD_SPEAKER
+      - -D TX_ULTIMATE_EASY_STANDARD_HW_SPEAKER
 
 number:
   - id: speaker_volume
-    name: Sound - Volume
+    name: Speaker Volume
     platform: template
     max_value: 100
     min_value: 0
@@ -179,4 +179,8 @@ speaker:
     i2s_audio_id: if_i2s_audio
     i2s_comm_fmt: stand_msb
     channel: mono
+    timeout: never
+    bits_per_sample: 16bit
+    sample_rate: 48000
+    buffer_duration: 500ms
 ...

ESPHome/TX-Ultimate-Easy-ESPHome_standard_media_player.yaml

@@ -0,0 +1,112 @@
+####################################################################################################
+#####                              TX Ultimate Easy for ESPHome                                #####
+#####                  Repository: https://github.com/edwardtfn/TX-Ultimate-Easy               #####
+####################################################################################################
+##### Purpose: ESPHome - Add-on - Media player                                                 #####
+####################################################################################################
+##### Author: edwardtfn - https://github.com/edwardtfn - https://buymeacoffee.com/edwardfirmo  #####
+####################################################################################################
+##### NOTE:                                                                                    #####
+##### - Make changes ONLY if absolutely necessary and you have the required knowledge.         #####
+##### - For normal system use, modifications to this file are NOT required.                    #####
+####################################################################################################
+---
+packages:
+  standard_hw_speaker: !include TX-Ultimate-Easy-ESPHome_standard_hw_speaker.yaml
+
+esphome:
+  platformio_options:
+    build_flags:
+      - -D TX_ULTIMATE_EASY_STANDARD_MEDIA_PLAYER
+
+globals:
+  - id: last_media_player_volume
+    type: uint8_t
+    restore_value: false
+    initial_value: '100'
+  - id: persistent_media_player_volume
+    type: uint8_t
+    restore_value: true
+    initial_value: '100'
+
+media_player:
+  - id: mp_media_player
+    name: Media Player
+    internal: false
+    platform: speaker
+    codec_support_enabled: true
+    buffer_size: 250000
+    task_stack_in_psram: false
+    announcement_pipeline:
+      speaker: announcement_spk_resampling_input
+      format: WAV
+      num_channels: 1
+      sample_rate: 48000
+    media_pipeline:
+      speaker: media_spk_resampling_input
+      format: FLAC
+      num_channels: 1
+      sample_rate: 48000
+    on_state:
+      then:
+        - lambda: |-
+            // Check if volume has changed and update number entity
+            id(persistent_media_player_volume) = static_cast<uint8_t>(mp_media_player->volume * 100.0f);
+            if (id(persistent_media_player_volume) != id(last_media_player_volume)) {
+              id(last_media_player_volume) = id(persistent_media_player_volume);
+              ESP_LOGD("media_player_volume", "Media player volume changed to %" PRIu8 "%%, updating number entity", id(persistent_media_player_volume));
+            }
+
+script:
+  - id: !extend boot_sequence
+    then:
+      - script.execute: sync_initial_volume
+
+  - id: !extend dump_config
+    then:
+      - lambda: |-
+          // Volume sync configuration
+          ESP_LOGCONFIG("standard_media_player", "Media Player Volume Sync:");
+          ESP_LOGCONFIG("standard_media_player", "  Persistent volume: %" PRIu8 "%", id(persistent_media_player_volume));
+          ESP_LOGCONFIG("standard_media_player", "  Current volume: %.1f%%", mp_media_player->volume * 100.0f);
+
+  - id: !extend dump_config_list_packages
+    then:
+      - script.wait: dump_config
+      - lambda: |-
+          // Check for requirements
+          #if !defined(TX_ULTIMATE_EASY_CORE)
+            #error "The package TX-Ultimate-Easy-ESPHome_core.yaml is required."
+          #endif  // TX_ULTIMATE_EASY_CORE
+          #if !defined(TX_ULTIMATE_EASY_STANDARD_HW_SPEAKER)
+            #error "The package TX-Ultimate-Easy-ESPHome_standard_hw_speaker.yaml is required."
+          #endif  // TX_ULTIMATE_EASY_STANDARD_HW_SPEAKER
+
+          // Identify itself
+          ESP_LOGCONFIG(ESPHOME_PROJECT_NAME, "  - Standard - Media Player");
+
+  - id: sync_initial_volume
+    mode: restart
+    then:
+      - delay: 2s  # Wait for media player to initialize
+      - media_player.volume_set:  # Sync initial volume from persisted number entity to media player
+          id: mp_media_player
+          volume: !lambda return id(persistent_media_player_volume) / 100.0f;
+      - lambda: |-
+          id(last_media_player_volume) = id(persistent_media_player_volume);
+          ESP_LOGI("media_player_volume", "Initial volume sync: %.1f%% (restored from persistence)", id(persistent_media_player_volume));
+
+speaker:
+  - platform: mixer
+    id: mixer_speaker_embedded
+    output_speaker: speaker_embedded
+    source_speakers:
+      - id: announcement_speaker_embedded
+      - id: media_speaker_embedded
+  - platform: resampler
+    id: announcement_spk_resampling_input
+    output_speaker: announcement_speaker_embedded
+  - platform: resampler
+    id: media_spk_resampling_input
+    output_speaker: media_speaker_embedded
+...

README.md

@@ -8,10 +8,10 @@
 [![Discord][discord-shield]](https://discord.gg/Db6WJWzWuf)
 [![Buy me an ice-cream][buymeacoffee-shield]](https://www.buymeacoffee.com/edwardfirmo)
 
-<!-- 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-disable MD013 MD033 -->
+| &nbsp;<picture><source media="(prefers-color-scheme: dark)" srcset="Assets/Logo_dark.png"><source media="(prefers-color-scheme: light)" srcset="Assets/Logo_light.png"><img alt="TX Ultimate Easy Logo" src="Assets/Logo_light.png"></picture> | 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 -->
+<!-- markdownlint-enable MD013 MD033 -->
 
 [version-shield]: https://img.shields.io/github/v/tag/edwardtfn/TX-Ultimate-Easy?label=version
 [version]: https://github.com/edwardtfn/TX-Ultimate-Easy/tags
@@ -27,6 +27,45 @@
 [buymeacoffee-shield]: https://img.shields.io/static/v1?label=Buy%20me%20an%20ice%20cream&message=❄&color=blue
 [buymeacoffee]: https://www.buymeacoffee.com/edwardfirmo
 
+## Framework Migration to ESP-IDF
+
+> [!IMPORTANT]  
+> **ESP-IDF Framework Migration**
+> 
+> Starting with version **2025.8.0**, TX Ultimate Easy will use **ESP-IDF** as the default framework, following ESPHome's direction towards ESP-IDF for better performance, stability, and feature support.
+> 
+> **What this means for you:**
+> - **New installations**: Will automatically use ESP-IDF (no action required)
+> - **Existing Arduino users**: Can continue using Arduino but with limited support
+> - **Migration recommended**: For better performance and full feature support
+> 
+> **Arduino Framework Support:**
+> - Still functional but **no longer actively tested**
+> - **Limited support** will be provided for Arduino-specific issues
+> - May miss out on new features optimized for ESP-IDF
+
+### Migration Guidelines
+
+#### For New Users
+No action required - ESP-IDF will be used automatically.
+
+#### For Existing Arduino Users
+
+**Option 1: Migrate to ESP-IDF (Recommended)**
+1. **Best practice**: Flash via serial/USB to ensure proper partition setup
+2. **Alternative**: If serial flashing isn't possible, flash OTA twice consecutively to improve success rate
+
+**Option 2: Continue with Arduino**
+Add this to your YAML configuration to force Arduino framework:
+```yaml
+esp32:
+  framework:
+    type: arduino
+```
+
+> [!WARNING]  
+> **Migration via OTA:** When switching frameworks via OTA, the partition table may not update correctly. Flash twice in succession to ensure both firmware partitions contain the latest firmware and prevent boot failures.
+
 ## Integration with Home Assistant
 
 TX Ultimate Easy exposes your device's components (sensors, touch panel, relays, etc.) to Home Assistant,
@@ -70,9 +109,10 @@ All device behaviors can be customized through Home Assistant automations withou
 - **Flexible Light Control**: Customize LED behavior and effects
 - **Touch Panel Support**: Full support for touch gestures and multi-touch capabilities
 - **Advanced Automations**: Create complex automations using Home Assistant's powerful automation engine
-- **BLE Proxy Support**: Optional Bluetooth Low Energy proxy functionality
+- **Bluetooth Proxy Support**: Compatible with ESPHome's bluetooth_proxy component for BLE device integration
 - **Audio Feedback**: Built-in speaker support for audible feedback
 - **Haptic Feedback**: Vibration motor support for tactile feedback
+- **ESP-IDF Framework**: Enhanced performance and stability with ESP-IDF support
 
 ## Hardware Support
 
@@ -92,12 +132,233 @@ Before getting started, ensure you have:
 
 ## Installation
 
-Detailed installation instructions coming soon. The process will include:
+Follow these steps to get your TX Ultimate device up and running with ESPHome.
 
-1. Initial ESPHome setup
-2. Device flashing
-3. Home Assistant integration
-4. Basic configuration
+### ESPHome Integration Setup
+
+1. Install the ESPHome add-on in Home Assistant if not already installed:
+   - Go to Settings → Add-ons → Add-on Store
+   - Search for "ESPHome" 
+   - Click Install
+2. Start the ESPHome add-on and verify it's running
+3. Access ESPHome dashboard through Home Assistant
+
+### Setup Device
+
+1. In the ESPHome dashboard, click "+ New Device"
+2. Name your device (e.g., "tx-ultimate-living-room")
+3. Select ESP32 as your device type
+4. Copy this basic configuration to your new device:
+   ```yaml
+   substitutions:
+     name: tx-ultimate-easy
+     friendly_name: TX Ultimate Easy
+
+   wifi:
+     ssid: !secret wifi_ssid
+     password: !secret wifi_password
+
+   packages:
+     remote_package:
+       url: https://github.com/edwardtfn/TX-Ultimate-Easy
+       ref: main  # Or you can specify a version, like `ref: v2024.12.6` or `ref: latest`
+       refresh: 5min
+       files:
+         - ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml      # Core (essential) packages
+         - ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml  # Non-essential, but recommended packages
+   ```
+   You can also use a specific version tag for better control over updates:
+   ```yaml
+   ref: v2024.12.2  # Using specific version for controlled updates
+   ```
+    **Notes:**
+      - [Click here](https://github.com/edwardtfn/TX-Ultimate-Easy/tags) for a full list of versions available.
+      - [Click here](TX-Ultimate-Easy-ESPHome.yaml)
+        for the latest version of this yaml.
+5. Click "Save" and then "Install"
+
+> [!IMPORTANT]  
+> Starting from version 2025.1.0, non-essential components like `web_server`, `captive_portal`, and `wifi`
+> are no longer included in the core package. If you need these components,
+> you must add them manually to your local configuration file.
+> For example:
+> ```yaml
+> # Add these to your configuration if needed
+> web_server:
+> captive_portal:
+> wifi:
+>   ap: # Access point configuration
+> ```
+
+### Optional Features
+
+#### Bluetooth Proxy
+TX Ultimate Easy is fully compatible with ESPHome's `bluetooth_proxy` component.
+To enable Bluetooth proxy functionality, add the following to your device configuration:
+
+```yaml
+bluetooth_proxy:
+  # Optional: Configure specific settings
+  # active: true
+```
+
+**Requirements for Bluetooth Proxy:**
+- ESP-IDF framework (default framework, not recommended with Arduino framework)
+- Sufficient memory (TX Ultimate Easy components are compatible,
+  but adding additional custom components may require memory optimization)
+
+> [!NOTE]
+> Bluetooth proxy functionality is provided by ESPHome's native component.
+> TX Ultimate Easy ensures compatibility but does not include it by default to maintain optimal memory usage.
+
+### Advanced Settings
+For more granular control over components,
+you can use our [advanced configuration template](TX-Ultimate-Easy-ESPHome_advanced.yaml).
+This template allows you to selectively include specific packages, which can be useful for:
+
+- Troubleshooting specific components
+- Reducing memory usage by excluding unused features
+- Customizing functionality for specific use cases
+
+Here's an example of the advanced configuration:
+```yaml
+packages:
+  remote_package:
+    url: https://github.com/edwardtfn/TX-Ultimate-Easy
+    ref: main  # Or you can specify a version, like `ref: v2024.12.6` or `ref: latest`
+    refresh: 5min
+    files:
+      # Core (essential) packages
+      - ESPHome/TX-Ultimate-Easy-ESPHome_core_common.yaml            # Basic shared settings
+      - ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml        # Button logic
+      - ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_leds.yaml           # LED configuration
+      - ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml          # Touch panel support
+
+      # Optional but recommended packages
+      - ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_relays.yaml     # Relay control
+      - ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_vibration.yaml  # Haptic feedback
+
+      # Audio options (use none or choose only one - using both will fail)
+      - ESPHome/TX-Ultimate-Easy-ESPHome_standard_media_player.yaml  # Media player (Recommended for most users)
+      # - ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_speaker.yaml  # Basic speaker
+
+# Optional: Add Bluetooth proxy support
+bluetooth_proxy:
+```
+
+> [!NOTE]
+> Use the advanced configuration with caution. Excluding core packages may cause instability or reduced functionality.
+
+### Device Flashing
+
+Initial flashing must be done via serial connection.
+We recommend using [ESPHome Web](https://web.esphome.io) for the simplest experience.
+
+<!-- markdownlint-disable MD028 -->
+> [!IMPORTANT]  
+> **SAFETY WARNINGS**
+> - ALWAYS disconnect the device from mains power before opening
+> - NEVER work on the device while connected to mains power
+> - Ensure the device is completely powered off before making any connections
+> - Keep your workspace clean, dry, and static-free
+> - Use proper insulated tools when working with electronics
+> - If unsure about any step, seek help from an experienced person
+
+> [!CAUTION]
+>⚡ **CRITICAL: VOLTAGE WARNING**
+> Using a UART adapter with voltage higher than 3.3V WILL DAMAGE YOUR DEVICE.
+> Double-check your adapter's voltage before connecting - many common FTDI adapters
+> default to 5V which will permanently damage the ESP32 chip.
+<!-- markdownlint-enable MD028 -->
+
+#### Required Hardware
+- USB-to-UART adapter:
+  - 3.3V logic level ONLY (DO NOT use 5V adapters)
+  - Must be capable of supplying at least 500mA
+  - Common adapters: CP2102, CH340, FTDI (ensure 3.3V setting)
+- Small Phillips screwdriver
+- 5 wires for connections (including one for BOOT to GND)
+
+#### Flashing Process
+1. Open your TX Ultimate device carefully
+2. Locate the programming header pins
+3. Connect your USB-to-UART adapter:
+
+   | Adapter | Device |
+   |---------|--------|
+   | GND     | GND    |
+   | 3.3V    | 3.3V   |
+   | TX      | RX     |
+   | RX      | TX     |
+
+4. Put device in flash mode:
+   - Temporarily connect the BOOT pin to GND using a jumper wire
+   - While holding BOOT to GND, power up the device
+   - After device powers up (wait a couple of seconds), remove the BOOT to GND connection
+5. Visit [ESPHome Web](https://web.esphome.io)
+6. Connect to your device and flash the firmware
+7. After successful flash, device will restart and be ready for OTA updates
+
+#### Detailed Visual Guides
+<!-- markdownlint-disable MD013 -->
+For step-by-step visual instructions, you can reference these existing guides:
+- 🇬🇧 [WirelessThings Guide](https://wirelessthings.io/index.php/2023/12/19/how-to-flash-sonoff-tx-ultimate-with-esphome/) - English guide with detailed photos
+- 🇪🇸 [Un loco y su tecnología](https://youtu.be/58v8oqSQgXQ?t=143) - Spanish video tutorial
+- 🇩🇪 [SmartHome yourself](https://youtu.be/naDLhX89enQ?t=465) - German video tutorial
+<!-- markdownlint-enable MD013 -->
+
+Note: While these guides may use different firmware, the physical flashing process remains the same.
+
+#### Subsequent Updates
+After initial flashing, all future updates can be done wirelessly (OTA)
+through the ESPHome dashboard in your ESPHome add-on.
+
+### Home Assistant Integration
+
+After successful flashing:
+1. Ensure your device and Home Assistant are on the same network
+2. Device should be automatically discovered within 1–2 minutes
+3. Accept the discovery notification in Home Assistant to add device
+   Note: If discovery takes longer than 5 minutes, proceed to troubleshooting steps
+4. Device will appear in your Home Assistant Devices dashboard
+
+#### Troubleshooting Integration
+If the device isn't discovered automatically:
+1. Verify your device is powered and connected to your network:
+   - Look for the device in your router's client list
+   - Consider using [manual IP](https://esphome.io/components/wifi.html#manual-ips) in your device
+2. If you missed the discovery notification:
+   - Go to Settings → Devices & Services
+   - Click "Add Integration"
+   - Search for "ESPHome" and enter your device's IP address
+3. Still having issues?
+   - Check your network allows mDNS/discovery traffic
+   - Verify there are no VLANs or network isolation preventing communication
+   - Try rebooting both the device and Home Assistant
+
+### Initial Configuration
+
+1. In Home Assistant, navigate to:
+   - Settings → Devices & Services → ESPHome
+   - Click on your device to access its configuration page
+2. Set basic device parameters:
+   - Model format (EU/US)
+   - Number of gangs (1-4)
+   - Relay modes (switch/light)
+   - Button actions
+3. Optional: Configure advanced features
+   - LED behaviors
+   - Touch sensitivity
+   - Haptic feedback
+   - Audio feedback
+4. Test your configuration:
+   - Verify each relay responds to controls
+   - Test configured button actions
+   - Confirm LED behavior matches settings
+   - Check haptic/audio feedback if enabled
+
+> [!NOTE]  
+> Some changes may require a device restart
 
 ## Usage
 
@@ -107,7 +368,7 @@ After installation, you can:
 2. Customize touch behaviors
 3. Set up LED patterns and effects
 4. Create automations
-5. Enable optional features like BLE proxy
+5. Enable optional features like Bluetooth proxy
 
 ## Configuration Options
 
@@ -118,6 +379,7 @@ TX Ultimate Easy offers extensive configuration options:
 - Relay modes and functions
 - Audio and haptic feedback settings
 - Network and connectivity options
+- Optional Bluetooth proxy functionality
 
 ## Contributing
 
@@ -154,9 +416,11 @@ Note: For proper tracking and resolution:
 
 This project builds upon the work of several amazing projects and contributors:
 
+<!-- markdownlint-disable MD013 -->
 - [SmartHome yourself - SONOFF TX Ultimate for ESPHome](https://github.com/SmartHome-yourself/sonoff-tx-ultimate-for-esphome)
 - [Un loco y su tecnología - Sonoff TX Ultimate with ESPHome](https://www.youtube.com/watch?v=58v8oqSQgXQ)
-- @PxPert - [Sonoff TX Ultimate and Voice Assistant](https://community.home-assistant.io/t/sonoff-tx-ultimate-and-voice-assistant/682214?u=edwardtfn)
+- [@PxPert](https://github.com/PxPert) - [Sonoff TX Ultimate and Voice Assistant](https://community.home-assistant.io/t/sonoff-tx-ultimate-and-voice-assistant/682214?u=edwardtfn)
+<!-- markdownlint-enable MD013 -->
 
 Special thanks to all contributors and community members who help make this project better.
 
@@ -167,5 +431,9 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE) file
 ---
 
 <!-- markdownlint-disable MD033 -->
-<img src="Assets/Logo.webp" alt="TX Ultimate Easy Logo" width="100"/>
+<picture>
+  <source media="(prefers-color-scheme: dark)" srcset="Assets/Logo_dark.png">
+  <source media="(prefers-color-scheme: light)" srcset="Assets/Logo_light.png">
+  <img alt="TX Ultimate Easy Logo" src="Assets/Logo_light.png" width="100">
+</picture>
 <!-- markdownlint-enable MD033 -->

TX-Ultimate-Easy-ESPHome.yaml

@@ -16,11 +16,10 @@ wifi:
 packages:
   remote_package:
     url: https://github.com/edwardtfn/TX-Ultimate-Easy
-    ref: latest  # Or you can specify a version, like `ref: v2024.12.6`
+    ref: stable  # Or you can specify a version, like `ref: v2024.12.6` or `ref: latest` to the latest non-stable
     refresh: 5min
     files:
       - ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml                  # Core (essential) packages
       - ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml              # Non-essential, but recommended packages
       # - ESPHome/TX-Ultimate-Easy-ESPHome_addon_ble_proxy.yaml     # Adds BLE proxy support
-      # - ESPHome/TX-Ultimate-Easy-ESPHome_addon_media_player.yaml  # Adds experimental Media Player (limited)
 ...

TX-Ultimate-Easy-ESPHome_advanced.yaml

@@ -0,0 +1,38 @@
+####################################################################################################
+#####                              TX Ultimate Easy for ESPHome                                #####
+#####                  Repository: https://github.com/edwardtfn/TX-Ultimate-Easy               #####
+####################################################################################################
+##### Author: edwardtfn - https://github.com/edwardtfn - https://buymeacoffee.com/edwardfirmo  #####
+####################################################################################################
+##### WARNING: This is an advanced configuration template. Use with caution as improper        #####
+##### configuration may lead to reduced functionality or system instability.                   #####
+####################################################################################################
+---
+substitutions:
+  name: tx-ultimate-easy-adv
+  friendly_name: TX Ultimate Easy Advanced
+
+wifi:
+  ssid: !secret wifi_ssid
+  password: !secret wifi_password
+
+packages:
+  remote_package:
+    url: https://github.com/edwardtfn/TX-Ultimate-Easy
+    ref: stable  # Or you can specify a version, like `ref: v2024.12.6` or `ref: latest` to the latest non-stable
+    refresh: 5min
+    files:
+      # Core (essential) packages - Do not disable these unless you know what you're doing
+      - ESPHome/TX-Ultimate-Easy-ESPHome_core_common.yaml            # Basic shared settings
+      - ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml        # Button logic
+      - ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_leds.yaml           # LED configuration
+      - ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml          # Touch panel support
+
+      # Optional functionality - Can be enabled/disabled as needed
+      - ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_relays.yaml     # Relay control
+      - ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_vibration.yaml  # Haptic feedback
+
+      # Audio options (use none or choose only one - using both will fail)
+      - ESPHome/TX-Ultimate-Easy-ESPHome_standard_media_player.yaml  # Media player (Recommended for most users)
+      # - ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_speaker.yaml  # Basic speaker
+...

components/tx_ultimate_easy/__init__.py

@@ -1,11 +1,12 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
+from esphome import automation
 from esphome.components import uart
+from esphome.components.esp32 import add_idf_sdkconfig_option
 from esphome.const import (
     CONF_ID,
 )
-
-from esphome import automation
+from esphome.core import CORE
 
 CODEOWNERS = ["@edwardtfn"]
 DEPENDENCIES = ['uart']
@@ -109,3 +110,17 @@ async def to_code(config):
     await cg.register_component(var, config)
     await uart.register_uart_device(var, config)
     await register_tx_ultimate_easy(var, config)
+
+    if CORE.using_esp_idf:
+        add_idf_sdkconfig_option("CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST", True)
+        add_idf_sdkconfig_option("CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY", True)
+        add_idf_sdkconfig_option("CONFIG_ESP32_REV_MIN_3", True)
+        add_idf_sdkconfig_option("CONFIG_MBEDTLS_DYNAMIC_BUFFER", True)
+        add_idf_sdkconfig_option("CONFIG_MBEDTLS_DYNAMIC_FREE_CA_CERT", True)
+        add_idf_sdkconfig_option("CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA", True)
+        add_idf_sdkconfig_option("CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC", True)
+        add_idf_sdkconfig_option("CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY", True)
+        add_idf_sdkconfig_option("CONFIG_SPIRAM_RODATA", True)
+        add_idf_sdkconfig_option("CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP", True)
+
+    cg.add_define("USE_TX_ULTIMATE_EASY")

components/tx_ultimate_easy/tx_ultimate_easy.cpp

@@ -69,9 +69,9 @@ namespace esphome {
             if (this->gang_count_ == 1)
                 return 1;
 
-            //Calculate button number Change to round up insted of truncate (integer division)
+            // Calculate button number Change to round up instead of truncate (integer division)
             const uint8_t width = (TOUCH_MAX_POSITION + gang_count_) / this->gang_count_;  // Width of each button region
-            if (width < 1)  // Invalid width - and prevents division by zero removed "width > gang_count_" issue with 2 gang 
+            if (width < 1)  // Invalid width - and prevents division by zero 
                 return 0;
             const uint8_t button = std::min(
                 static_cast<uint8_t>((position / width) + 1), // Convert position to button index
@@ -141,8 +141,36 @@ namespace esphome {
             switch (uart_received_bytes[4]) {
                 case TOUCH_STATE_RELEASE:
                 case TOUCH_STATE_MULTI_TOUCH:
+                    return uart_received_bytes[5];
+
                 case TOUCH_STATE_SWIPE_LEFT:
                 case TOUCH_STATE_SWIPE_RIGHT:
+                    // uart_received_bytes[5] indicates swipe direction:
+                    // 12 = find last touch position (scan right to left)
+                    // 13 = find first touch position (scan left to right)
+                    // Bytes 6-7 contain a 10-bit bitmap of touch positions:
+                    // Byte 7: bits 0-7 represent positions 1-8
+                    // Byte 6: bits 0-1 represent positions 9-10
+                    switch (uart_received_bytes[5]) {
+                        case 12:
+                            for (uint8_t i = 10; i > 0; i--) {
+                                if (i > 8
+                                    ? uart_received_bytes[6] & (1 << (i - 9))
+                                    : uart_received_bytes[7] & (1 << (i - 1))) {
+                                    return i;
+                                }
+                            }
+                            break;
+                        case 13:
+                            for (uint8_t i = 1; i <= 10; i++) {
+                                if (i > 8
+                                    ? uart_received_bytes[6] & (1 << (i - 9))
+                                    : uart_received_bytes[7] & (1 << (i - 1))) {
+                                    return i;
+                                }
+                            }
+                            break;
+                    }
                     return uart_received_bytes[5];
 
                 default:
@@ -152,8 +180,10 @@ namespace esphome {
 
         int TxUltimateEasy::get_touch_state(const std::array<int, UART_RECEIVED_BYTES_SIZE> &uart_received_bytes) {
             int state = uart_received_bytes[4];
-            if (state == TOUCH_STATE_PRESS && uart_received_bytes[5] != 0) state = TOUCH_STATE_RELEASE;
-            if (state == TOUCH_STATE_RELEASE && uart_received_bytes[5] == TOUCH_STATE_MULTI_TOUCH) state = TOUCH_STATE_MULTI_TOUCH;
+            if (state == TOUCH_STATE_PRESS && uart_received_bytes[5] != 0)
+                state = TOUCH_STATE_RELEASE;
+            if (state == TOUCH_STATE_RELEASE && uart_received_bytes[5] == TOUCH_STATE_MULTI_TOUCH)
+                state = TOUCH_STATE_MULTI_TOUCH;
             if (state == TOUCH_STATE_SWIPE) {
                 state = (uart_received_bytes[5] == TOUCH_STATE_SWIPE_RIGHT) ? TOUCH_STATE_SWIPE_RIGHT : 
                         (uart_received_bytes[5] == TOUCH_STATE_SWIPE_LEFT) ? TOUCH_STATE_SWIPE_LEFT : state;

versioning/VERSION

@@ -1 +1 @@
-2024.12.23
+2025.8.2

versioning/VERSION_YAML

@@ -1 +1 @@
-version: 2024.12.23
+version: 2025.8.2