From 698478251217f2920dca8268f003dd22335406b4 Mon Sep 17 00:00:00 2001 From: Georgi Gardev Date: Sat, 4 Apr 2020 14:37:24 +0300 Subject: [PATCH] Remove sonos leader for now --- config/lovelace/home_dashboard/00_home.yaml | 13 +++----- config/packages/modules/media/music.yaml | 34 ++++++--------------- config/packages/modules/speech.yaml | 6 ++-- config/packages/routines/leaving_home.yaml | 4 +-- 4 files changed, 18 insertions(+), 39 deletions(-) diff --git a/config/lovelace/home_dashboard/00_home.yaml b/config/lovelace/home_dashboard/00_home.yaml index 2487131..38e054f 100644 --- a/config/lovelace/home_dashboard/00_home.yaml +++ b/config/lovelace/home_dashboard/00_home.yaml @@ -55,14 +55,10 @@ cards: - media_player.shield - fan.philips_airpurifier - - type: custom:config-template-card - entities: - - input_select.sonos_leader - card: - type: custom:decluttering-card - template: sonos_media_player - variables: - - player: ${states['input_select.sonos_leader'].state} + - type: custom:decluttering-card + template: sonos_media_player + variables: + - player: media_player.master_bedroom - type: entities show_header_toggle: false @@ -73,7 +69,6 @@ cards: title: Manual controls show_header_toggle: false entities: - - input_select.sonos_leader - input_boolean.speech_notifications - input_boolean.guest_mode - input_boolean.domestina diff --git a/config/packages/modules/media/music.yaml b/config/packages/modules/media/music.yaml index 494120a..d70b38a 100644 --- a/config/packages/modules/media/music.yaml +++ b/config/packages/modules/media/music.yaml @@ -17,15 +17,6 @@ group: - media_player.kitchen - media_player.bathroom -input_select: - sonos_leader: - name: Sonos Leader - icon: mdi:speaker - options: - - media_player.master_bedroom - - media_player.living_room - - media_player.kitchen - binary_sensor: - platform: template sensors: @@ -39,13 +30,6 @@ binary_sensor: {% else %} False {% endif %} - sonos_leader_paused: - value_template: "{{ is_state(states.input_select.sonos_leader.state, 'paused') }}" - entity_id: - - input_select.sonos_leader - - media_player.master_bedroom - - media_player.kitchen - - media_player.living_room script: music_play: @@ -58,11 +42,11 @@ script: volume_level: "{{ volume_level | default(0.3) }}" - service: media_player.shuffle_set data_template: - entity_id: "{{ states('input_select.sonos_leader') }}" + entity_id: media_player.master_bedroom shuffle: "{{ shuffle | default(true) }}" - service: media_player.select_source data_template: - entity_id: "{{ states('input_select.sonos_leader') }}" + entity_id: media_player.master_bedroom source: "{{ playlist | default('Evening Chill') }}" music_join_sonoses: @@ -71,7 +55,7 @@ script: - service: sonos.join entity_id: group.all_sonos data_template: - master: "{{ states('input_select.sonos_leader') }}" + master: media_player.master_bedroom automation: - alias: Music · Play/Pause on Magic Cube Knock @@ -83,8 +67,8 @@ automation: command: knock action: - service: media_player.media_play_pause - data_template: - entity_id: "{{ states('input_select.sonos_leader') }}" + data: + entity_id: media_player.living_room - alias: Music · Volume down on Magic Cube rotate left trigger: @@ -95,8 +79,8 @@ automation: command: rotate_left action: - service: media_player.volume_down - data_template: - entity_id: "{{ states('input_select.sonos_leader') }}" + data: + entity_id: media_player.living_room - alias: Music · Volume up on Magic Cube rotate right trigger: @@ -107,5 +91,5 @@ automation: command: rotate_right action: - service: media_player.volume_up - data_template: - entity_id: "{{ states('input_select.sonos_leader') }}" + data: + entity_id: media_player.living_room diff --git a/config/packages/modules/speech.yaml b/config/packages/modules/speech.yaml index 2a25f8c..763de5f 100644 --- a/config/packages/modules/speech.yaml +++ b/config/packages/modules/speech.yaml @@ -50,7 +50,7 @@ script: sequence: # Figure out whether to talk or send a text. - service_template: > - {% if is_state(states('input_select.sonos_leader'), 'playing') + {% if is_state('media_player.master_bedroom', 'playing') or is_state('input_boolean.speech_notifications', 'off') or is_state('input_boolean.georgi_home', 'off') %} notify.telegram @@ -80,11 +80,11 @@ script: # Say message. - service: tts.amazon_polly_say data_template: - entity_id: "{{ states('input_select.sonos_leader') }}" + entity_id: media_player.master_bedroom message: "{{ message }}" # Wait for phrase to be over and mark as not talking. - delay: 00:00:01 - - wait_template: "{{ is_state('binary_sensor.sonos_leader_paused', 'on') }}" + - wait_template: "{{ is_state('media_player.master_bedroom', 'paused') }}" timeout: 00:02:00 - service: input_boolean.turn_off entity_id: input_boolean.sarah_talking diff --git a/config/packages/routines/leaving_home.yaml b/config/packages/routines/leaving_home.yaml index 1fa28a3..53c03a2 100644 --- a/config/packages/routines/leaving_home.yaml +++ b/config/packages/routines/leaving_home.yaml @@ -10,7 +10,7 @@ script: - media_player.nvidia_shield - media_player.living_room_tv - service: media_player.media_stop - data_template: - entity_id: "{{ states('input_select.sonos_leader') }}" + data: + entity_id: group.all_sonos - service: light.turn_off entity_id: light.all_lights