Use volume_down/up actions when VOLUME_SET is not available

Solves #2286
Blackymas · Nov 2, 2024 · f4cd561 · f4cd561
1 parent a120936
commit f4cd561
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 19 deletions.
diff --git a/esphome/nspanel_esphome_core_page_media_player.yaml b/esphome/nspanel_esphome_core_page_media_player.yaml
@@ -10,6 +10,8 @@ substitutions:
   BOOT_STEP_PAGE_MEDIA_PLAYER: '1UL << 20'
   PAGE_ID_MEDIA_PLAYER: '25'
   PAGE_NAME_MEDIA_PLAYER: "media_player"
+  COMPONENT_ID_MEDIA_PLAYER_BT_VOL_DOWN: '6'
+  COMPONENT_ID_MEDIA_PLAYER_BT_VOL_UP: '7'
   MEDIA_PLAYER_FEATURE_PAUSE: '1'
   MEDIA_PLAYER_FEATURE_SEEK: '2'
   MEDIA_PLAYER_FEATURE_VOLUME_SET: '4'
@@ -57,7 +59,7 @@ api:
         - lambda: |-
             if (id(current_page_id) == ${PAGE_ID_MEDIA_PLAYER}) {
               detailed_entity->publish_state(entity);
-              disp1->set_component_text("page_label", friendly_name.c_str());
+              set_component_text->execute("${PAGE_NAME_MEDIA_PLAYER}", "page_label", friendly_name.c_str());
               display_wrapped_text->execute("${PAGE_NAME_MEDIA_PLAYER}", "track", media_title.c_str(), id(display_mode) == 2 ? 16 : 27);
               display_wrapped_text->execute("${PAGE_NAME_MEDIA_PLAYER}", "artist", media_artist.c_str(), id(display_mode) == 2 ? 26 : 40);
 
@@ -108,16 +110,17 @@ api:
               const bool vol_slider_visible = (supported_features & ${MEDIA_PLAYER_FEATURE_VOLUME_SET});
               set_component_visibility->execute("${PAGE_NAME_MEDIA_PLAYER}", "vol_slider", vol_slider_visible);
               set_component_visibility->execute("${PAGE_NAME_MEDIA_PLAYER}", "vol_text", vol_slider_visible);
-              if (vol_slider_visible and volume_level != id(last_volume_level)) {
-                id(last_volume_level) = volume_level;
+              if (vol_slider_visible and volume_level != id(media_player_last_volume_level)) {
+                id(media_player_last_volume_level) = volume_level;
                 disp1->set_component_text_printf("vol_text", "%" PRIu32 "%%", volume_level);
                 set_component_value->execute("${PAGE_NAME_MEDIA_PLAYER}", "vol_slider", volume_level);
               }
 
               if (media_duration > 0) {
-                if (media_duration != id(last_media_duration) or media_position != id(last_media_position)) {
-                  id(last_media_duration) = media_duration;
-                  id(last_media_position) = media_position;
+                if (media_duration != id(media_player_last_media_duration) or
+                    media_position != id(media_player_last_media_position)) {
+                  id(media_player_last_media_duration) = media_duration;
+                  id(media_player_last_media_position) = media_position;
                   set_component_value->execute("${PAGE_NAME_MEDIA_PLAYER}", "prg_current",
                                                 int(round(min(media_position + media_position_delta, media_duration))));
                 }
@@ -132,24 +135,44 @@ api:
                 set_component_visibility->execute("${PAGE_NAME_MEDIA_PLAYER}", "time_total", false);
                 set_component_visibility->execute("${PAGE_NAME_MEDIA_PLAYER}", "time_progress", false);
               }
+              id(media_player_supported_features) = supported_features;
+            }
+
+display:
+  - id: !extend disp1
+    on_touch:
+      then:
+        - lambda: |-
+            if (page_id == ${PAGE_ID_MEDIA_PLAYER}) {
+              switch (component_id) {
+                case ${COMPONENT_ID_MEDIA_PLAYER_BT_VOL_DOWN}:
+                  if (touch_event and not (id(media_player_supported_features) & ${MEDIA_PLAYER_FEATURE_VOLUME_SET}))
+                    ha_call_action->execute("media_player.volume_down", "", "", detailed_entity->state.c_str());
+                  break;
+                case ${COMPONENT_ID_MEDIA_PLAYER_BT_VOL_UP}:
+                  if (touch_event and not (id(media_player_supported_features) & ${MEDIA_PLAYER_FEATURE_VOLUME_SET}))
+                    ha_call_action->execute("media_player.volume_up", "", "", detailed_entity->state.c_str());
+                  break;
+              }
             }
 
 globals:
-  ###### Last volume level from Home Assistant ######
-  - id: last_volume_level
+  - id: media_player_last_volume_level  # Last volume level from Home Assistant
     type: uint8_t
     restore_value: false
     initial_value: '0'
-  ###### Last duration from Home Assistant ######
-  - id: last_media_duration
+  - id: media_player_last_media_duration  # Last duration from Home Assistant
     type: uint
     restore_value: false
     initial_value: '0'
-  ###### Last duration from Home Assistant ######
-  - id: last_media_position
+  - id: media_player_last_media_position  # Last duration from Home Assistant
     type: uint
     restore_value: false
     initial_value: '0'
+  - id: media_player_supported_features
+    type: uint8_t
+    restore_value: false
+    initial_value: '0'
 
 script:
   - id: !extend boot_progress_dump
@@ -183,9 +206,10 @@ script:
           if (id(current_page_id) == ${PAGE_ID_MEDIA_PLAYER})
             page_media_player->execute();
           else {
-            id(last_volume_level) = 0;
-            id(last_media_duration) = 0;
-            id(last_media_position) = 0;
+            id(media_player_last_volume_level) = 0;
+            id(media_player_last_media_duration) = 0;
+            id(media_player_last_media_position) = 0;
+            id(media_player_supported_features) = 0;
           }
 
   - id: page_media_player

diff --git a/hmi/dev/nspanel_CJK_eu_code/media_player.txt b/hmi/dev/nspanel_CJK_eu_code/media_player.txt
@@ -112,7 +112,7 @@ Text bt_vol_up
         ID                 : 7
         Scope              : local
         Dragging           : 0
-        Send Component ID  : on press
+        Send Component ID  : on press and release
         Associated Keyboard: none
         Text               : îœ
         Max. Text Size     : 3

diff --git a/hmi/dev/nspanel_CJK_us_land_code/media_player.txt b/hmi/dev/nspanel_CJK_us_land_code/media_player.txt
@@ -112,7 +112,7 @@ Text bt_vol_up
         ID                 : 7
         Scope              : local
         Dragging           : 0
-        Send Component ID  : on press
+        Send Component ID  : on press and release
         Associated Keyboard: none
         Text               : îœ
         Max. Text Size     : 3

diff --git a/hmi/dev/nspanel_eu_code/media_player.txt b/hmi/dev/nspanel_eu_code/media_player.txt
@@ -112,7 +112,7 @@ Text bt_vol_up
         ID                 : 7
         Scope              : local
         Dragging           : 0
-        Send Component ID  : on press
+        Send Component ID  : on press and release
         Associated Keyboard: none
         Text               : îœ
         Max. Text Size     : 3

diff --git a/hmi/dev/nspanel_us_land_code/media_player.txt b/hmi/dev/nspanel_us_land_code/media_player.txt
@@ -112,7 +112,7 @@ Text bt_vol_up
         ID                 : 7
         Scope              : local
         Dragging           : 0
-        Send Component ID  : on press
+        Send Component ID  : on press and release
         Associated Keyboard: none
         Text               : îœ
         Max. Text Size     : 3

diff --git a/hmi/nspanel_CJK_eu.HMI b/hmi/nspanel_CJK_eu.HMI
diff --git a/hmi/nspanel_CJK_eu.tft b/hmi/nspanel_CJK_eu.tft
diff --git a/hmi/nspanel_CJK_us_land.HMI b/hmi/nspanel_CJK_us_land.HMI
diff --git a/hmi/nspanel_CJK_us_land.tft b/hmi/nspanel_CJK_us_land.tft
diff --git a/hmi/nspanel_eu.HMI b/hmi/nspanel_eu.HMI
diff --git a/hmi/nspanel_eu.tft b/hmi/nspanel_eu.tft
diff --git a/hmi/nspanel_us_land.HMI b/hmi/nspanel_us_land.HMI
diff --git a/hmi/nspanel_us_land.tft b/hmi/nspanel_us_land.tft