From 57ea9eeb670950dec7065510c203672ff645775d Mon Sep 17 00:00:00 2001 From: Georgi Gardev Date: Fri, 1 May 2020 21:44:16 +0300 Subject: [PATCH] Cleanup advanced dashboards --- config/advanced-lovelace.yaml | 3 - .../advanced_dashboard/03_kitchen.yaml | 95 ------- .../advanced_dashboard/05_hallway.yaml | 100 ------- .../advanced_dashboard/06_lights.yaml | 192 +++++++++++--- .../advanced_dashboard/08_remotes.yaml | 10 - .../home_dashboard/kitchen_dashboard.yaml | 246 +++++++++--------- 6 files changed, 289 insertions(+), 357 deletions(-) delete mode 100644 config/lovelace/advanced_dashboard/03_kitchen.yaml delete mode 100644 config/lovelace/advanced_dashboard/05_hallway.yaml delete mode 100644 config/lovelace/advanced_dashboard/08_remotes.yaml diff --git a/config/advanced-lovelace.yaml b/config/advanced-lovelace.yaml index 65e5474..5f932c5 100644 --- a/config/advanced-lovelace.yaml +++ b/config/advanced-lovelace.yaml @@ -14,11 +14,8 @@ views: - !include lovelace/advanced_dashboard/00_home.yaml - !include lovelace/advanced_dashboard/01_living_room.yaml - !include lovelace/advanced_dashboard/02_master_bedroom.yaml - - !include lovelace/advanced_dashboard/03_kitchen.yaml - - !include lovelace/advanced_dashboard/05_hallway.yaml - !include lovelace/advanced_dashboard/06_lights.yaml - !include lovelace/advanced_dashboard/07_media.yaml - - !include lovelace/advanced_dashboard/08_remotes.yaml - !include lovelace/advanced_dashboard/09_network.yaml - !include lovelace/advanced_dashboard/10_system.yaml - !include lovelace/advanced_dashboard/11_covid_19.yaml diff --git a/config/lovelace/advanced_dashboard/03_kitchen.yaml b/config/lovelace/advanced_dashboard/03_kitchen.yaml deleted file mode 100644 index f498ee7..0000000 --- a/config/lovelace/advanced_dashboard/03_kitchen.yaml +++ /dev/null @@ -1,95 +0,0 @@ -title: Kitchen -path: kitchen -icon: "mdi:chef-hat" -badges: [] -panel: true -cards: - - type: custom:mod-card - style: - layout-card: - $: - .: | - #columns { - padding: 0 10px; - } - #columns .column { - padding: 20px 10px; - } - card: - type: custom:layout-card - layout: horizontal - max_columns: 3 - cards: - - type: vertical-stack - cards: - - type: entities - title: Lights - entities: [] - - type: horizontal-stack - cards: - - type: custom:button-card - template: default - entity: light.tuya_kitchen_all_lights - name: All lights - - type: custom:button-card - template: default - entity: light.tuya_kitchen_main_lights - name: Main - - type: custom:button-card - template: default - entity: light.tuya_kitchen_secondary_lights - name: Secondary - - type: entities - show_header_toggle: false - entities: - - type: custom:fold-entity-row - entity: light.kitchen_main_lights - name: Main lights - entities: - - light.light_le_11 - - light.light_le_12 - - light.light_orbecco_1 - - type: custom:fold-entity-row - entity: light.kitchen_secondary_lights - name: Secondary lights - entities: - - light.light_le_5 - - light.light_le_6 - - light.light_le_9 - - light.light_le_10 - - - type: custom:decluttering-card - template: sonos_media_player - variables: - - player: media_player.kitchen - - type: vertical-stack - cards: - - type: glance - title: Sensors - entities: - - entity: binary_sensor.browser_kitchen - - entity: binary_sensor.motion_1_ias_zone - - entity: sensor.motion_1_illuminance - - entity: binary_sensor.motion_1_occupancy - - type: "custom:mini-graph-card" - animate: true - points_per_hour: 1 - hours_to_show: 48 - show: - graph: bar - average: true - extrema: true - entities: - - entity: sensor.motion_1_illuminance - - - type: vertical-stack - cards: - - type: entities - title: Brita Filter - icon: mdi:filter-outline - entities: - - input_number.brita_remaining_liters - - input_datetime.brita_next_change - - binary_sensor.brita_should_change_filter - - script.brita_new_filter - - script.brita_pour_water diff --git a/config/lovelace/advanced_dashboard/05_hallway.yaml b/config/lovelace/advanced_dashboard/05_hallway.yaml deleted file mode 100644 index 65c1b6e..0000000 --- a/config/lovelace/advanced_dashboard/05_hallway.yaml +++ /dev/null @@ -1,100 +0,0 @@ -title: Hallway -path: hallway -icon: "mdi:door-closed" -panel: true -cards: - - type: custom:mod-card - style: - layout-card: - $: - .: | - #columns { - padding: 0 10px; - } - #columns .column { - padding: 20px 10px; - } - card: - type: custom:layout-card - layout: horizontal - cards: - - type: vertical-stack - cards: - - type: entities - title: Lights - entities: [] - - - type: horizontal-stack - cards: - - type: custom:button-card - template: default - entity: light.hallway_all_lights - name: All lights - - type: custom:button-card - template: default - entity: light.hallway_entrance_lights - name: Entrance - - type: custom:button-card - template: default - entity: light.tuya_hallway_main_lights - name: Main - - - type: entities - show_header_toggle: false - entities: - - type: custom:fold-entity-row - entity: light.hallway_entrance_lights - name: Entrance lights - entities: - - type: custom:slider-entity-row - entity: light.hallway_entrance_lights - name: Brightness - hide_state: true - step: 5 - - type: custom:slider-entity-row - entity: light.hallway_entrance_lights - name: Temperature - attribute: color_temp - hide_state: true - min: 153 - max: 500 - step: 5 - - type: custom:decluttering-card - template: light_with_fade_and_switch - variables: - - light: light.light_lohas_5 - - fade: switch.light_lohas_5_fade - - wifi: sensor.light_lohas_5_wifi - - type: custom:decluttering-card - template: light_with_fade_and_switch - variables: - - light: light.light_lohas_6 - - fade: switch.light_lohas_6_fade - - wifi: sensor.light_lohas_6_wifi - - type: custom:fold-entity-row - entity: light.hallway_main_lights - name: Main lights - entities: - - light.light_le_7 - - light.light_le_8 - - - type: vertical-stack - cards: - - type: glance - title: Sensors - entities: - - entity: binary_sensor.motion_2_ias_zone - - entity: sensor.motion_2_illuminance - - entity: binary_sensor.motion_2_occupancy - - entity: sensor.motion_2_power - - - type: "custom:mini-graph-card" - animate: true - points_per_hour: 1 - hours_to_show: 48 - show: - graph: bar - average: true - extrema: true - entities: - - entity: sensor.motion_2_illuminance diff --git a/config/lovelace/advanced_dashboard/06_lights.yaml b/config/lovelace/advanced_dashboard/06_lights.yaml index 2170e28..de0da53 100644 --- a/config/lovelace/advanced_dashboard/06_lights.yaml +++ b/config/lovelace/advanced_dashboard/06_lights.yaml @@ -17,36 +17,129 @@ cards: card: type: custom:layout-card layout: horizontal + max_columns: 2 cards: - type: entities title: Living room icon: mdi:sofa show_header_toggle: false entities: - - light.living_room_all_lights - - type: divider - - light.living_room_main_lights - - light.light_lohas_1 - - light.light_lohas_2 - - light.light_lohas_3 - - light.light_lohas_4 - - type: divider - - light.pc + - type: custom:slider-entity-row + entity: light.living_room_all_lights + name: All lights + toggle: true + step: 5 + - type: custom:fold-entity-row + head: + entity: light.living_room_main_lights + name: Main lights + entities: + - type: custom:slider-entity-row + entity: light.living_room_main_lights + name: Brightness + hide_state: true + step: 5 + - type: custom:slider-entity-row + entity: light.living_room_main_lights + name: Temperature + attribute: color_temp + hide_state: true + min: 153 + max: 500 + step: 5 + - type: custom:decluttering-card + template: light_with_fade_and_switch + variables: + - light: light.light_le_1 + - fade: switch.light_le_1_fade + - wifi: sensor.light_le_1_wifi + - type: custom:decluttering-card + template: light_with_fade_and_switch + variables: + - light: light.light_le_2 + - fade: switch.light_le_2_fade + - wifi: sensor.light_le_2_wifi + - type: custom:decluttering-card + template: light_with_fade_and_switch + variables: + - light: light.light_le_3 + - fade: switch.light_le_3_fade + - wifi: sensor.light_le_3_wifi + - type: custom:decluttering-card + template: light_with_fade_and_switch + variables: + - light: light.light_le_4 + - fade: switch.light_le_4_fade + - wifi: sensor.light_le_4_wifi + - type: custom:fold-entity-row + head: + type: custom:decluttering-card + template: light_with_fade_and_switch + variables: + - light: light.pc + - fade: switch.pc_light_fade + - wifi: sensor.pc_light_wifi + entities: + - type: custom:slider-entity-row + entity: light.pc + name: Brightness + hide_state: true + step: 5 - type: entities title: Master bedroom icon: mdi:bed-empty show_header_toggle: false entities: - - light.master_bedroom_all_lights - - type: divider - - light.master_bedroom_main_lights - - light.light_lohas_1 - - light.light_lohas_2 - - light.light_lohas_3 - - light.light_lohas_4 - - type: divider + - type: custom:slider-entity-row + entity: light.master_bedroom_all_lights + name: All lights + toggle: true + step: 5 + - type: custom:fold-entity-row + head: + entity: light.master_bedroom_main_lights + name: Main lights + entities: + - type: custom:slider-entity-row + entity: light.master_bedroom_main_lights + name: Brightness + hide_state: true + step: 5 + - type: custom:slider-entity-row + entity: light.master_bedroom_main_lights + name: Temperature + attribute: color_temp + hide_state: true + min: 153 + max: 500 + step: 5 + - type: custom:decluttering-card + template: light_with_fade_and_switch + variables: + - light: light.light_lohas_1 + - fade: switch.light_lohas_1_fade + - wifi: sensor.light_lohas_1_wifi + - type: custom:decluttering-card + template: light_with_fade_and_switch + variables: + - light: light.light_lohas_2 + - fade: switch.light_lohas_2_fade + - wifi: sensor.light_lohas_2_wifi + - type: custom:decluttering-card + template: light_with_fade_and_switch + variables: + - light: light.light_lohas_3 + - fade: switch.light_lohas_3_fade + - wifi: sensor.light_lohas_3_wifi + - type: custom:decluttering-card + template: light_with_fade_and_switch + variables: + - light: light.light_lohas_4 + - fade: switch.light_lohas_4_fade + - wifi: sensor.light_lohas_4_wifi - light.bedside_light + - light.bed_led - type: entities title: Kitchen @@ -56,17 +149,23 @@ cards: - light.tuya_kitchen_all_lights - type: divider - light.tuya_kitchen_main_lights - - light.kitchen_main_lights - - light.light_le_11 - - light.light_le_12 - - light.light_orbecco_1 + - type: custom:fold-entity-row + entity: light.kitchen_main_lights + name: Main lights + entities: + - light.light_le_11 + - light.light_le_12 + - light.light_orbecco_1 - type: divider - light.tuya_kitchen_secondary_lights - - light.kitchen_secondary_lights - - light.light_le_5 - - light.light_le_6 - - light.light_le_9 - - light.light_le_10 + - type: custom:fold-entity-row + entity: light.kitchen_secondary_lights + name: Secondary lights + entities: + - light.light_le_5 + - light.light_le_6 + - light.light_le_9 + - light.light_le_10 - type: entities title: Hallway @@ -75,11 +174,40 @@ cards: entities: - light.hallway_all_lights - type: divider - - light.hallway_entrance_lights - - light.light_lohas_5 - - light.light_lohas_6 + - type: custom:fold-entity-row + entity: light.hallway_entrance_lights + name: Entrance lights + entities: + - type: custom:slider-entity-row + entity: light.hallway_entrance_lights + name: Brightness + hide_state: true + step: 5 + - type: custom:slider-entity-row + entity: light.hallway_entrance_lights + name: Temperature + attribute: color_temp + hide_state: true + min: 153 + max: 500 + step: 5 + - type: custom:decluttering-card + template: light_with_fade_and_switch + variables: + - light: light.light_lohas_5 + - fade: switch.light_lohas_5_fade + - wifi: sensor.light_lohas_5_wifi + - type: custom:decluttering-card + template: light_with_fade_and_switch + variables: + - light: light.light_lohas_6 + - fade: switch.light_lohas_6_fade + - wifi: sensor.light_lohas_6_wifi - type: divider - light.tuya_hallway_main_lights - - light.hallway_main_lights - - light.light_le_7 - - light.light_le_8 + - type: custom:fold-entity-row + entity: light.hallway_main_lights + name: Main lights + entities: + - light.light_le_7 + - light.light_le_8 diff --git a/config/lovelace/advanced_dashboard/08_remotes.yaml b/config/lovelace/advanced_dashboard/08_remotes.yaml deleted file mode 100644 index 1ba959c..0000000 --- a/config/lovelace/advanced_dashboard/08_remotes.yaml +++ /dev/null @@ -1,10 +0,0 @@ -title: Remotes -path: remotes -icon: mdi:remote -cards: - - type: horizontal-stack - cards: - - type: custom:decluttering-card - template: hdmi_switch_remote_card - - type: custom:decluttering-card - template: bulsatcom_remote_card diff --git a/config/lovelace/home_dashboard/kitchen_dashboard.yaml b/config/lovelace/home_dashboard/kitchen_dashboard.yaml index 7a86c7b..457bd0e 100644 --- a/config/lovelace/home_dashboard/kitchen_dashboard.yaml +++ b/config/lovelace/home_dashboard/kitchen_dashboard.yaml @@ -12,12 +12,12 @@ card: type: custom:layout-card layout: horizontal - max_columns: 1 + max_columns: 2 cards: - type: vertical-stack - title: Lights cards: - type: horizontal-stack + title: Lights cards: - type: custom:button-card template: default @@ -45,123 +45,135 @@ card: - height: 46px - - type: horizontal-stack - title: Devices - cards: - - type: custom:decluttering-card - template: brita_water_card - - type: custom:button-card - template: default - entity: media_player.nvidia_shield - name: TV - icon: mdi:television - tap_action: - action: toggle - state: - - value: 'playing' - styles: &on_styles - card: - - background-color: var(--primary-color) - - color: black - icon: - - color: black - - value: 'standby' - styles: *on_styles - - value: 'on' - styles: *on_styles - - value: 'home' - styles: *on_styles - - value: 'idle' - styles: *on_styles - - type: custom:button-card - template: default - entity: switch.titanium_power + - type: horizontal-stack + title: Devices + cards: + - type: custom:decluttering-card + template: brita_water_card + - type: custom:button-card + template: default + entity: media_player.nvidia_shield + name: TV + icon: mdi:television + tap_action: + action: toggle + state: + - value: 'playing' + styles: &on_styles + card: + - background-color: var(--primary-color) + - color: black + icon: + - color: black + - value: 'standby' + styles: *on_styles + - value: 'on' + styles: *on_styles + - value: 'home' + styles: *on_styles + - value: 'idle' + styles: *on_styles + - type: custom:button-card + template: default + entity: switch.titanium_power + + - type: vertical-stack + cards: + - type: vertical-stack + title: Media + cards: + - type: custom:decluttering-card + template: sonos_media_player + variables: + - player: media_player.kitchen + - sync_volume: false + - type: horizontal-stack + cards: + - type: custom:button-card + template: xs + entity: sensor.philip_defranco + name: PDS + tap_action: + action: call-service + service: script.youtube_play_latest_pds + - type: custom:button-card + template: xs + entity: script.music_play + name: Chill + icon: mdi:music + tap_action: + action: toggle + - type: custom:button-card + template: xs + entity: script.music_play + name: Retro + icon: mdi:music + tap_action: + action: call-service + service: script.music_play + service_data: + playlist: "Retro" + - type: custom:button-card + template: + - xs + - with_state_background + entity: binary_sensor.sonos_is_bedroom_master + name: Bedroom + icon: mdi:speaker-multiple + tap_action: + action: call-service + service: script.sonos_join_bedroom + - type: custom:button-card + template: + - xs + - with_state_background + entity: binary_sensor.sonos_is_living_room_master + name: TV + icon: mdi:speaker-multiple + tap_action: + action: call-service + service: script.sonos_join_tv + + - type: horizontal-stack + cards: + - type: custom:button-card + template: + - default + - with_state_indicator + entity: binary_sensor.motion_1_ias_zone + name: Motion + variables: + state_indicator_id: automation.lighting_kitchen_day_mode_motion_turn_lights_on_after_sunset + - type: custom:button-card + template: + - small + - progress + entity: sensor.motion_1_illuminance + name: Lux + variables: + min_value: 0 + max_value: 1000 + normal_value: 1000 + - type: custom:button-card + template: + - default + - with_state_indicator + entity: binary_sensor.motion_2_ias_zone + name: Hallway + variables: + state_indicator_id: automation.lighting_hallway_day_mode_motion_turn_lights_on - type: vertical-stack cards: - type: vertical-stack - title: Media + title: Brita cards: - - type: custom:decluttering-card - template: sonos_media_player - variables: - - player: media_player.kitchen - - sync_volume: false - - type: horizontal-stack - cards: - - type: custom:button-card - template: xs - entity: sensor.philip_defranco - name: PDS - tap_action: - action: call-service - service: script.youtube_play_latest_pds - - type: custom:button-card - template: xs - entity: script.music_play - name: Chill - icon: mdi:music - tap_action: - action: toggle - - type: custom:button-card - template: xs - entity: script.music_play - name: Retro - icon: mdi:music - tap_action: - action: call-service - service: script.music_play - service_data: - playlist: "Retro" - - type: custom:button-card - template: - - xs - - with_state_background - entity: binary_sensor.sonos_is_bedroom_master - name: Bedroom - icon: mdi:speaker-multiple - tap_action: - action: call-service - service: script.sonos_join_bedroom - - type: custom:button-card - template: - - xs - - with_state_background - entity: binary_sensor.sonos_is_living_room_master - name: TV - icon: mdi:speaker-multiple - tap_action: - action: call-service - service: script.sonos_join_tv - - - type: horizontal-stack - cards: - - type: custom:button-card - template: - - xs - - with_state_background - - with_state_indicator - entity: binary_sensor.motion_1_ias_zone - name: Motion - variables: - state_indicator_id: automation.lighting_kitchen_day_mode_motion_turn_lights_on_after_sunset - - type: custom:button-card - template: - - xs - - progress - entity: sensor.motion_1_illuminance - name: Lux - variables: - min_value: 0 - max_value: 1000 - normal_value: 1000 - - type: custom:button-card - template: - - xs - - with_state_background - - with_state_indicator - entity: binary_sensor.motion_2_ias_zone - name: Hallway - variables: - state_indicator_id: automation.lighting_hallway_day_mode_motion_turn_lights_on - + - type: entities + title: Brita Filter + icon: mdi:filter-outline + entities: + - input_number.brita_remaining_liters + - input_datetime.brita_next_change + - binary_sensor.brita_should_change_filter + - script.brita_new_filter + - script.brita_pour_water