From 912607d1ecc590c8f5a7edad22953123b6efb73f Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Wed, 30 Jul 2025 07:28:05 +0200
Subject: [PATCH] Refine speaker settings for esp-idf

Solves #95
---
 ...timate-Easy-ESPHome_standard_hw_audio.yaml |  8 +++---
 ...mate-Easy-ESPHome_standard_hw_speaker.yaml | 15 +++++++++++
 ...te-Easy-ESPHome_standard_media_player.yaml | 25 +++++++++++--------
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_audio.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_audio.yaml
index e13658d..63253ac 100644
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_audio.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_audio.yaml
@@ -17,11 +17,9 @@ esphome:
       - -D TX_ULTIMATE_EASY_STANDARD_HW_AUDIO
 
 i2s_audio:
-  id: if_i2s_audio
-  i2s_bclk_pin: GPIO2
-  i2s_lrclk_pin: GPIO4
-  i2s_comm_fmt: stand_msb
-  channel: mono
+  - id: if_i2s_audio
+    i2s_bclk_pin: GPIO2
+    i2s_lrclk_pin: GPIO4
 
 script:
   - id: !extend dump_config_list_packages
diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_speaker.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_speaker.yaml
index 0bfe4ad..774181c 100644
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_speaker.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_standard_hw_speaker.yaml
@@ -179,4 +179,19 @@ speaker:
     i2s_audio_id: if_i2s_audio
     i2s_comm_fmt: stand_msb
     channel: mono
+    #timeout: never
+    #bits_per_sample: 16bit
+    #sample_rate: 48000
+    #buffer_duration: 500ms
+
+switch:
+  - id: sw_speaker_amplifier
+    name: Speaker - Amplifier
+    platform: gpio
+    pin:
+      number: GPIO26
+      inverted: true
+    restore_mode: ALWAYS_OFF
+    internal: true
+    entity_category: config
 ...
diff --git a/ESPHome/TX-Ultimate-Easy-ESPHome_standard_media_player.yaml b/ESPHome/TX-Ultimate-Easy-ESPHome_standard_media_player.yaml
index 2759029..accb35e 100644
--- a/ESPHome/TX-Ultimate-Easy-ESPHome_standard_media_player.yaml
+++ b/ESPHome/TX-Ultimate-Easy-ESPHome_standard_media_player.yaml
@@ -24,10 +24,24 @@ 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_announcement:
+    #  - mixer_speaker.apply_ducking:
+    #      id: media_speaker_embedded
+    #      decibel_reduction: 20
+    #      duration: 0.0s
 
 script:
   - id: !extend dump_config_list_packages
@@ -58,15 +72,4 @@ speaker:
   - platform: resampler
     id: media_spk_resampling_input
     output_speaker: media_speaker_embedded
-
-switch:
-  - id: sw_speaker_amplifier
-    name: Speaker - Amplifier
-    platform: gpio
-    pin:
-      number: GPIO26
-      inverted: true
-    restore_mode: RESTORE_DEFAULT_ON
-    internal: true
-    entity_category: config
 ...