From 7e64d921015cb819f3fe495a20dbad4a07580237 Mon Sep 17 00:00:00 2001
From: Commander1024 <commander@commander1024.de>
Date: Thu, 4 May 2023 10:15:16 +0200
Subject: [PATCH] Another round of fixing the wireless speaker.

---
 automations.yaml                  | 22 +++-----
 esphome/raspiaudio-muse-luxe.yaml | 84 +++++++++++++++----------------
 2 files changed, 48 insertions(+), 58 deletions(-)

diff --git a/automations.yaml b/automations.yaml
index 95f03ff..6f3a2f9 100644
--- a/automations.yaml
+++ b/automations.yaml
@@ -82,21 +82,11 @@
       message: Gute Nacht!
   - service: media_player.play_media
     target:
-      entity_id: media_player.raspiaudio_muse_luxe_player
+      entity_id: media_player.raspiaudio_muse_luxe
     data:
-      media_content_id: media-source://tts/picotts_remote?message=Gute+Nacht%2C+schlaf+gut.
-      media_content_type: provider
-    metadata:
-      title: Gute Nacht, schlaf gut.
-      thumbnail: https://brands.home-assistant.io/_/picotts_remote/logo.png
-      media_class: app
-      children_media_class:
-      navigateIds:
-      - {}
-      - media_content_type: app
-        media_content_id: media-source://tts
-      - media_content_type: provider
-        media_content_id: media-source://tts/picotts_remote?message=Gute+Nacht%2C+schlaf+gut.
+      media_content_id: ''
+      media_content_type: ''
+    metadata: {}
   - service: media_player.turn_off
     target:
       area_id:
@@ -163,7 +153,7 @@
   - service: tts.picotts_remote_say
     data:
       cache: true
-      entity_id: media_player.raspiaudio_muse_luxe_player
+      entity_id: media_player.raspiaudio_muse_luxe
       message: Ab ins Bett! Schlafenszeit!
   mode: single
 - id: '1623954512941'
@@ -468,7 +458,7 @@
   - service: tts.picotts_remote_say
     data:
       cache: true
-      entity_id: media_player.raspiaudio_muse_luxe_player
+      entity_id: media_player.raspiaudio_muse_luxe
       message: '{% set t = now().hour %} {% set m = ''Morgen'' if t < 12 else ''Nachmittag''
         if t < 18 else ''Abend'' %} Guten {{m}} Marcus. Draußen sind es {{states.sensor.temperatur_aussen.state}}
         Grad Celsius und es ist {{states.sensor.time.state}}
diff --git a/esphome/raspiaudio-muse-luxe.yaml b/esphome/raspiaudio-muse-luxe.yaml
index 6d1cfe0..9667f42 100644
--- a/esphome/raspiaudio-muse-luxe.yaml
+++ b/esphome/raspiaudio-muse-luxe.yaml
@@ -2,19 +2,6 @@ substitutions:
   name: "raspiaudio-muse-luxe"
   friendly_name: "RaspiAudio Muse Luxe"
 
-esphome:
-  name: "${name}"
-  name_add_mac_suffix: False
-  project:
-    name: raspiaudio.muse-luxe
-    version: "1.0"
-
-esp32:
-  board: esp-wrover-kit
-  framework:
-    type: arduino
-
-logger:
 # Enable Home Assistant API
 api:
   encryption: 
@@ -22,10 +9,6 @@ api:
 ota:
   password: !secret ota
 
-i2c:
-  sda: GPIO18
-  scl: GPIO23
-
 wifi:
   ssid: Voltage-legacy
   password: !secret voltage_legacy_psk
@@ -37,6 +20,27 @@ wifi:
     ssid: "Raspiaudio Fallback Hotspot"
     password: !secret fallback_psk
 
+esphome:
+  name: "${name}"
+  name_add_mac_suffix: false
+  project:
+    name: raspiaudio.muse-luxe
+    version: "1.0"
+
+esp32:
+  board: esp-wrover-kit
+  framework:
+    type: arduino
+
+logger:
+
+i2c:
+  sda: GPIO18
+  scl: GPIO23
+
+dashboard_import:
+  package_import_url: github://esphome/media-players/raspiaudio-muse-luxe.yaml@main
+
 captive_portal:
 
 improv_serial:
@@ -47,12 +51,12 @@ external_components:
     refresh: 0s
 
 i2s_audio:
-  i2s_lrclk_pin: GPIO25
-  i2s_bclk_pin: GPIO5
+  - i2s_lrclk_pin: GPIO25
+    i2s_bclk_pin: GPIO5
 
 media_player:
   - platform: i2s_audio
-    name: ${friendly_name} Player
+    name: ${friendly_name}
     dac_type: external
     i2s_dout_pin: GPIO26
     mode: stereo
@@ -63,27 +67,23 @@ media_player:
 es8388:
 
 sensor:
-  - platform: adc
-    pin: GPIO33
-    name: ${name} Battery
-    icon: "mdi:battery-outline"
-    device_class: voltage
-    state_class: measurement
-    unit_of_measurement: V
-    update_interval: 15s
-    accuracy_decimals: 3
-    attenuation: 11db
-    raw: true
-    filters:
-      - multiply: 0.00173913 # 2300 -> 4, for attenuation 11db, based on Olivier's code
-      - exponential_moving_average:
-          alpha: 0.2
-          send_every: 2
-      - delta: 0.002
-# WiFi signal strength
-  - platform: wifi_signal
-    name: "WiFi Signalstärke"
-    update_interval: 60s
+ - platform: adc
+   pin: GPIO33
+   name: ${name} Battery
+   icon: "mdi:battery-outline"
+   device_class: voltage
+   state_class: measurement
+   unit_of_measurement: V
+   update_interval: 15s
+   accuracy_decimals: 3
+   attenuation: 11db
+   raw: true
+   filters:
+    - multiply: 0.00173913 # 2300 -> 4, for attenuation 11db, based on Olivier's code
+    - exponential_moving_average:
+        alpha: 0.2
+        send_every: 2
+    - delta: 0.002
 
 binary_sensor:
   - platform: gpio
@@ -119,7 +119,7 @@ binary_sensor:
 
 light:
   - platform: fastled_clockless
-    name: ${friendly_name} LED
+    name: ${friendly_name}
     pin: GPIO22
     chipset: SK6812
     num_leds: 1