ESPHome/TX-Ultimate-Easy-ESPHome_addon_ble_proxy.yaml gelöscht

Resolve configuration loss by optimizing storage usage

.github/workflows/validate_esphome.yml

@@ -1,9 +1,36 @@
 ---
 name: Validate ESPHome
 
-# yamllint disable-line rule:truthy
+permissions:
-on:
+  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 }}
@@ -12,49 +39,416 @@ 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 {} +
 
-  build_basic:
+  # Arduino Framework - Foundation (latest)
-    name: Basic
+  build_ard_core:
+    name: "🏗️ Arduino Core (latest)"
+    needs: code_scan
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@main
-      - name: Build core
+      - name: Build Arduino Core - latest
+        uses: esphome/build-action@main
+        with:
+          yaml-file: ".test/esphome_ard_core.yaml"
+          version: latest
+
+  build_ard_core_dev:
+    name: "🏗️ Arduino Core (dev)"
+    needs: code_scan
+    if: ${{ success() && (github.event_name != 'workflow_dispatch' || github.event.inputs.skip_dev != 'true') }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@main
+      - name: Build Arduino Core - dev
+        uses: esphome/build-action@main
+        with:
+          yaml-file: ".test/esphome_ard_core.yaml"
+          version: dev
+  build_ard_basic:
+    name: "📦 Arduino Basic (latest)"
+    needs: build_ard_core
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@main
+      - name: Build Arduino Basic - latest
         uses: esphome/build-action@main
         with:
           yaml-file: ".test/esphome_ard_basic.yaml"
+          version: latest
 
-  build_bluetooth_proxy_4:
+  build_ard_basic_dev:
-    name: Bluetooth Proxy (IDF)
+    name: "📦 Arduino Basic (dev)"
+    needs: build_ard_core_dev
+    if: ${{ success() && (github.event_name != 'workflow_dispatch' || github.event.inputs.skip_dev != 'true') }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@main
-      - name: Build core
+      - name: Build Arduino Basic - dev
         uses: esphome/build-action@main
         with:
-          yaml-file: ".test/esphome_idf_bluetooth_proxy.yaml"
+          yaml-file: ".test/esphome_ard_basic.yaml"
+          version: dev
 
-  build_bluetooth_proxy_53:
+  build_ard_hw_relays:
-    name: Bluetooth Proxy (IDF v5.3)
+    name: "🔌 Arduino HW Relays (latest)"
+    needs: build_ard_basic
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@main
-      - name: Build core
+      - name: Build Arduino HW Relays - latest
         uses: esphome/build-action@main
         with:
-          yaml-file: ".test/esphome_idf53_bluetooth_proxy.yaml"
+          yaml-file: ".test/esphome_ard_hw_relays.yaml"
+          version: latest
+
+  build_ard_hw_speaker:
+    name: "🔌 Arduino HW Speaker (latest)"
+    needs: build_ard_basic
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@main
+      - name: Build Arduino HW Speaker - latest
+        uses: esphome/build-action@main
+        with:
+          yaml-file: ".test/esphome_ard_hw_speaker.yaml"
+          version: latest
+
+  build_ard_hw_vibration:
+    name: "🔌 Arduino HW Vibration (latest)"
+    needs: build_ard_basic
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@main
+      - name: Build Arduino HW Vibration - latest
+        uses: esphome/build-action@main
+        with:
+          yaml-file: ".test/esphome_ard_hw_vibration.yaml"
+          version: latest
+
+  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 Arduino BLE Proxy - latest
+        uses: esphome/build-action@main
+        with:
+          yaml-file: ".test/esphome_ard_ble_proxy.yaml"
+          version: latest
+
+  build_ard_ble_proxy_dev:
+    name: "⚡ Arduino BLE Proxy (dev)"
+    needs: build_ard_basic_dev
+    if: ${{ success() && (github.event_name != 'workflow_dispatch' || github.event.inputs.skip_dev != 'true') }}
+    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_core_dev:
+    name: "🏗️ IDF Core (dev)"
+    needs: code_scan
+    if: ${{ success() && (github.event_name != 'workflow_dispatch' || github.event.inputs.skip_dev != 'true') }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@main
+      - name: Build IDF Core - dev
+        uses: esphome/build-action@main
+        with:
+          yaml-file: ".test/esphome_idf_core.yaml"
+          version: dev
+
+  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_dev
+    if: ${{ success() && (github.event_name != 'workflow_dispatch' || github.event.inputs.skip_dev != 'true') }}
+    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 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_idf_ble_proxy_dev:
+    name: "⚡ IDF BLE Proxy (dev)"
+    needs: build_idf_basic_dev
+    if: ${{ success() && (github.event_name != 'workflow_dispatch' || github.event.inputs.skip_dev != 'true') }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@main
+      - name: Build IDF BLE Proxy - dev
+        uses: esphome/build-action@main
+        with:
+          yaml-file: ".test/esphome_idf_ble_proxy.yaml"
+          version: dev
+
+  # Summary Jobs - Grouped by framework and environment
+  summary_arduino:
+    name: "📊 Arduino Framework"
+    needs:
+      - build_ard_core
+      - build_ard_core_dev
+      - 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_core_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+            [ "${{ needs.build_ard_basic_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+            [ "${{ needs.build_ard_ble_proxy_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+            TOTAL=$((TOTAL + 3))
+          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_core_dev
+      - 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_core_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+            [ "${{ needs.build_idf_basic_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+            [ "${{ needs.build_idf_ble_proxy_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+            TOTAL=$((TOTAL + 3))
+          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:
+      - 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_core_dev
+      - build_ard_basic_dev
+      - build_ard_ble_proxy_dev
+      - build_idf_core_dev
+      - build_idf_basic_dev
+      - build_idf_ble_proxy_dev
+    if: ${{ always() && (github.event_name != 'workflow_dispatch' || github.event.inputs.skip_dev != 'true') }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Dev ESPHome Results
+        run: |
+          SUCCESS=0
+          TOTAL=6
+
+          # Arduino Dev builds
+          [ "${{ needs.build_ard_core_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+          [ "${{ 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_core_dev.result }}" == "success" ] && SUCCESS=$((SUCCESS + 1))
+          [ "${{ 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,80 +0,0 @@
----
-name: Validate ESPHome (Beta)
-
-on:  # yamllint disable-line rule:truthy
-  push:
-    paths:
-      - "*.yaml"
-      - "ESPHome/*.yaml"
-      - ".test/*.yaml"
-      - "*.h"
-      - "*.c"
-      - "*.cpp"
-      - "*.py"
-  pull_request:
-    paths:
-      - "*.yaml"
-      - "ESPHome/*.yaml"
-      - ".test/*.yaml"
-      - "*.h"
-      - "*.c"
-      - "*.cpp"
-      - "*.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_basic:
-    name: Basic
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build core
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_ard_basic.yaml"
-          version: beta
-
-  build_bluetooth_proxy_4:
-    name: Bluetooth Proxy (IDF)
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build core
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_idf_bluetooth_proxy.yaml"
-          version: beta
-
-  build_bluetooth_proxy_53:
-    name: Bluetooth Proxy (IDF v5.3)
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-      - name: Build core
-        uses: esphome/build-action@main
-        with:
-          yaml-file: ".test/esphome_idf53_bluetooth_proxy.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:
+        run: |
-          files: '**/*.md'
+          BASE=${{ github.event.before }}
-          separator: ","
+          HEAD=${{ github.sha }}
-      # https://github.com/marketplace/actions/markdownlint-cli2-action
+          FILES=$(git diff --name-only $BASE $HEAD -- '**/*.md' | tr '\n' ',')
+          echo "changed_files=$FILES" >> $GITHUB_ENV
+          if [[ -n "$FILES" ]]; then
+            echo "any_changed=true" >> $GITHUB_ENV
+          else
+            echo "any_changed=false" >> $GITHUB_ENV
+          fi
+
       - name: Markdown Lint
         uses: DavidAnson/markdownlint-cli2-action@v14
-        if: steps.changed-files.outputs.any_changed == 'true'
+        if: env.any_changed == 'true'
         with:
-          globs: ${{ steps.changed-files.outputs.all_changed_files }}
+          globs: ${{ env.changed_files }}
           separator: ","
           config: '.rules/.markdownlint.jsonc'
           fix: true
@@ -43,15 +48,27 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@main
+        uses: actions/checkout@v4
         with:
-          fetch-depth: '0'
+          fetch-depth: 0
+
+      - name: Identify changed files
+        id: changed-files
+        run: |
+          BASE=${{ github.event.before }}
+          HEAD=${{ github.sha }}
+          FILES=$(git diff --name-only $BASE $HEAD -- '**/*.md' | tr '\n' ',')
+          echo "changed_files=$FILES" >> $GITHUB_ENV
+          if [[ -n "$FILES" ]]; then
+            echo "any_changed=true" >> $GITHUB_ENV
+          else
+            echo "any_changed=false" >> $GITHUB_ENV
+          fi
 
-      # https://github.com/gaurav-nelson/github-action-markdown-link-check
       - name: Markdown links
         uses: gaurav-nelson/github-action-markdown-link-check@v1
+        if: env.any_changed == 'true'
         with:
-          # yamllint disable-line rule:truthy
           check-modified-files-only: yes
           config-file: '.rules/mlc_config.json'
           base-branch: 'main'

.github/workflows/validate_yamllint.yml

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

.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
@@ -42,11 +41,84 @@ jobs:
           git config user.name "GitHub Actions"
           git config user.email "actions@github.com"
 
+      - name: Get PR information
+        id: pr_info
+        if: github.event_name == 'push'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            try {
+              // Use GitHub's reliable API to find PRs associated with this commit
+              const { data: associatedPRs } = await github.rest.repos.listPullRequestsAssociatedWithCommit({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                commit_sha: context.sha
+              });
+
+              if (associatedPRs.length > 0) {
+                // Get the most recent merged PR
+                const pr = associatedPRs.find(pr => pr.state === 'closed' && pr.merged_at) || associatedPRs[0];
+
+                return {
+                  title: pr.title,
+                  body: pr.body || 'No description provided',
+                  number: pr.number,
+                  found: true
+                };
+              } else {
+                // Fallback for direct pushes or when no PR is found
+                const commit = await github.rest.repos.getCommit({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  ref: context.sha
+                });
+
+                return {
+                  title: 'Direct push to main',
+                  body: commit.data.commit.message,
+                  number: null,
+                  found: false
+                };
+              }
+            } catch (error) {
+              console.log('Could not get PR info:', error.message);
+              return {
+                title: 'Version update',
+                body: 'Automated version bump',
+                number: null,
+                found: false
+              };
+            }
+
       - name: Bump version
         run: |
           chmod +x ./versioning/bump_version.sh
           ./versioning/bump_version.sh
 
+      - name: Create tag message
+        id: tag_message
+        run: |
+          NEW_VERSION=$(cat ./versioning/VERSION)
+
+          if [ "${{ github.event_name }}" == "push" ] && [ "${{ steps.pr_info.outcome }}" == "success" ]; then
+            # Use PR information directly in heredoc to avoid quoting issues
+            cat > tag_message.txt << EOF
+          # v${NEW_VERSION} - ${{ fromJson(steps.pr_info.outputs.result).title }}
+
+          ${{ fromJson(steps.pr_info.outputs.result).body }}
+          EOF
+          else
+            # Manual dispatch or PR info unavailable - simpler message
+            cat > tag_message.txt << EOF
+          # v${NEW_VERSION} - Manual tag update
+
+          Tag updated via manual workflow dispatch.
+          EOF
+          fi
+
+          # Store the message for use in subsequent steps
+          echo "TAG_MESSAGE_FILE=tag_message.txt" >> $GITHUB_ENV
+
       - name: Push Changes and Tags
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -73,10 +145,10 @@ jobs:
             echo "Backing up current stable tag ($OLD_STABLE)"
           fi
 
-          # Update tag
+          # Update tag with detailed message
           NEW_VERSION=$(cat ./versioning/VERSION)
           echo "Updating stable tag to $NEW_VERSION"
-          git tag -fa stable -m "Update stable tag"
+          git tag -fa stable -F "$TAG_MESSAGE_FILE"
           git push origin stable --force
 
       - name: Update latest tag
@@ -98,9 +170,15 @@ jobs:
             echo "Backing up current latest tag ($OLD_LATEST)"
           fi
 
-          # Update tag
+          # Update tag with detailed message
           NEW_VERSION=$(cat ./versioning/VERSION)
           echo "Updating latest tag to $NEW_VERSION"
-          git tag -fa latest -m "Update latest tag"
+          git tag -fa latest -F "$TAG_MESSAGE_FILE"
           git push origin latest --force
+
+      - name: Cleanup
+        if: always()
+        run: |
+          # Clean up temporary files
+          [ -f tag_message.txt ] && rm tag_message.txt || true
 ...

.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,8 +1,6 @@
 ---
 packages:
-  basic_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml  # Basic package
+  common_arduino: !include common_ard.yaml
-
+  core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
-esp32:
+  standard_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml
-  framework:
-    type: arduino
 ...

.test/esphome_ard_ble_proxy.yaml

@@ -0,0 +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
+
+bluetooth_proxy:
+...

.test/esphome_ard_core.yaml

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

.test/esphome_ard_hw_relays.yaml

@@ -0,0 +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
+...

.test/esphome_ard_hw_speaker.yaml

@@ -0,0 +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
+...

.test/esphome_ard_hw_vibration.yaml

@@ -0,0 +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
+...

.test/esphome_idf53_bluetooth_proxy.yaml

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

.test/esphome_idf_basic.yaml

@@ -0,0 +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
+...

.test/esphome_idf_ble_proxy.yaml

@@ -0,0 +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
+
+bluetooth_proxy:
+...

.test/esphome_idf_bluetooth_proxy.yaml

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

.test/esphome_idf_core.yaml

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

.test/esphome_idf_hw_relays.yaml

@@ -0,0 +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
+...

.test/esphome_idf_hw_speaker.yaml

@@ -0,0 +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
+...

.test/esphome_idf_hw_vibration.yaml

@@ -0,0 +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
+...

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 - Speaker                                               #####
+##### 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:
+packages:
-  id: if_i2s_audio
+  # yamllint disable rule:colons
-  i2s_bclk_pin: GPIO2
+  core:     !include TX-Ultimate-Easy-ESPHome_core.yaml
-  i2s_lrclk_pin: GPIO4
+  standard: !include TX-Ultimate-Easy-ESPHome_standard.yaml
-
+  # yamllint enable rule:colons
-media_player:
-  - id: mp_speaker
-    name: Speaker
-    platform: i2s_audio
-    i2s_dout_pin: GPIO15
-    i2s_audio_id: if_i2s_audio
-    i2s_comm_fmt: lsb
-    dac_type: external
-    mode: mono
-    internal: false
 ...

ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml

@@ -11,202 +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"
-
 packages:
   # yamllint disable rule:colons
-  core_hw_buttons:   !include TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml
+  core_common:     !include TX-Ultimate-Easy-ESPHome_core_common.yaml
-  core_hw_leds:      !include TX-Ultimate-Easy-ESPHome_core_hw_leds.yaml
+  core_hw_buttons: !include TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml
-  core_hw_relays:    !include TX-Ultimate-Easy-ESPHome_core_hw_relays.yaml
+  core_hw_leds:    !include TX-Ultimate-Easy-ESPHome_core_hw_leds.yaml
-  core_hw_speaker:   !include TX-Ultimate-Easy-ESPHome_core_hw_speaker.yaml
+  core_hw_touch:   !include TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml
-  core_hw_touch:     !include TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml
-  core_hw_vibration: !include TX-Ultimate-Easy-ESPHome_core_hw_vibration.yaml
   # yamllint enable rule:colons
-
-api:
-  id: api_server
-  on_client_connected:
-    then:
-      - script.execute: publish_device_info
-
-button:
-  - id: bt_restart
-    name: Restart
-    internal: false
-    platform: restart
-
-captive_portal:
-  id: ap_captive_portal
-
-esp32:
-  board: esp32dev
-  flash_size: 8MB
-
-esphome:
-  name: ${name}
-  friendly_name: ${friendly_name}
-  comment: TX Ultimate Easy
-  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
-
-improv_serial:
-  id: serial_improv
-
-logger:
-  level: DEBUG
-
-ota:
-  platform: esphome
-
-psram:
-
-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
-
-  - id: boot_sequence
-    mode: restart
-    then:
-      - script.execute: publish_device_info
-
-  - 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
-
-  - 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:
-        - lambda: tx_ultimate->set_gang_count(static_cast<uint8_t>(i)+1);
-
-text_sensor:
-  - id: tx_fw_version
-    name: 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;
-
-time:
-  - id: time_source
-    platform: homeassistant
-
-web_server:
-
-wifi:
-  ap:
 ...

ESPHome/TX-Ultimate-Easy-ESPHome_core_common.yaml

@@ -0,0 +1,378 @@
+####################################################################################################
+#####                              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: 5s  # Delay to dump config after requested
+
+  TAG_CORE_COMMON: core.common
+
+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:
+        - script.execute: dump_config_caller
+
+  - id: bs_boot_completed
+    name: Boot Completed
+    internal: false
+    disabled_by_default: false
+    platform: template
+    entity_category: diagnostic
+    device_class: connectivity
+    icon: mdi:rocket-launch
+    on_state:
+      then:
+        - 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
+  min_version: 2025.8.0
+  project:
+    name: "edwardtfn.tx_ultimate_easy"
+    version: ${version}
+  platformio_options:
+    build_flags:
+      - -D TX_ULTIMATE_EASY_CORE_COMMON
+
+  on_boot:
+    - priority: 1000  # Very early in boot process
+      then:
+        - binary_sensor.template.publish:
+            id: bs_boot_completed
+            state: OFF  # yamllint disable-line rule:truthy
+
+    - priority: 750
+      then:
+        - script.execute: restore_from_nvs
+
+    - 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
+
+external_components:
+  - source:
+      type: git
+      url: https://git.andrejka.at/oneil1987/TX-Ultimate-Easy
+      ref: v${version}
+    refresh: 1h
+    components:
+      - tx_ultimate_easy
+
+globals:
+  - id: gang_count
+    type: uint8_t
+    restore_value: true
+    initial_value: '0'
+
+  - id: is_us_model
+    type: bool
+    restore_value: true
+    initial_value: 'false'
+
+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.wait: restore_from_nvs
+      - script.wait: boot_initialize
+      - script.wait: boot_sequence
+      - script.execute:
+          id: api_send_ha_event_boot
+          type: done
+      - script.wait: api_send_ha_event_boot
+      - binary_sensor.template.publish:
+          id: bs_boot_completed
+          state: ON  # yamllint disable-line rule:truthy
+
+  - 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("${TAG_CORE_COMMON}", "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("${TAG_CORE_COMMON}", "Device friendly name: ${friendly_name}");
+          ESP_LOGCONFIG("${TAG_CORE_COMMON}", "Device name: ${name}");
+          ESP_LOGCONFIG("${TAG_CORE_COMMON}", "Device name (HA): %s", tx_device_name->state.c_str());
+          ESP_LOGCONFIG("${TAG_CORE_COMMON}", "Device hostname: %s", App.get_name().c_str());
+
+          dump_config_versions->execute();
+
+          // Framework detection
+          #ifdef USE_ARDUINO
+          ESP_LOGCONFIG("${TAG_CORE_COMMON}", "Framework: Arduino");
+          #elif defined(USE_ESP_IDF)
+          ESP_LOGCONFIG("${TAG_CORE_COMMON}", "Framework: ESP-IDF");
+          #else
+          ESP_LOGW("${TAG_CORE_COMMON}", "Framework: UNKNOWN");
+          #endif
+
+          // Model configuration
+          ESP_LOGCONFIG("${TAG_CORE_COMMON}", "Model format (selected): %s",
+                          sl_tx_model_format->state.c_str());
+          ESP_LOGCONFIG("${TAG_CORE_COMMON}", "Model format (detected): %s",
+                          id(is_us_model) ? "US" : "EU");
+          ESP_LOGCONFIG("${TAG_CORE_COMMON}", "Gangs (selected): %s",
+                          sl_tx_model_gang->state.c_str());
+          ESP_LOGCONFIG("${TAG_CORE_COMMON}", "Gangs (detected): %" PRIu8 "-Gang%s",
+                          id(gang_count), id(gang_count) > 1 ? "s" : "");
+
+          // Boot completion status
+          if (bs_boot_completed->state)
+            ESP_LOGCONFIG("${TAG_CORE_COMMON}", "Boot completed: Yes");
+          else
+            ESP_LOGW("${TAG_CORE_COMMON}", "Boot completed: NO");
+
+          // System state
+          if (bs_pending_restart->state)
+            ESP_LOGW("${TAG_CORE_COMMON}", "Pending restart: YES");
+          else
+            ESP_LOGCONFIG("${TAG_CORE_COMMON}", "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("${TAG_CORE_COMMON}", "TX Ultimate firmware version: ${version}");
+          // ESPHome builder information
+          ESP_LOGCONFIG("${TAG_CORE_COMMON}", "ESPHome builder: " ESPHOME_VERSION);
+          ESP_LOGCONFIG("${TAG_CORE_COMMON}", "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());
+
+  - id: restore_from_nvs
+    mode: single
+    then:
+      - select.set_index:
+          id: sl_tx_model_format
+          index: !lambda if (id(is_us_model)) return 1; else return 0;
+      - select.set_index:
+          id: sl_tx_model_gang
+          index: !lambda |-
+            if (id(gang_count) < 1 || id(gang_count) > 4) return 0;  // default to 1-Gang
+            return static_cast<uint8_t>(id(gang_count)) - 1;
+
+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: false
+    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}");
+
+  - 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: false
+    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;
+            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;
+
+tx_ultimate_easy:
+  id: tx_ultimate
+
+wifi:
+  id: wifi_component
+...

ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_buttons.yaml

@@ -19,6 +19,10 @@ substitutions:
   BUTTON_2_ACTION_TEXT: "Relay 2 (toggle)"
   BUTTON_3_ACTION_TEXT: "Relay 3 (toggle)"
   BUTTON_4_ACTION_TEXT: "Relay 4 (toggle)"
+  BUTTON_1_ACTION_FAILSAFE_TEXT: "Relay 1 (API failsafe only)"
+  BUTTON_2_ACTION_FAILSAFE_TEXT: "Relay 2 (API failsafe only)"
+  BUTTON_3_ACTION_FAILSAFE_TEXT: "Relay 3 (API failsafe only)"
+  BUTTON_4_ACTION_FAILSAFE_TEXT: "Relay 4 (API failsafe only)"
 
   BUTTON_CLICK_MIN_LENGTH: '50'    # The minimum duration the click should last, in msec
   BUTTON_CLICK_MAX_LENGTH: '350'   # The maximum duration the click should last, in msec
@@ -32,6 +36,8 @@ substitutions:
   BUTTON_3_ID: '3'
   BUTTON_4_ID: '4'
 
+  TAG_CORE_HW_BUTTONS: core.hw.buttons
+
 binary_sensor:
   - &binary_sensor_button_base
     id: bs_button_2
@@ -53,7 +59,20 @@ binary_sensor:
     internal: false
     <<: *binary_sensor_button_base
 
+esphome:
+  platformio_options:
+    build_flags:
+      - -D TX_ULTIMATE_EASY_CORE_HW_BUTTONS
+
 globals:
+  # Packed button actions - replaces 4 separate selects
+  - id: button_actions_packed
+    type: uint16_t
+    restore_value: true
+    initial_value: '4369'  # Binary: 0001000100010001 = all buttons set to option 1 (default action)
+    # Bit layout: [button4(4)][button3(4)][button2(4)][button1(4)]
+    # Each button uses 4 bits: 0=None, 1=Toggle, 2=Failsafe, 3-15=Reserved for future options
+
   - id: button_press_button
     type: uint8_t
     restore_value: false
@@ -82,28 +101,19 @@ script:
   - id: boot_initialize_buttons
     mode: restart
     then:
-      - wait_until:
-          condition:
-            - lambda: return sl_tx_model_gang->active_index().has_value();
       - lambda: |-
-          const uint8_t num_gangs = (sl_tx_model_gang->active_index().has_value()) ?
-                                    (sl_tx_model_gang->active_index().value() + 1) : 0;
-          if (num_gangs < 1 || num_gangs > 4) {
-            ESP_LOGE("core_hw_buttons", "Invalid number of gangs: %" PRIu8, num_gangs);
-            return;
-          }
           bs_button_1->publish_state(false);
-          bs_button_1->set_internal(num_gangs < 1);
+          bs_button_1->set_internal(id(gang_count) < 1);
-          sl_button_1_action->set_internal(num_gangs < 1);
+          sl_button_1_action->set_internal(id(gang_count) < 1);
           bs_button_2->publish_state(false);
-          bs_button_2->set_internal(num_gangs < 2);
+          bs_button_2->set_internal(id(gang_count) < 2);
-          sl_button_2_action->set_internal(num_gangs < 2);
+          sl_button_2_action->set_internal(id(gang_count) < 2);
           bs_button_3->publish_state(false);
-          bs_button_3->set_internal(num_gangs < 3);
+          bs_button_3->set_internal(id(gang_count) < 3);
-          sl_button_3_action->set_internal(num_gangs < 3);
+          sl_button_3_action->set_internal(id(gang_count) < 3);
           bs_button_4->publish_state(false);
-          bs_button_4->set_internal(num_gangs < 4);
+          bs_button_4->set_internal(id(gang_count) < 4);
-          sl_button_4_action->set_internal(num_gangs < 4);
+          sl_button_4_action->set_internal(id(gang_count) < 4);
 
   - id: button_action
     mode: parallel
@@ -112,19 +122,20 @@ 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: |-
-          ESP_LOGI("core_hw_buttons", "Button %" PRIu8 " action: '%s'", button, action.c_str());
+          // 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("${TAG_CORE_HW_BUTTONS}", "Button %" PRIu8 " action: '%s'", button, action.c_str());
           if (action == "click") {
             switch (button) {
               case ${BUTTON_1_ID}:
@@ -205,6 +216,53 @@ script:
             }
           }
 
+  - id: !extend dump_config
+    then:
+      - lambda: |-
+          std::string gang_count_plural_suffix = id(gang_count) > 1 ? "s" : "";
+          // Button's actions
+          ESP_LOGCONFIG("${TAG_CORE_HW_BUTTONS}", "Button%s action%s:",
+                        gang_count_plural_suffix.c_str(),
+                        gang_count_plural_suffix.c_str());
+          ESP_LOGCONFIG("${TAG_CORE_HW_BUTTONS}", "  Relay 1: %s", sl_button_1_action->has_state() ?
+                                                                    sl_button_1_action->state.c_str() : "Unknown");
+          if (id(gang_count) >= 2)
+            ESP_LOGCONFIG("${TAG_CORE_HW_BUTTONS}", "  Relay 2: %s", sl_button_2_action->has_state() ?
+                                                                      sl_button_2_action->state.c_str() : "Unknown");
+          if (id(gang_count) >= 3)
+            ESP_LOGCONFIG("${TAG_CORE_HW_BUTTONS}", "  Relay 3: %s", sl_button_3_action->has_state() ?
+                                                                      sl_button_3_action->state.c_str() : "Unknown");
+          if (id(gang_count) >= 4)
+            ESP_LOGCONFIG("${TAG_CORE_HW_BUTTONS}", "  Relay 4: %s", sl_button_4_action->has_state() ?
+                                                                      sl_button_4_action->state.c_str() : "Unknown");
+
+  - id: !extend dump_config_list_packages
+    then:
+      - script.wait: dump_config
+      - lambda: |-
+          // Check for requirements
+          #if !defined(TX_ULTIMATE_EASY_CORE_COMMON)
+            #error "The package TX-Ultimate-Easy-ESPHome_core_common.yaml is required."
+          #endif
+
+          // Identify itself
+          ESP_LOGCONFIG(ESPHOME_PROJECT_NAME, "  - Core - Hardware - Buttons");
+
+  - id: !extend restore_from_nvs
+    then:
+      - select.set_index:
+          id: sl_button_1_action
+          index: !lambda return std::min((uint8_t)(id(button_actions_packed) & 0x0F), (uint8_t)2);
+      - select.set_index:
+          id: sl_button_2_action
+          index: !lambda return std::min((uint8_t)((id(button_actions_packed) >> 4) & 0x0F), (uint8_t)2);
+      - select.set_index:
+          id: sl_button_3_action
+          index: !lambda return std::min((uint8_t)((id(button_actions_packed) >> 8) & 0x0F), (uint8_t)2);
+      - select.set_index:
+          id: sl_button_4_action
+          index: !lambda return std::min((uint8_t)((id(button_actions_packed) >> 12) & 0x0F), (uint8_t)2);
+
   - id: !extend touch_on_multi_touch_release
     then:
       - script.execute: buttons_release
@@ -257,19 +315,20 @@ script:
               id(button_press_start_time) < current_time) {
             uint32_t press_duration  = current_time - id(button_press_start_time);
             // Handle overflow (optional, since it's unlikely to happen here)
-            ESP_LOGI("core_hw_buttons", "Button press duration: %" PRIu32 " ms", press_duration);
+            ESP_LOGI("${TAG_CORE_HW_BUTTONS}", "Button press duration: %" PRIu32 " ms", press_duration);
             if (press_duration < ${BUTTON_CLICK_MIN_LENGTH}) {
-              ESP_LOGW("core_hw_buttons", "Ignoring button press (too short)");
+              ESP_LOGW("${TAG_CORE_HW_BUTTONS}", "Ignoring button press (too short)");
             } else if (press_duration >= ${BUTTON_CLICK_MIN_LENGTH} and
                         press_duration <= ${BUTTON_CLICK_MAX_LENGTH}) { // Short/normal click
               button_click_event->execute(id(button_press_button), id(click_counter));
             } else if (press_duration >= ${BUTTON_LONG_PRESS_DELAY} and press_duration <= ${BUTTON_PRESS_TIMEOUT}) {
               button_action->execute(id(button_press_button), "long_press", 1);
             } else if (press_duration > ${BUTTON_PRESS_TIMEOUT}) { // Timeout or invalid
-              ESP_LOGW("core_hw_buttons", "Button press cancelled or timed out after ${BUTTON_PRESS_TIMEOUT} ms");
+              ESP_LOGW("${TAG_CORE_HW_BUTTONS}",
+                        "Button press cancelled or timed out after ${BUTTON_PRESS_TIMEOUT} ms");
             }
           } else {
-            ESP_LOGW("core_hw_buttons", "Press event timestamp not recorded yet");
+            ESP_LOGW("${TAG_CORE_HW_BUTTONS}", "Press event timestamp not recorded yet");
           }
           id(button_press_start_time) = 0;
 
@@ -289,13 +348,19 @@ select:
     options:
       - "${BUTTON_ACTION_NONE_TEXT}"
       - "${BUTTON_1_ACTION_TEXT}"
+      - "${BUTTON_1_ACTION_FAILSAFE_TEXT}"
     initial_option: "${BUTTON_1_ACTION_TEXT}"
     optimistic: true
-    restore_value: true
+    restore_value: false
     internal: true
     entity_category: config
     disabled_by_default: false
     icon: mdi:dip-switch
+    on_value:
+      then:
+        - lambda: |-
+            id(button_actions_packed) = (id(button_actions_packed) & ~(0x0F << 0)) |
+                                        ((id(sl_button_1_action).active_index().value_or(1) & 0x0F) << 0);
 
   - id: sl_button_2_action
     name: Button 2 action
@@ -303,8 +368,14 @@ select:
     options:
       - "${BUTTON_ACTION_NONE_TEXT}"
       - "${BUTTON_2_ACTION_TEXT}"
+      - "${BUTTON_2_ACTION_FAILSAFE_TEXT}"
     initial_option: "${BUTTON_2_ACTION_TEXT}"
     <<: *button_select_action_base
+    on_value:
+      then:
+        - lambda: |-
+            id(button_actions_packed) = (id(button_actions_packed) & ~(0x0F << 4)) |
+                                        ((id(sl_button_2_action).active_index().value_or(1) & 0x0F) << 4);
 
   - id: sl_button_3_action
     name: Button 3 action
@@ -312,8 +383,14 @@ select:
     options:
       - "${BUTTON_ACTION_NONE_TEXT}"
       - "${BUTTON_3_ACTION_TEXT}"
+      - "${BUTTON_3_ACTION_FAILSAFE_TEXT}"
     initial_option: "${BUTTON_3_ACTION_TEXT}"
     <<: *button_select_action_base
+    on_value:
+      then:
+        - lambda: |-
+            id(button_actions_packed) = (id(button_actions_packed) & ~(0x0F << 8)) |
+                                        ((id(sl_button_3_action).active_index().value_or(1) & 0x0F) << 8);
 
   - id: sl_button_4_action
     name: Button 4 action
@@ -321,6 +398,12 @@ select:
     options:
       - "${BUTTON_ACTION_NONE_TEXT}"
       - "${BUTTON_4_ACTION_TEXT}"
+      - "${BUTTON_4_ACTION_FAILSAFE_TEXT}"
     initial_option: "${BUTTON_4_ACTION_TEXT}"
     <<: *button_select_action_base
+    on_value:
+      then:
+        - lambda: |-
+            id(button_actions_packed) = (id(button_actions_packed) & ~(0x0F << 12)) |
+                                        ((id(sl_button_4_action).active_index().value_or(1) & 0x0F) << 12);
 ...

ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_relays.yaml

@@ -1,439 +0,0 @@
-####################################################################################################
-#####                              TX Ultimate Easy for ESPHome                                #####
-#####                  Repository: https://github.com/edwardtfn/TX-Ultimate-Easy               #####
-####################################################################################################
-##### Purpose: ESPHome Core - Hardware - Relays                                                #####
-####################################################################################################
-##### 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:
-  RELAY_MODE_TEXT_SWITCH: "Switch"
-  RELAY_MODE_TEXT_LIGHT: "Light"
-  RELAY_MODE_TEXT_NOT_USED: "Not in use"
-
-globals:
-  - id: boot_initialization_relays
-    type: bool
-    restore_value: false
-    initial_value: 'false'
-
-light:
-  # These lights are used for the physical relays to be shown as lights
-  - id: light_output_1
-    name: Light output 1
-    output: output_relay_1
-    platform: binary
-    internal: true
-    on_turn_on:
-      then:
-        - if:
-            condition:
-              - switch.is_off: sw_relay_1
-            then:
-              - switch.turn_on: sw_relay_1
-    on_turn_off:
-      then:
-        - if:
-            condition:
-              - switch.is_on: sw_relay_1
-            then:
-              - switch.turn_off: sw_relay_1
-  - id: light_output_2
-    name: Light output 2
-    output: output_relay_2
-    platform: binary
-    internal: true
-    on_turn_on:
-      then:
-        - if:
-            condition:
-              - switch.is_off: sw_relay_2
-            then:
-              - switch.turn_on: sw_relay_2
-    on_turn_off:
-      then:
-        - if:
-            condition:
-              - switch.is_on: sw_relay_2
-            then:
-              - switch.turn_off: sw_relay_2
-  - id: light_output_3
-    name: Light output 3
-    output: output_relay_3
-    platform: binary
-    internal: true
-    on_turn_on:
-      then:
-        - if:
-            condition:
-              - switch.is_off: sw_relay_3
-            then:
-              - switch.turn_on: sw_relay_3
-    on_turn_off:
-      then:
-        - if:
-            condition:
-              - switch.is_on: sw_relay_3
-            then:
-              - switch.turn_off: sw_relay_3
-  - id: light_output_4
-    name: Light output 4
-    output: output_relay_4
-    platform: binary
-    internal: true
-    on_turn_on:
-      then:
-        - if:
-            condition:
-              - switch.is_off: sw_relay_4
-            then:
-              - switch.turn_on: sw_relay_4
-    on_turn_off:
-      then:
-        - if:
-            condition:
-              - switch.is_on: sw_relay_4
-            then:
-              - switch.turn_off: sw_relay_4
-
-output:
-  - id: output_relay_1
-    platform: gpio
-    pin: GPIO18
-
-  - id: output_relay_2
-    platform: gpio
-    pin: GPIO17
-
-  - id: output_relay_3
-    platform: gpio
-    pin: GPIO27
-
-  - id: output_relay_4
-    platform: gpio
-    pin: GPIO23
-
-script:
-  - id: !extend boot_initialize
-    then:
-      - script.execute: boot_initialize_relays
-
-  - id: boot_initialize_relays
-    mode: restart
-    then:
-      - wait_until:
-          condition:
-            - lambda: return sl_tx_model_format->active_index().has_value();
-            - lambda: return sl_tx_model_gang->active_index().has_value();
-      - lambda: |-
-          const bool is_model_us = sl_tx_model_format->active_index().has_value() and
-                                    sl_tx_model_format->active_index().value() == 1;
-          const uint8_t num_gangs = (sl_tx_model_gang->active_index().has_value()) ?
-                                    (sl_tx_model_gang->active_index().value() + 1) : 0;
-          if (num_gangs < 1 || num_gangs > 4) {
-            ESP_LOGE("core_hw_relays", "Invalid number of gangs: %" PRIu8, num_gangs);
-            return;
-          }
-          sl_relay_1_mode->set_internal(num_gangs < 1);
-          sl_relay_1_light_mode_eu->set_internal(is_model_us or num_gangs < 1);
-          sl_relay_1_light_mode_us->set_internal(!is_model_us or num_gangs < 1);
-          sl_relay_2_mode->set_internal(num_gangs < 2);
-          sl_relay_2_light_mode_eu->set_internal(is_model_us or num_gangs < 2);
-          sl_relay_2_light_mode_us->set_internal(!is_model_us or num_gangs < 2);
-          sl_relay_3_mode->set_internal(num_gangs < 3);
-          sl_relay_3_light_mode_eu->set_internal(is_model_us or num_gangs < 3);
-          sl_relay_3_light_mode_us->set_internal(!is_model_us or num_gangs < 3);
-          sl_relay_4_mode->set_internal(num_gangs < 4);
-          sl_relay_4_light_mode_eu->set_internal(is_model_us or num_gangs < 4);
-          sl_relay_4_light_mode_us->set_internal(!is_model_us or num_gangs < 4);
-          auto relay_mode_index = sl_relay_1_mode->active_index();
-          if (relay_mode_index.has_value()) {
-            light_output_1->set_internal(false or relay_mode_index.value() != 1);
-            sw_relay_1->set_internal(false or relay_mode_index.value() != 0);
-          }
-          relay_mode_index = sl_relay_2_mode->active_index();
-          if (relay_mode_index.has_value()) {
-            light_output_2->set_internal(num_gangs < 2 or relay_mode_index.value() != 1);
-            sw_relay_2->set_internal(num_gangs < 2 or relay_mode_index.value() != 0);
-          }
-          relay_mode_index = sl_relay_3_mode->active_index();
-          if (relay_mode_index.has_value()) {
-            light_output_3->set_internal(num_gangs < 3 or relay_mode_index.value() != 1);
-            sw_relay_3->set_internal(num_gangs < 3 or relay_mode_index.value() != 0);
-          }
-          relay_mode_index = sl_relay_4_mode->active_index();
-          if (relay_mode_index.has_value()) {
-            light_output_4->set_internal(num_gangs < 4 or relay_mode_index.value() != 1);
-            sw_relay_4->set_internal(num_gangs < 4 or relay_mode_index.value() != 0);
-          }
-          id(boot_initialization_relays) = true;
-
-  - id: !extend button_click_event
-    then:
-      - lambda: |-
-          // Handle only single clicks
-          if (click_count != 1)
-            return;
-
-          // Ignore if other touch events are active
-          if (bs_multi_touch->state ||
-              bs_swipe_left->state ||
-              bs_swipe_down->state ||
-              bs_swipe_right->state) {
-            return;
-          }
-
-          // Toggle relay if corresponding button action is enabled
-          ESP_LOGVV("core_hw_relays", "Toggle relays: (${BUTTON_ACTION_NONE_TEXT})");
-          ESP_LOGVV("core_hw_relays", "  Relay 1: %s (%s)",
-                    YESNO(sl_button_1_action->state != "${BUTTON_ACTION_NONE_TEXT}"),
-                    sl_button_1_action->state.c_str());
-          ESP_LOGVV("core_hw_relays", "  Relay 2: %s (%s)",
-                    YESNO(sl_button_2_action->state != "${BUTTON_ACTION_NONE_TEXT}"),
-                    sl_button_2_action->state.c_str());
-          ESP_LOGVV("core_hw_relays", "  Relay 3: %s (%s)",
-                    YESNO(sl_button_3_action->state != "${BUTTON_ACTION_NONE_TEXT}"),
-                    sl_button_3_action->state.c_str());
-          ESP_LOGVV("core_hw_relays", "  Relay 4: %s (%s)",
-                    YESNO(sl_button_4_action->state != "${BUTTON_ACTION_NONE_TEXT}"),
-                    sl_button_4_action->state.c_str());
-          switch (button) {
-            case ${BUTTON_1_ID}:
-              if (sl_button_1_action->state != "${BUTTON_ACTION_NONE_TEXT}") {
-                ESP_LOGV("core_hw_relays", "Toggle relay 1: (%s)", sl_button_1_action->state.c_str());
-                sw_relay_1->toggle();
-              } else {
-                ESP_LOGV("core_hw_relays", "Ignoring toggle for relay 1: action is '%s'",
-                          sl_button_1_action->state.c_str());
-              }
-              break;
-            case ${BUTTON_2_ID}:
-              if (sl_button_2_action->state != "${BUTTON_ACTION_NONE_TEXT}") {
-                ESP_LOGV("core_hw_relays", "Toggle relay 2: (%s)", sl_button_2_action->state.c_str());
-                sw_relay_2->toggle();
-              } else {
-                ESP_LOGV("core_hw_relays", "Ignoring toggle for relay 2: action is '%s'",
-                          sl_button_2_action->state.c_str());
-              }
-              break;
-            case ${BUTTON_3_ID}:
-              if (sl_button_3_action->state != "${BUTTON_ACTION_NONE_TEXT}") {
-                ESP_LOGV("core_hw_relays", "Toggle relay 3: (%s)", sl_button_3_action->state.c_str());
-                sw_relay_3->toggle();
-              } else {
-                ESP_LOGV("core_hw_relays", "Ignoring toggle for relay 3: action is '%s'",
-                          sl_button_3_action->state.c_str());
-              }
-              break;
-            case ${BUTTON_4_ID}:
-              if (sl_button_4_action->state != "${BUTTON_ACTION_NONE_TEXT}") {
-                ESP_LOGV("core_hw_relays", "Toggle relay 4: (%s)", sl_button_4_action->state.c_str());
-                sw_relay_4->toggle();
-              } else {
-                ESP_LOGV("core_hw_relays", "Ignoring toggle for relay 4: action is '%s'",
-                          sl_button_4_action->state.c_str());
-              }
-              break;
-          }
-
-  - id: show_relay_status
-    mode: restart
-    then:
-      - script.wait: boot_initialize_relays
-      - wait_until:
-          condition:
-            - lambda: return id(boot_initialization_relays);
-      - lambda: |-
-          const bool is_model_us = sl_tx_model_format->active_index().has_value() and
-                                    sl_tx_model_format->active_index().value() == 1;
-          const uint8_t num_gangs = (sl_tx_model_gang->active_index().has_value())
-                                      ? (sl_tx_model_gang->active_index().value() + 1)
-                                      : 0;
-
-          if (num_gangs < 1 || num_gangs > 4) {
-            ESP_LOGE("core_hw_relays", "Invalid number of gangs: %" PRIu8, num_gangs);
-            return;
-          }
-
-          for (uint8_t i = 0; i < num_gangs; i++) {
-            bool relay_state = false;
-            std::string light_mode;
-            const std::string light_mode_group_1 = is_model_us
-                                                    ? "${LIGHT_MODE_LEFT_TEXT}"
-                                                    : "${LIGHT_MODE_BOTTOM_TEXT}";
-            const std::string light_mode_group_2 = is_model_us
-                                                    ? "${LIGHT_MODE_RIGHT_TEXT}"
-                                                    : "${LIGHT_MODE_TOP_TEXT}";
-
-            // Determine relay state and light mode
-            switch (i) {
-              case 0:
-                relay_state = id(sw_relay_1).state;
-                light_mode = is_model_us
-                              ? id(sl_relay_1_light_mode_us)->state
-                              : id(sl_relay_1_light_mode_eu)->state;
-                break;
-              case 1:
-                relay_state = id(sw_relay_2).state;
-                light_mode = is_model_us
-                              ? id(sl_relay_2_light_mode_us)->state
-                              : id(sl_relay_2_light_mode_eu)->state;
-                break;
-              case 2:
-                relay_state = id(sw_relay_3).state;
-                light_mode = is_model_us
-                              ? id(sl_relay_3_light_mode_us)->state
-                              : id(sl_relay_3_light_mode_eu)->state;
-                break;
-              case 3:
-                relay_state = id(sw_relay_4).state;
-                light_mode = is_model_us
-                              ? id(sl_relay_4_light_mode_us)->state
-                              : id(sl_relay_4_light_mode_eu)->state;
-                break;
-            }
-
-            ESP_LOGV("core_hw_relays", "Relay %" PRIu8 " is %s", i + 1, relay_state ? "ON" : "OFF");
-            ESP_LOGV("core_hw_relays", "Light Mode for Relay %" PRIu8 ": %s", i + 1, light_mode.c_str());
-
-            // Use light_set_state for light updates
-            if (relay_state) {
-              if (light_mode == light_mode_group_1 || light_mode == "${LIGHT_MODE_BOTH_TEXT}") {
-                light_set_state->execute(1, i, true);  // Left/bottom light
-              }
-              if (light_mode == light_mode_group_2 || light_mode == "${LIGHT_MODE_BOTH_TEXT}") {
-                light_set_state->execute(2, i, true);  // Right/top light
-              }
-            } else {
-              light_set_state->execute(1, i, false);  // Turn off left/bottom light
-              light_set_state->execute(2, i, false);  // Turn off right/top light
-            }
-          }
-
-select:
-  - &relay_select_mode_base
-    id: sl_relay_1_mode
-    name: Relay 1 display mode
-    platform: template
-    options:
-      - "${RELAY_MODE_TEXT_SWITCH}"
-      - "${RELAY_MODE_TEXT_LIGHT}"
-      - "${RELAY_MODE_TEXT_NOT_USED}"
-    initial_option: "${RELAY_MODE_TEXT_SWITCH}"
-    optimistic: true
-    restore_value: true
-    internal: true
-    entity_category: config
-    disabled_by_default: false
-    icon: mdi:dip-switch
-
-  - id: sl_relay_2_mode
-    name: Relay 2 display mode
-    <<: *relay_select_mode_base
-
-  - id: sl_relay_3_mode
-    name: Relay 3 display mode
-    <<: *relay_select_mode_base
-
-  - id: sl_relay_4_mode
-    name: Relay 4 display mode
-    <<: *relay_select_mode_base
-
-switch:
-  - id: sw_relay_1
-    name: Relay 1
-    output: output_relay_1
-    platform: output
-    restore_mode: RESTORE_DEFAULT_OFF
-    internal: true
-    on_turn_on:
-      then:
-        - script.execute: show_relay_status
-        - if:
-            condition:
-              - light.is_off: light_output_1
-            then:
-              light.turn_on: light_output_1
-    on_turn_off:
-      then:
-        - script.execute: show_relay_status
-        - if:
-            condition:
-              - light.is_on: light_output_1
-            then:
-              - light.turn_off: light_output_1
-
-  - id: sw_relay_2
-    name: Relay 2
-    output: output_relay_2
-    platform: output
-    restore_mode: RESTORE_DEFAULT_OFF
-    internal: true
-    on_turn_on:
-      then:
-        - script.execute: show_relay_status
-        - if:
-            condition:
-              - light.is_off: light_output_2
-            then:
-              light.turn_on: light_output_2
-    on_turn_off:
-      then:
-        - script.execute: show_relay_status
-        - if:
-            condition:
-              - light.is_on: light_output_2
-            then:
-              - light.turn_off: light_output_2
-
-  - id: sw_relay_3
-    name: Relay 3
-    output: output_relay_3
-    platform: output
-    restore_mode: RESTORE_DEFAULT_OFF
-    internal: true
-    on_turn_on:
-      then:
-        - script.execute: show_relay_status
-        - if:
-            condition:
-              - light.is_off: light_output_3
-            then:
-              - light.turn_on: light_output_3
-    on_turn_off:
-      then:
-        - script.execute: show_relay_status
-        - if:
-            condition:
-              - light.is_on: light_output_3
-            then:
-              - light.turn_off: light_output_3
-
-  - id: sw_relay_4
-    name: Relay 4
-    output: output_relay_4
-    platform: output
-    restore_mode: RESTORE_DEFAULT_OFF
-    internal: true
-    on_turn_on:
-      then:
-        - script.execute: show_relay_status
-        - if:
-            condition:
-              - light.is_off: light_output_4
-            then:
-              - light.turn_on: light_output_4
-    on_turn_off:
-      then:
-        - script.execute: show_relay_status
-        - if:
-            condition:
-              - light.is_on: light_output_4
-            then:
-              - light.turn_off: light_output_4
-...

ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_touch.yaml

@@ -14,6 +14,8 @@
 substitutions:
   TOUCH_POSITION_MAX_VALUE: '10'  # Maximum touch position value returned by the touch pad via uart
 
+  TAG_CORE_HW_TOUCH: core.hw.touch
+
 binary_sensor:
   - &bs_button_event_template
     id: bs_button_event_template
@@ -198,14 +200,10 @@ binary_sensor:
             id: bs_swipe_down
             state: OFF  # yamllint disable-line rule:truthy
 
-external_components:
+esphome:
-  - source:
+  platformio_options:
-      type: git
+    build_flags:
-      url: https://github.com/edwardtfn/TX-Ultimate-Easy
+      - -D TX_ULTIMATE_EASY_CORE_HW_TOUCH
-      ref: v${version}
-    refresh: 1h
-    components:
-      - tx_ultimate_easy
 
 number:
   - id: nr_touch_duration
@@ -256,13 +254,8 @@ script:
   - id: boot_initialize_touch_gang
     mode: restart
     then:
-      - wait_until:
-          condition:
-            - lambda: return sl_tx_model_gang->active_index().has_value();
       - lambda: |-
-          const uint8_t num_gangs = (sl_tx_model_gang->active_index().has_value()) ?
+          tx_ultimate->set_gang_count(id(gang_count));
-                                    (sl_tx_model_gang->active_index().value() + 1) : 0;
-          tx_ultimate->set_gang_count(num_gangs);
           bs_button_1_click_event->publish_state(false);
           bs_button_2_click_event->publish_state(false);
           bs_button_3_click_event->publish_state(false);
@@ -275,18 +268,40 @@ script:
           bs_button_2_long_press_event->publish_state(false);
           bs_button_3_long_press_event->publish_state(false);
           bs_button_4_long_press_event->publish_state(false);
-          bs_button_1_click_event->set_internal(num_gangs < 1);
+          bs_button_1_click_event->set_internal(id(gang_count) < 1);
-          bs_button_2_click_event->set_internal(num_gangs < 2);
+          bs_button_2_click_event->set_internal(id(gang_count) < 2);
-          bs_button_3_click_event->set_internal(num_gangs < 3);
+          bs_button_3_click_event->set_internal(id(gang_count) < 3);
-          bs_button_4_click_event->set_internal(num_gangs < 4);
+          bs_button_4_click_event->set_internal(id(gang_count) < 4);
-          bs_button_1_double_click_event->set_internal(num_gangs < 1);
+          bs_button_1_double_click_event->set_internal(id(gang_count) < 1);
-          bs_button_2_double_click_event->set_internal(num_gangs < 2);
+          bs_button_2_double_click_event->set_internal(id(gang_count) < 2);
-          bs_button_3_double_click_event->set_internal(num_gangs < 3);
+          bs_button_3_double_click_event->set_internal(id(gang_count) < 3);
-          bs_button_4_double_click_event->set_internal(num_gangs < 4);
+          bs_button_4_double_click_event->set_internal(id(gang_count) < 4);
-          bs_button_1_long_press_event->set_internal(num_gangs < 1);
+          bs_button_1_long_press_event->set_internal(id(gang_count) < 1);
-          bs_button_2_long_press_event->set_internal(num_gangs < 2);
+          bs_button_2_long_press_event->set_internal(id(gang_count) < 2);
-          bs_button_3_long_press_event->set_internal(num_gangs < 3);
+          bs_button_3_long_press_event->set_internal(id(gang_count) < 3);
-          bs_button_4_long_press_event->set_internal(num_gangs < 4);
+          bs_button_4_long_press_event->set_internal(id(gang_count) < 4);
+
+  - id: !extend dump_config
+    then:
+      - lambda: |-
+          // Touch panel's state
+          if (sw_touch_panel_power->state)
+            ESP_LOGCONFIG("${TAG_CORE_HW_TOUCH}", "Touch panel - Power: On");
+          else
+            ESP_LOGW("${TAG_CORE_HW_TOUCH}", "Touch panel - Power: OFF");
+          ESP_LOGCONFIG("${TAG_CORE_HW_TOUCH}", "Touch event duration: %.0fms", nr_touch_duration->state);
+
+  - id: !extend dump_config_list_packages
+    then:
+      - script.wait: dump_config
+      - lambda: |-
+          // Check for requirements
+          #if !defined(TX_ULTIMATE_EASY_CORE_COMMON)
+            #error "The package TX-Ultimate-Easy-ESPHome_core_common.yaml is required."
+          #endif
+
+          // Identify itself
+          ESP_LOGCONFIG(ESPHOME_PROJECT_NAME, "  - Core - Hardware - Touchpad");
 
   - id: touch_on_multi_touch_release
     mode: restart
@@ -296,7 +311,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
@@ -351,88 +366,104 @@ switch:
     entity_category: config
 
 tx_ultimate_easy:
-  id: tx_ultimate
   uart: uart_touch
 
   on_long_touch_release:
     - lambda: |-
         const uint8_t touch_position = static_cast<uint8_t>(touch.x);
         if (touch_position > ${TOUCH_POSITION_MAX_VALUE}) {  // Check for valid range
-          ESP_LOGE("tx_ultimate_easy", "Invalid long-touch position: %" PRIu8, touch_position);
+          ESP_LOGE("${TAG_CORE_HW_TOUCH}", "Invalid long-touch position: %" PRIu8, touch_position);
         } else {
-          ESP_LOGI("tx_ultimate_easy", "Long-touch released at position %" PRIu8, touch_position);
+          ESP_LOGI("${TAG_CORE_HW_TOUCH}", "Long-touch released at position %" PRIu8, touch_position);
         }
 
   on_multi_touch_release:
-    - homeassistant.event:
+    then:
-        event: esphome.tx_ultimate_easy
+      - homeassistant.event:
-        data:
+          event: ${EVENT_NAME}
-          device_name: !lambda return tx_device_name->state.c_str();
+          data:
-          firmware: ${version}
+            device_name: !lambda return id(tx_device_name).state.c_str();
-          domain: touch
+            firmware: ${version}
-          type: multi_touch
+            domain: touch
-          action: release
+            type: multi_touch
-          position: !lambda return touch.x;
+            action: release
-    - lambda: ESP_LOGI("tx_ultimate_easy", "Multi-touch released");
+            position: !lambda return std::to_string(touch.x);
-    - script.execute: touch_on_multi_touch_release
+      - lambda: |-
+          ESP_LOGI("${TAG_CORE_HW_TOUCH}", "Multi-touch released");
+          touch_on_multi_touch_release->execute();
 
   on_press:
-    - lambda: |-
+    then:
-        const uint8_t position = static_cast<uint8_t>(touch.x);
+      - lambda: |-
-        if (position > ${TOUCH_POSITION_MAX_VALUE}) {  // Check for valid range
+          const uint8_t position = static_cast<uint8_t>(touch.x);
-          ESP_LOGE("tx_ultimate_easy", "Invalid touch position: %" PRIu8, position);
+          if (position > ${TOUCH_POSITION_MAX_VALUE}) {  // Check for valid range
-        } else {
+            ESP_LOGE("${TAG_CORE_HW_TOUCH}", "Invalid touch position: %" PRIu8, position);
-          ESP_LOGI("tx_ultimate_easy", "Pressed at position %" PRIu8, position);
+          } else {
-          touch_on_press->execute(static_cast<uint8_t>(touch.button), position);
+            ESP_LOGI("${TAG_CORE_HW_TOUCH}", "Pressed at position %" PRIu8, position);
-        }
+            touch_on_press->execute(static_cast<uint8_t>(touch.button), position);
+          }
 
   on_release:
-    - lambda: ESP_LOGI("tx_ultimate_easy", "Released");
+    then:
-    - script.execute: touch_on_release
+      - lambda: |-
+          ESP_LOGI("${TAG_CORE_HW_TOUCH}", "Released");
+      - script.execute: touch_on_release
 
   on_swipe_left:
-    - homeassistant.event:
+    then:
-        event: esphome.tx_ultimate_easy
+      - homeassistant.event:
-        data:
+          event: ${EVENT_NAME}
-          device_name: !lambda return tx_device_name->state.c_str();
+          data:
-          firmware: ${version}
+            device_name: !lambda return id(tx_device_name).state.c_str();
-          domain: touch
+            firmware: ${version}
-          type: swipe
+            domain: touch
-          action: !lambda |-
+            type: swipe
-            return sl_tx_model_format->state == "${TX_MODEL_FORMAT_US_TEXT}" ? "left" : "down";
+            action: !lambda |-
-          swipe-direction: !lambda |-
+              if (sl_tx_model_format->state == "${TX_MODEL_FORMAT_EU_TEXT}")
-            return sl_tx_model_format->state == "${TX_MODEL_FORMAT_US_TEXT}" ? "left" : "down";
+                return "left";
-          position: !lambda return touch.x;
+              else
-    - lambda: |-
+                return "down";
-        ESP_LOGI("tx_ultimate_easy", "Swipe %s", sl_tx_model_format->state == "${TX_MODEL_FORMAT_US_TEXT}"
+            swipe-direction: !lambda |-
-                                                  ? "left"
+              if (sl_tx_model_format->state == "${TX_MODEL_FORMAT_EU_TEXT}")
-                                                  : "down");
+                return "left";
-    - script.execute: touch_swipe_left
+              else
+                return "down";
+            position: !lambda return std::to_string(touch.x);
+      - lambda: |-
+          ESP_LOGI("${TAG_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:
+    then:
-        event: esphome.tx_ultimate_easy
+      - homeassistant.event:
-        data:
+          event: ${EVENT_NAME}
-          device_name: !lambda return tx_device_name->state.c_str();
+          data:
-          firmware: ${version}
+            device_name: !lambda return id(tx_device_name).state.c_str();
-          domain: touch
+            firmware: ${version}
-          type: swipe
+            domain: touch
-          action: !lambda |-
+            type: swipe
-            return sl_tx_model_format->state == "${TX_MODEL_FORMAT_US_TEXT}" ? "right" : "up";
+            action: !lambda |-
-          swipe-direction: !lambda |-
+              if (sl_tx_model_format->state == "${TX_MODEL_FORMAT_EU_TEXT}")
-            return sl_tx_model_format->state == "${TX_MODEL_FORMAT_US_TEXT}" ? "right" : "up";
+                return "right";
-          position: !lambda return touch.x;
+              else
-    - lambda: |-
+                return "up";
-        ESP_LOGI("tx_ultimate_easy", "Swipe %s", sl_tx_model_format->state == "${TX_MODEL_FORMAT_US_TEXT}"
+            swipe-direction: !lambda |-
-                                                  ? "right"
+              if (sl_tx_model_format->state == "${TX_MODEL_FORMAT_EU_TEXT}")
-                                                  : "up");
+                return "right";
-    - script.execute: touch_swipe_right
+              else
+                return "up";
+            position: !lambda return std::to_string(touch.x);
+      - lambda: |-
+          ESP_LOGI("${TAG_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: |-
-        ESP_LOGD("tx_ultimate_easy", "Touch event:");
+        ESP_LOGD("${TAG_CORE_HW_TOUCH}", "Touch event:");
-        ESP_LOGD("tx_ultimate_easy", "  State:    %i (%s)", touch.state, touch.state_str.c_str());
+        ESP_LOGD("${TAG_CORE_HW_TOUCH}", "  State:    %i (%s)", touch.state, touch.state_str.c_str());
-        ESP_LOGD("tx_ultimate_easy", "  Position: %i", touch.x);
+        ESP_LOGD("${TAG_CORE_HW_TOUCH}", "  Position: %i", touch.x);
 
 uart:
   - id: uart_touch

ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml

@@ -0,0 +1,20 @@
+####################################################################################################
+#####                              TX Ultimate Easy for ESPHome                                #####
+#####                  Repository: https://github.com/edwardtfn/TX-Ultimate-Easy               #####
+####################################################################################################
+##### Purpose: ESPHome Standard (non-essential, but recommended packages)                      #####
+####################################################################################################
+##### 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:
+  # yamllint disable rule:colons
+  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
+...

ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_audio.yaml

@@ -2,7 +2,7 @@
 #####                              TX Ultimate Easy for ESPHome                                #####
 #####                  Repository: https://github.com/edwardtfn/TX-Ultimate-Easy               #####
 ####################################################################################################
-##### Purpose: ESPHome Core - Add-on - BLE Proxy                                               #####
+##### Purpose: ESPHome - Standard - I2S Audio                                                  #####
 ####################################################################################################
 ##### Author: edwardtfn - https://github.com/edwardtfn - https://buymeacoffee.com/edwardfirmo  #####
 ####################################################################################################
@@ -11,39 +11,42 @@
 ##### - For normal system use, modifications to this file are NOT required.                    #####
 ####################################################################################################
 ---
-bluetooth_proxy:
+substitutions:
+  SWITCH_AUDIO_AMPLIFIER_RESTORE_MODE: RESTORE_DEFAULT_ON
 
-esp32:
+  TAG_STD_HW_AUDIO: std.hw.audio
-  framework:
-    type: esp-idf
-    sdkconfig_options:
-      CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST: "y"
-      CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY: "y"
-      CONFIG_ESP32_REV_MIN_3: "y"
-      CONFIG_MBEDTLS_DYNAMIC_BUFFER: "y"
-      CONFIG_MBEDTLS_DYNAMIC_FREE_CA_CERT: "y"
-      CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA: "y"
-      CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC: "y"
-      CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY: "y"
-      CONFIG_SPIRAM_RODATA: "y"
-      CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP: "y"
 
 esphome:
   platformio_options:
     build_flags:
-      - -D TX_ULTIMATE_EASY_ADDON_BLE_PROXY
+      - -D TX_ULTIMATE_EASY_STANDARD_HW_AUDIO
 
-i2s_audio: !remove
+i2s_audio:
+  - id: if_i2s_audio
+    i2s_bclk_pin: GPIO2
+    i2s_lrclk_pin: GPIO4
 
-light:
+script:
-  - id: !extend light_full
+  - id: !extend dump_config_list_packages
-    platform: esp32_rmt_led_strip
+    then:
-    rgb_order: GRB
+      - script.wait: dump_config
-    rmt_channel: 0
+      - lambda: |-
-    chipset: ws2812
+          // Check for requirements
-    type: !remove
+          #if !defined(TX_ULTIMATE_EASY_CORE_COMMON)
-    variant: !remove
+            #error "The package TX-Ultimate-Easy-ESPHome_core_common.yaml is required."
-    max_refresh_rate: 33ms
+          #endif
 
-media_player: !remove
+          // 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_speaker.yaml

@@ -0,0 +1,188 @@
+####################################################################################################
+#####                              TX Ultimate Easy for ESPHome                                #####
+#####                  Repository: https://github.com/edwardtfn/TX-Ultimate-Easy               #####
+####################################################################################################
+##### Purpose: ESPHome - Standard - Hardware - Speaker                                         #####
+####################################################################################################
+##### 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:
+  # RTTTL format: name:d=duration,o=octave,b=tempo:notes
+  # d=32 (32nd note), o=5 (octave 5), b=100 (tempo 100)
+  tone_volume_change: "scale_up:d=32,o=5,b=100:c,c#,d#,e,f#,g#,a#,b"  # Use "none" to disable sound
+
+  TAG_STD_HW_SPEAKER: std.hw.speaker
+
+packages:
+  standard_hw_audio: !include TX-Ultimate-Easy-ESPHome_standard_hw_audio.yaml
+
+api:
+  actions:
+    - action: rtttl_play
+      variables:
+        # The RTTTL string for the melody to be played.
+        # It should follow the RTTTL format, including the melody's name,
+        # default settings, and a sequence of notes.
+        tone: string
+      then:
+        - lambda: |-
+            rtttl_speaker->stop();
+            if (speaker_volume->state > 0) {
+              ESP_LOGI("${TAG_STD_HW_SPEAKER}", "Play tone: '%s'", tone.c_str());
+              rtttl_speaker->play(tone.c_str());
+            }
+
+esphome:
+  platformio_options:
+    build_flags:
+      - -D TX_ULTIMATE_EASY_STANDARD_HW_SPEAKER
+
+number:
+  - id: speaker_volume
+    name: Speaker Volume
+    platform: template
+    max_value: 100
+    min_value: 0
+    step: 1
+    initial_value: 100
+    unit_of_measurement: "%"
+    internal: false
+    disabled_by_default: true
+    entity_category: config
+    device_class: sound_pressure
+    restore_value: true
+    optimistic: true
+    set_action:
+      then:
+        - speaker.volume_set:
+            id: speaker_embedded
+            volume: !lambda return x/100.0f;
+        - lambda: |-
+            static const std::string tone_volume_change = "${tone_volume_change}";
+            // Play sound if tone_volume_change is not "none"
+            if (x > 0 and !tone_volume_change.empty() and tone_volume_change != "none")
+              rtttl_speaker->play(tone_volume_change);
+
+rtttl:
+  - id: rtttl_speaker
+    speaker: speaker_embedded
+
+script:
+  - id: !extend dump_config_list_packages
+    then:
+      - script.wait: dump_config
+      - lambda: |-
+          // Check for requirements
+          #if !defined(TX_ULTIMATE_EASY_CORE_COMMON)
+            #error "The package TX-Ultimate-Easy-ESPHome_core_common.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, "  - Standard - Hardware - Speaker");
+
+  - id: speaker_play_click
+    then:
+      - if:
+          condition:
+            not:
+              - speaker.is_playing: speaker_embedded
+          then:
+            - speaker.play:
+                id: speaker_embedded
+                data: [
+                  0x01, 0x02, 0x04, 0x06, 0x07, 0x08, 0x08, 0x06, 0x01, 0xFA, 0xF4,
+                  0xEF, 0xEE, 0xF1, 0xF7, 0xFF, 0x07, 0x0E, 0x11, 0x11, 0x10, 0x0C,
+                  0x06, 0xFF, 0xF8, 0xF1, 0xEC, 0xEA, 0xEC, 0xF2, 0xF9, 0xFF, 0x05,
+                  0x0A, 0x10, 0x14, 0x17, 0x17, 0x14, 0x0B, 0xFD, 0xED, 0xE0, 0xD9,
+                  0xDB, 0xE6, 0xF7, 0x0A, 0x19, 0x20, 0x1E, 0x14, 0x05, 0xF4, 0xE5,
+                  0xDF, 0xE4, 0xF4, 0x0C, 0x24, 0x36, 0x3D, 0x35, 0x20, 0xFF, 0xDD,
+                  0xC0, 0xAE, 0xA9, 0xB0, 0xC4, 0xE0, 0x03, 0x26, 0x48, 0x62, 0x70,
+                  0x6D, 0x59, 0x35, 0x08, 0xD8, 0xAC, 0x8D, 0x80, 0x85, 0x9C, 0xC1,
+                  0xF0, 0x21, 0x4E, 0x6F, 0x7F, 0x7A, 0x63, 0x3D, 0x0F, 0xE0, 0xB7,
+                  0x9B, 0x90, 0x96, 0xAC, 0xCE, 0xF6, 0x1D, 0x3C, 0x50, 0x55, 0x4D,
+                  0x3A, 0x20, 0x04, 0xEC, 0xD8, 0xCC, 0xC9, 0xCD, 0xD8, 0xE8, 0xF9,
+                  0x0A, 0x17, 0x1F, 0x20, 0x1C, 0x12, 0x07, 0xFC, 0xF2, 0xEC, 0xEB,
+                  0xED, 0xF3, 0xFA, 0x02, 0x0A, 0x10, 0x12, 0x12, 0x0E, 0x07, 0xFE,
+                  0xF5, 0xED, 0xEA, 0xEB, 0xEF, 0xF7, 0x00, 0x0A, 0x10, 0x13, 0x12,
+                  0x0F, 0x09, 0x02, 0xFB, 0xF5, 0xF3, 0xF2, 0xF3, 0xF6, 0xFB, 0xFF,
+                  0x03, 0x05, 0x07, 0x08, 0x07, 0x05, 0x03, 0x01, 0xFF, 0xFE, 0xFC,
+                  0xFB, 0xFB, 0xFC, 0xFC, 0xFD, 0xFE, 0xFF, 0x00, 0x01, 0x02, 0x02,
+                  0x01]
+
+            - wait_until:
+                condition:
+                  not:
+                    - speaker.is_playing: speaker_embedded
+            - speaker.stop: speaker_embedded
+
+  - id: !extend touch_on_multi_touch_release
+    then:
+      - script.execute: touch_on_multi_touch_release_speaker
+
+  - id: touch_on_multi_touch_release_speaker
+    mode: restart
+    then:
+      - lambda: |-
+          if (sl_touch_speaker_feedback->state != "Disabled")
+            speaker_play_click->execute();
+
+  - id: !extend touch_on_press
+    then:
+      - script.execute: touch_on_press_speaker
+
+  - id: touch_on_press_speaker
+    mode: restart
+    then:
+      - lambda: |-
+          if (sl_touch_speaker_feedback->state == "On press" or sl_touch_speaker_feedback->state == "Always")
+            speaker_play_click->execute();
+
+  - id: !extend touch_on_release
+    then:
+      - script.execute: touch_on_release_speaker
+
+  - id: touch_on_release_speaker
+    mode: restart
+    then:
+      - lambda: |-
+          if (sl_touch_speaker_feedback->state == "On release" or sl_touch_speaker_feedback->state == "Always")
+            speaker_play_click->execute();
+
+select:
+  - id: sl_touch_speaker_feedback
+    name: Touch - Speaker feedback
+    platform: template
+    options:
+      - "Disabled"
+      - "On press"
+      - "On release"
+      - "Always"
+    initial_option: "Disabled"
+    optimistic: true
+    restore_value: true
+    internal: false
+    entity_category: config
+    disabled_by_default: false
+    icon: mdi:vibrate
+
+speaker:
+  - id: speaker_embedded
+    platform: i2s_audio
+    dac_type: external
+    i2s_dout_pin: GPIO15
+    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_hw_vibration.yaml

@@ -2,7 +2,7 @@
 #####                              TX Ultimate Easy for ESPHome                                #####
 #####                  Repository: https://github.com/edwardtfn/TX-Ultimate-Easy               #####
 ####################################################################################################
-##### Purpose: ESPHome Core - Hardware - Vibration system                                      #####
+##### Purpose: ESPHome - Standard - Hardware - Vibration system                                #####
 ####################################################################################################
 ##### Author: edwardtfn - https://github.com/edwardtfn - https://buymeacoffee.com/edwardfirmo  #####
 ####################################################################################################
@@ -14,6 +14,8 @@
 substitutions:
   vibration_max_duration: 2s
 
+  TAG_STD_HW_VIBRATION: std.hw.vibration
+
 binary_sensor:
   - id: bs_vibrating
     name: Vibrating
@@ -32,6 +34,11 @@ button:
       then:
         - script.execute: vibrate
 
+esphome:
+  platformio_options:
+    build_flags:
+      - -D TX_ULTIMATE_EASY_STANDARD_HW_VIBRATION
+
 number:
   - id: nr_vibrating_duration
     name: Vibrate duration
@@ -53,6 +60,33 @@ ota:
       - switch.turn_off: sw_vibration_motor
 
 script:
+  - id: !extend dump_config
+    then:
+      - lambda: |-
+          // Configuration
+          ESP_LOGCONFIG("${TAG_STD_HW_VIBRATION}", "Touch - Vibration feedback: %s",
+                        sl_touch_vibration_feedback->state.c_str());
+          ESP_LOGCONFIG("${TAG_STD_HW_VIBRATION}", "Vibrate duration: %.0fms", nr_vibrating_duration->state);
+          ESP_LOGCONFIG("${TAG_STD_HW_VIBRATION}", "Vibrate max duration: ${vibration_max_duration}");
+
+          // State
+          if (bs_vibrating->state)
+            ESP_LOGW("${TAG_STD_HW_VIBRATION}", "Vibrating now: YES");
+          else
+            ESP_LOGCONFIG("${TAG_STD_HW_VIBRATION}", "Vibrating now: No");
+
+  - id: !extend dump_config_list_packages
+    then:
+      - script.wait: dump_config
+      - lambda: |-
+          // Check for requirements
+          #if !defined(TX_ULTIMATE_EASY_CORE_COMMON)
+            #error "The package TX-Ultimate-Easy-ESPHome_core_common.yaml is required."
+          #endif
+
+          // Identify itself
+          ESP_LOGCONFIG(ESPHOME_PROJECT_NAME, "  - Standard - Hardware - Vibration");
+
   - id: !extend touch_on_multi_touch_release
     then:
       - script.execute: touch_on_multi_touch_release_vibration
@@ -117,21 +151,17 @@ switch:
     pin: GPIO21
     restore_mode: ALWAYS_OFF
     internal: true
-    on_turn_on:
+    on_state:
       then:
         - binary_sensor.template.publish:
             id: bs_vibrating
-            state: ON  # yamllint disable-line rule:truthy
+            state: !lambda return x;
+    on_turn_on:
+      then:
         - delay: ${vibration_max_duration}
         - if:
             condition:
               switch.is_on: sw_vibration_motor
             then:
               - switch.turn_off: sw_vibration_motor
-    on_turn_off:
-      then:
-        - binary_sensor.template.publish:
-            id: bs_vibrating
-            state: OFF  # yamllint disable-line rule:truthy
-
 ...

ESPHome/TX-Ultimate-Easy-ESPHome_standard_media_player.yaml

@@ -0,0 +1,118 @@
+####################################################################################################
+#####                              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.                    #####
+####################################################################################################
+---
+substitutions:
+  TAG_STD_MEDIA_PLAYER: "std.media-player"
+
+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("${TAG_STD_MEDIA_PLAYER}", "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("${TAG_STD_MEDIA_PLAYER}", "Media Player Volume Sync:");
+          ESP_LOGCONFIG("${TAG_STD_MEDIA_PLAYER}", "  Persistent volume: %" PRIu8 "%",
+                                                    id(persistent_media_player_volume));
+          ESP_LOGCONFIG("${TAG_STD_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_COMMON)
+            #error "The package TX-Ultimate-Easy-ESPHome_core_common.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("${TAG_STD_MEDIA_PLAYER}", "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 -->
+<!-- markdownlint-disable MD013 MD033 -->
-| &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. |
+| &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,48 @@
 [buymeacoffee-shield]: https://img.shields.io/static/v1?label=Buy%20me%20an%20ice%20cream&message=❄&color=blue
 [buymeacoffee]: https://www.buymeacoffee.com/edwardfirmo
 
+> [!WARNING]
+> ESPHome builder v2025.8.0+ is required
+
+## 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 +112,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 +135,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
+### ESPHome Integration Setup
-2. Device flashing
+
-3. Home Assistant integration
+1. Install the ESPHome add-on in Home Assistant if not already installed:
-4. Basic configuration
+   - 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 duration
+   - 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,17 +371,18 @@ 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
 
 TX Ultimate Easy offers extensive configuration options:
 
-- Touch panel sensitivity and gestures
+- Touch panel gestures
 - LED colors, patterns, and behaviors
 - Relay modes and functions
 - Audio and haptic feedback settings
 - Network and connectivity options
+- Optional Bluetooth proxy functionality
 
 ## Contributing
 
@@ -154,8 +419,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](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.
 
@@ -166,5 +434,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,9 +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
+      - ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml                  # Core (essential) packages
-      # - ESPHome/TX-Ultimate-Easy-ESPHome_addon_ble_proxy.yaml  # Adds experimental BLE proxy support (limited)
+      - 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
 ...

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.core import CORE
-from esphome import automation
 
 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_light.cpp

@@ -0,0 +1,58 @@
+// tx_ultimate_easy_light.cpp
+
+#ifdef TX_ULTIMATE_EASY_CORE_HW_LEDS
+
+#include "esphome/core/log.h"
+#include "tx_ultimate_easy_light.h"
+#include <cinttypes>
+#include <string>
+
+namespace esphome {
+    namespace tx_ultimate_easy {
+
+        // Log tag
+        static const char *TAG = "tx_ultimate_easy.light";
+
+        // Constant definitions
+        const LightAttributes LIGHT_ATTRS_DEFAULT = {100, 255, 255, 255};
+        const uint32_t LIGHT_ATTRS_DEFAULT_PACKED = 0x64FFFFFF;
+        const uint64_t DEFAULT_DUAL_LIGHT_ATTRS_PACKED = 0x64FFFFFF64FFFFFF;
+
+        // Function implementations
+        uint32_t pack_light_attributes(const LightAttributes& attr) {
+            return (uint32_t(std::min(attr.brightness, uint8_t(100))) << 24) |
+                (uint32_t(attr.red) << 16) |
+                (uint32_t(attr.green) << 8) |
+                (uint32_t(attr.blue));
+        }
+
+        LightAttributes unpack_light_attributes(uint32_t packed) {
+            return {
+                .brightness = std::min(uint8_t((packed >> 24) & 0xFF), uint8_t(100)),
+                .red = uint8_t((packed >> 16) & 0xFF),
+                .green = uint8_t((packed >> 8) & 0xFF),
+                .blue = uint8_t(packed & 0xFF)
+            };
+        }
+
+        uint64_t pack_dual_light_attributes(const LightAttributes& group1_attrs, const LightAttributes& group2_attrs) {
+            uint32_t group1_packed = pack_light_attributes(group1_attrs);
+            uint32_t group2_packed = pack_light_attributes(group2_attrs);
+            
+            return (uint64_t(group2_packed) << 32) | uint64_t(group1_packed);
+        }
+        
+        std::pair<LightAttributes, LightAttributes> unpack_dual_light_attributes(uint64_t packed) {
+            uint32_t group1_packed = uint32_t(packed & 0xFFFFFFFF);          // Lower 32 bits
+            uint32_t group2_packed = uint32_t((packed >> 32) & 0xFFFFFFFF);  // Upper 32 bits
+            
+            return std::make_pair(
+                unpack_light_attributes(group1_packed),
+                unpack_light_attributes(group2_packed)
+            );
+        }
+
+    } // namespace tx_ultimate_easy
+} // namespace esphome
+
+#endif  // TX_ULTIMATE_EASY_CORE_HW_LEDS

components/tx_ultimate_easy/tx_ultimate_easy_light.h

@@ -0,0 +1,116 @@
+// tx_ultimate_easy_light.h
+
+#pragma once
+
+#ifdef TX_ULTIMATE_EASY_CORE_HW_LEDS
+
+#include "esphome/core/automation.h"
+#include "esphome/core/component.h"
+#include "esphome/components/uart/uart.h"
+#include "esphome/components/uart/uart_component.h"
+#include "esphome/components/binary_sensor/binary_sensor.h"
+#include "esphome/components/switch/switch.h"
+#include "esphome/components/light/addressable_light.h"
+#include <array>
+
+namespace esphome {
+    namespace tx_ultimate_easy {
+        /**
+        * @brief Light attributes structure for storing color and brightness data.
+        * 
+        * This structure represents the visual attributes of a light without the state (on/off).
+        * It's designed to be packed efficiently into a 32-bit integer for NVS storage.
+        * RGB components use the full 8-bit range (0-255) while brightness uses percentage (0-100).
+        */
+        struct LightAttributes {
+            uint8_t brightness;  ///< Light brightness percentage (0-100, where 100 = full brightness)
+            uint8_t red;         ///< Red color component (0-255)
+            uint8_t green;       ///< Green color component (0-255)  
+            uint8_t blue;        ///< Blue color component (0-255)
+        };
+
+        /**
+        * @brief Packs LightAttributes structure into a 32-bit integer for storage.
+        * 
+        * Bit layout: [brightness(8)][red(8)][green(8)][blue(8)]
+        * This allows efficient storage in ESPHome globals with restore_value support.
+        * Note: Brightness values > 100 will be clamped to 100 during packing.
+        * 
+        * @param attr The LightAttributes structure to pack
+        * @return uint32_t Packed representation suitable for NVS storage
+        * 
+        * @example
+        * LightAttributes attrs = {75, 255, 128, 64};
+        * uint32_t packed = pack_light_attributes(attrs);  // Returns 0x4BFF8040
+        */
+        uint32_t pack_light_attributes(const LightAttributes& attr);
+
+        /**
+        * @brief Unpacks a 32-bit integer back into LightAttributes structure.
+        * 
+        * Reverses the packing operation to extract individual color and brightness values.
+        * Brightness values > 100 in the packed data will be clamped to 100.
+        * 
+        * @param packed The packed 32-bit representation
+        * @return LightAttributes The unpacked structure with individual components
+        * 
+        * @example
+        * uint32_t packed = 0x4BFF8040;
+        * LightAttributes attrs = unpack_light_attributes(packed);
+        * // attrs.brightness = 75, attrs.red = 255, attrs.green = 128, attrs.blue = 64
+        */
+        LightAttributes unpack_light_attributes(uint32_t packed);
+
+        /**
+        * @brief Default light attributes for initialization.
+        * 
+        * Provides sensible defaults for new lights:
+        * - Brightness: 100 (full brightness)
+        * - Red: 255 (full intensity)
+        * - Green: 255 (full intensity) 
+        * - Blue: 255 (full intensity)
+        * Result: Pure white color at full brightness
+        */
+        extern const LightAttributes LIGHT_ATTRS_DEFAULT;
+
+        /**
+        * @brief Pre-packed version of DEFAULT_LIGHT_ATTRS for convenience.
+        * 
+        * This constant contains LIGHT_ATTRS_DEFAULT already packed into uint32_t format,
+        * suitable for direct use in ESPHome YAML initial_value fields.
+        * 
+        * Value: 0x64FFFFFF (brightness=100, RGB=255,255,255)
+        */
+        extern const uint32_t LIGHT_ATTRS_DEFAULT_PACKED;
+
+        /**
+        * @brief Packs two LightAttributes into a single uint64_t for dual light storage.
+        * 
+        * Bit layout: [group2_light(32)][group1_light(32)]
+        * Each light uses 32 bits: [brightness(8)][red(8)][green(8)][blue(8)]
+        * 
+        * @param group1_attrs First light attributes (stored in lower 32 bits)
+        * @param group2_attrs Second light attributes (stored in upper 32 bits)
+        * @return uint64_t Packed representation suitable for NVS storage
+        */
+        uint64_t pack_dual_light_attributes(const LightAttributes& group1_attrs, const LightAttributes& group2_attrs);
+
+        /**
+        * @brief Unpacks uint64_t back into two LightAttributes structures.
+        * 
+        * @param packed The packed 64-bit representation
+        * @return std::pair<LightAttributes, LightAttributes> Pair of (group1, group2) attributes
+        */
+        std::pair<LightAttributes, LightAttributes> unpack_dual_light_attributes(uint64_t packed);
+        
+        /**
+        * @brief Pre-packed version of dual default attributes for convenience.
+        * 
+        * Value: 0x64FFFFFF64FFFFFF (both lights: brightness=100, RGB=255,255,255)
+        */
+        extern const uint64_t DEFAULT_DUAL_LIGHT_ATTRS_PACKED;
+
+    } // namespace tx_ultimate_easy
+} // namespace esphome
+
+#endif  // TX_ULTIMATE_EASY_CORE_HW_LEDS

components/tx_ultimate_easy/tx_ultimate_easy_touch.cpp

@@ -1,12 +1,18 @@
-// tx_ultimate_easy.cpp
+// tx_ultimate_easy_touch.cpp
+
+#ifdef TX_ULTIMATE_EASY_CORE_HW_TOUCH
 
 #include "esphome/core/log.h"
-#include "tx_ultimate_easy.h"
+#include "tx_ultimate_easy_touch.h"
+#include <cinttypes>
 #include <string>
 
 namespace esphome {
     namespace tx_ultimate_easy {
 
+        // Log tag
+        static const char *TAG = "tx_ultimate_easy.touch";
+
         void TxUltimateEasy::setup() {
             ESP_LOGI(TAG, "TX Ultimate Easy is initialized");
         }
@@ -68,9 +74,10 @@ namespace esphome {
             if (this->gang_count_ == 1)
                 return 1;
 
-            // Calculate button number
+            // Calculate button width (rounds up to ensure full coverage)
-            const uint8_t width = (TOUCH_MAX_POSITION + 1) / this->gang_count_;  // Width of each button region
+            const uint8_t width =
-            if (width < 1 or width > this->gang_count_)  // Invalid width - and prevents division by zero
+                (TOUCH_MAX_POSITION + this->gang_count_) / this->gang_count_;  // Width of each button region
+            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
@@ -140,8 +147,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:
@@ -151,8 +186,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_PRESS && uart_received_bytes[5] != 0)
-            if (state == TOUCH_STATE_RELEASE && uart_received_bytes[5] == TOUCH_STATE_MULTI_TOUCH) state = TOUCH_STATE_MULTI_TOUCH;
+                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;
@@ -194,3 +231,5 @@ namespace esphome {
 
     } // namespace tx_ultimate_easy
 } // namespace esphome
+
+#endif  // TX_ULTIMATE_EASY_CORE_HW_TOUCH

components/tx_ultimate_easy/tx_ultimate_easy_touch.h

@@ -1,7 +1,9 @@
-// tx_ultimate_easy.h
+// tx_ultimate_easy_touch.h
 
 #pragma once
 
+#ifdef TX_ULTIMATE_EASY_CORE_HW_TOUCH
+
 #include "esphome/core/automation.h"
 #include "esphome/core/component.h"
 #include "esphome/components/uart/uart.h"
@@ -31,9 +33,6 @@ namespace esphome {
         constexpr int VALID_DATA_BYTE_2 = 0x01;
         constexpr int VALID_DATA_BYTE_3 = 0x02;
 
-        // Log tag
-        static const char *TAG = "tx_ultimate_easy";
-
         struct TouchPoint {
             uint8_t button = 0;
             int8_t x = -1;
@@ -84,3 +83,5 @@ namespace esphome {
 
     } // namespace tx_ultimate_easy
 } // namespace esphome
+
+#endif  // TX_ULTIMATE_EASY_CORE_HW_TOUCH

versioning/VERSION

@@ -1 +1 @@
-2024.12.10
+2025.10.1

versioning/VERSION_YAML

@@ -1 +1 @@
-version: 2024.12.10
+version: 2025.10.1