Merge pull request #88 from edwardtfn/revert-to-media-player-as-default

edwardtfn · web-flow · commit fcbc92aaec71 · 2025-01-06T17:01:15.000+01:00
Revert to media player and neopixelbus as default
diff --git a/.github/workflows/validate_esphome_beta.yml b/.github/workflows/validate_esphome_beta.yml
@@ -8,10 +8,22 @@ permissions:
 on:  # yamllint disable-line rule:truthy
   push:
     paths:
-      - "**/*.{yml,yaml,h,cpp,c,py}"  # Match any file with the extensions in any directory
+      - "**/*.yml"
+      - "**/*.yaml"
+      - "**/*.h"
+      - "**/*.cpp"
+      - "**/*.c"
+      - "**/*.py"
+
   pull_request:
     paths:
-      - "**/*.{yml,yaml,h,cpp,c,py}"  # Match any file with the extensions in any directory
+      - "**/*.yml"
+      - "**/*.yaml"
+      - "**/*.h"
+      - "**/*.cpp"
+      - "**/*.c"
+      - "**/*.py"
+
   workflow_dispatch:
 
 concurrency:
diff --git a/.github/workflows/versioning.yml b/.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
@@ -56,10 +55,9 @@ jobs:
 
       - name: Update stable tag
         if: |
-          success() && (
-            github.event_name == 'workflow_dispatch' && inputs.update_stable ||
-            github.event_name == 'push'
-          )
+          success() &&
+          github.event_name == 'workflow_dispatch' &&
+          inputs.update_stable
         run: |
           # Verify version bump was successful
           if [ ! -f "./versioning/VERSION" ]; then
diff --git a/.test/common.yaml b/.test/common.yaml
@@ -0,0 +1,5 @@
+---
+wifi:
+  ssid: !secret wifi_ssid
+  password: !secret wifi_password
+...
diff --git a/.test/common_ard.yaml b/.test/common_ard.yaml
@@ -0,0 +1,8 @@
+---
+packages:
+  common: !include common.yaml
+
+esp32:
+  framework:
+    type: arduino
+...
diff --git a/.test/common_idf.yaml b/.test/common_idf.yaml
@@ -0,0 +1,19 @@
+---
+packages:
+  common: !include common.yaml
+
+esp32:
+  framework:
+    type: esp-idf
+
+light:
+  - id: !extend light_full
+    platform: esp32_rmt_led_strip
+    rgb_order: GRB
+    rmt_channel: 1
+    chipset: ws2812
+    max_refresh_rate: 33ms
+    use_psram: false
+    type: !remove
+    variant: !remove
+...
diff --git a/.test/common_idf53.yaml b/.test/common_idf53.yaml
@@ -0,0 +1,10 @@
+---
+packages:
+  common_idf: !include common_idf.yaml
+
+esp32:
+  framework:
+    type: esp-idf
+    version: 5.3.1
+    platform_version: 6.9.0
+...
diff --git a/.test/esphome_ard_basic.yaml b/.test/esphome_ard_basic.yaml
@@ -1,13 +1,6 @@
 ---
 packages:
+  common_arduino: !include common_ard.yaml
   core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
   standard_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml
-
-esp32:
-  framework:
-    type: arduino
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
diff --git a/.test/esphome_ard_ble_proxy.yaml b/.test/esphome_ard_ble_proxy.yaml
@@ -1,14 +1,7 @@
 ---
 packages:
+  common_arduino: !include common_ard.yaml
   core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
   standard_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml
   addon_bluetooth_proxy: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_addon_ble_proxy.yaml
-
-esp32:
-  framework:
-    type: arduino
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
diff --git a/.test/esphome_ard_core.yaml b/.test/esphome_ard_core.yaml
@@ -1,12 +1,5 @@
 ---
 packages:
+  common_arduino: !include common_ard.yaml
   core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
-
-esp32:
-  framework:
-    type: arduino
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
diff --git a/.test/esphome_ard_hw_relays.yaml b/.test/esphome_ard_hw_relays.yaml
@@ -1,13 +1,6 @@
 ---
 packages:
+  common_arduino: !include common_ard.yaml
   core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
   standard_hw_relays_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_relays.yaml
-
-esp32:
-  framework:
-    type: arduino
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
diff --git a/.test/esphome_ard_hw_speaker.yaml b/.test/esphome_ard_hw_speaker.yaml
@@ -1,13 +1,6 @@
 ---
 packages:
+  common_arduino: !include common_ard.yaml
   core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
   standard_hw_speaker_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_speaker.yaml
-
-esp32:
-  framework:
-    type: arduino
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
diff --git a/.test/esphome_ard_hw_vibration.yaml b/.test/esphome_ard_hw_vibration.yaml
@@ -1,13 +1,6 @@
 ---
 packages:
+  common_arduino: !include common_ard.yaml
   core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
   standard_hw_vibration_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_vibration.yaml
-
-esp32:
-  framework:
-    type: arduino
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
diff --git a/.test/esphome_ard_media_player.yaml b/.test/esphome_ard_media_player.yaml
@@ -1,15 +1,8 @@
 ---
 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
   standard_hw_vibration_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_vibration.yaml
   addon_media_player: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_addon_media_player.yaml
-
-esp32:
-  framework:
-    type: arduino
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
diff --git a/.test/esphome_idf53_basic.yaml b/.test/esphome_idf53_basic.yaml
@@ -1,15 +1,11 @@
 ---
 packages:
+  common_idf53: !include common_idf53.yaml
   core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
   standard_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml
 
-esp32:
-  framework:
-    type: esp-idf
-    version: 5.3.1
-    platform_version: 6.9.0
+media_player: !remove
 
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
+switch:
+  - id: !remove sw_speaker_amplifier
 ...
diff --git a/.test/esphome_idf53_ble_proxy.yaml b/.test/esphome_idf53_ble_proxy.yaml
@@ -1,5 +1,6 @@
 ---
 packages:
+  common: !include common.yaml
   core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
   standard_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml
   addon_bluetooth_proxy: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_addon_ble_proxy.yaml
@@ -9,8 +10,4 @@ esp32:
     type: esp-idf
     version: 5.3.1
     platform_version: 6.9.0
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
diff --git a/.test/esphome_idf53_core.yaml b/.test/esphome_idf53_core.yaml
@@ -1,14 +1,5 @@
 ---
 packages:
+  common_idf53: !include common_idf53.yaml
   core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
-
-esp32:
-  framework:
-    type: esp-idf
-    version: 5.3.1
-    platform_version: 6.9.0
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
diff --git a/.test/esphome_idf53_hw_relays.yaml b/.test/esphome_idf53_hw_relays.yaml
@@ -1,15 +1,6 @@
 ---
 packages:
+  common_idf53: !include common_idf53.yaml
   core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
   standard_hw_relays_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_relays.yaml
-
-esp32:
-  framework:
-    type: esp-idf
-    version: 5.3.1
-    platform_version: 6.9.0
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
diff --git a/.test/esphome_idf53_hw_speaker.yaml b/.test/esphome_idf53_hw_speaker.yaml
@@ -1,15 +1,6 @@
 ---
 packages:
+  common_idf53: !include common_idf53.yaml
   core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
   standard_hw_speaker_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_speaker.yaml
-
-esp32:
-  framework:
-    type: esp-idf
-    version: 5.3.1
-    platform_version: 6.9.0
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
diff --git a/.test/esphome_idf53_hw_vibration.yaml b/.test/esphome_idf53_hw_vibration.yaml
@@ -1,15 +1,6 @@
 ---
 packages:
+  common_idf53: !include common_idf53.yaml
   core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
   standard_hw_vibration_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_vibration.yaml
-
-esp32:
-  framework:
-    type: esp-idf
-    version: 5.3.1
-    platform_version: 6.9.0
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
diff --git a/.test/esphome_idf_basic.yaml b/.test/esphome_idf_basic.yaml
@@ -1,13 +1,11 @@
 ---
 packages:
+  common_idf: !include common_idf.yaml
   core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
   standard_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml
 
-esp32:
-  framework:
-    type: esp-idf
+media_player: !remove
 
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
+switch:
+  - id: !remove sw_speaker_amplifier
 ...
diff --git a/.test/esphome_idf_ble_proxy.yaml b/.test/esphome_idf_ble_proxy.yaml
@@ -1,14 +1,7 @@
 ---
 packages:
+  common: !include common.yaml
   core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
   standard_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml
   addon_bluetooth_proxy: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_addon_ble_proxy.yaml
-
-esp32:
-  framework:
-    type: esp-idf
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
diff --git a/.test/esphome_idf_core.yaml b/.test/esphome_idf_core.yaml
@@ -1,12 +1,5 @@
 ---
 packages:
+  common_idf: !include common_idf.yaml
   core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
-
-esp32:
-  framework:
-    type: esp-idf
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
diff --git a/.test/esphome_idf_hw_relays.yaml b/.test/esphome_idf_hw_relays.yaml
@@ -1,13 +1,6 @@
 ---
 packages:
+  common_idf: !include common_idf.yaml
   core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
   standard_hw_relays_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_relays.yaml
-
-esp32:
-  framework:
-    type: esp-idf
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
diff --git a/.test/esphome_idf_hw_speaker.yaml b/.test/esphome_idf_hw_speaker.yaml
@@ -1,13 +1,6 @@
 ---
 packages:
+  common_idf: !include common_idf.yaml
   core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
   standard_hw_speaker_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_speaker.yaml
-
-esp32:
-  framework:
-    type: esp-idf
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
diff --git a/.test/esphome_idf_hw_vibration.yaml b/.test/esphome_idf_hw_vibration.yaml
@@ -1,13 +1,6 @@
 ---
 packages:
+  common_idf: !include common_idf.yaml
   core_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
   standard_hw_vibration_package: !include ../ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_vibration.yaml
-
-esp32:
-  framework:
-    type: esp-idf
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
 ...
diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome.yaml
diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome_addon_ble_proxy.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome_addon_ble_proxy.yaml
diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome_core.yaml
diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome_core_common.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome_core_common.yaml
diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_leds.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome_core_hw_leds.yaml
diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome_standard.yaml
diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome_standard_media_player.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome_standard_media_player.yaml
diff --git a/README.md b/README.md
diff --git a/TX-Ultimate-Easy-ESPHome.yaml b/TX-Ultimate-Easy-ESPHome.yaml
diff --git a/TX-Ultimate-Easy-ESPHome_advanced.yaml b/TX-Ultimate-Easy-ESPHome_advanced.yaml
diff --git a/components/tx_ultimate_easy/__init__.py b/components/tx_ultimate_easy/__init__.py

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +wifi:
 +  ssid: !secret wifi_ssid
 +  password: !secret wifi_password
 +...