From e732c632cf9fdc317718ff06dc0e263b56dffd5b Mon Sep 17 00:00:00 2001 From: Florian Brinker Date: Sun, 20 Jan 2019 12:08:34 +0100 Subject: [PATCH] Implement Tradfri devices --- alexa.yaml | 14 +++- configuration.yaml | 3 + lovelace-views/kitchen.yaml | 7 ++ lovelace-views/livingroom.yaml | 114 ++++++++++++++++----------------- lovelace-views/overview.yaml | 2 +- lovelace-views/spotify.yaml | 5 +- switches.yaml | 3 + ui-lovelace.yaml | 1 + 8 files changed, 86 insertions(+), 63 deletions(-) create mode 100644 lovelace-views/kitchen.yaml diff --git a/alexa.yaml b/alexa.yaml index 28f5e86..477e982 100644 --- a/alexa.yaml +++ b/alexa.yaml @@ -6,11 +6,14 @@ filter: include_entities: - light.ambilight + - light.kuchen_theke + - switch.livingroom_stimmungslicht - switch.livingroom_music - switch.livingroom_netflix - switch.harmony_firetv - switch.harmony_steamlink - switch.harmony_playstation + - switch.harmony_denon_power # include_domains: # - switch # exclude_entities: @@ -18,9 +21,17 @@ entity_config: # switch.stairs: # display_categories: LIGHT + + # ACHTUNG: WHITELIST EBENFALLS ERGÄNZEN! light.ambilight: name: Ambilight description: Wohnzimmer - TV Ambilight + light.kuchen_theke: + name: Theke + description: Küche - Theken-Lichter + light.stimmungslicht: + name: Stimmungslicht + description: Wohnzimmer - Stimmungslicht switch.livingroom_music: name: Musik description: Wohnzimmer - Musik @@ -38,4 +49,5 @@ description: Harmony - Playstation switch.harmony_denon_power: name: Receiver - description: Harmony - Denon AVR \ No newline at end of file + description: Harmony - Denon AVR + # ACHTUNG: WHITELIST EBENFALLS ERGÄNZEN! \ No newline at end of file diff --git a/configuration.yaml b/configuration.yaml index f396ba3..4eb85b8 100644 --- a/configuration.yaml +++ b/configuration.yaml @@ -126,6 +126,9 @@ light: - platform: hyperion name: Ambilight host: !secret ambilight_ip + - platform: switch + name: Stimmungslicht + entity_id: switch.livingroom_stimmungslicht binary_sensor: - platform: workday diff --git a/lovelace-views/kitchen.yaml b/lovelace-views/kitchen.yaml new file mode 100644 index 0000000..2f6239f --- /dev/null +++ b/lovelace-views/kitchen.yaml @@ -0,0 +1,7 @@ +title: Küche +path: kitchen +cards: + # Lights + - type: light + entity: light.kuchen_theke + name: Küchen-Theke \ No newline at end of file diff --git a/lovelace-views/livingroom.yaml b/lovelace-views/livingroom.yaml index 4fb0abc..622392a 100644 --- a/lovelace-views/livingroom.yaml +++ b/lovelace-views/livingroom.yaml @@ -1,64 +1,64 @@ title: Wohnzimmer path: livingroom -panel: true cards: + # Lights - type: horizontal-stack cards: - - type: vertical-stack - cards: - - type: picture-glance - title: Harmony - entities: - - entity: switch.harmony_firetv - icon: mdi:television - - entity: switch.harmony_music_bt - icon: mdi:bluetooth-audio - - entity: switch.harmony_steamlink - icon: mdi:steam - - entity: switch.harmony_playstation - icon: mdi:playstation - state_image: - "PowerOff": /local/images/power.jpg - "Fire TV sehen": /local/images/firetv.jpg - "Musik Bluetooth": /local/images/music.jpg - "SteamLink": /local/images/steamlink.jpg - "PlayStation": /local/images/playstation.jpg - entity: sensor.harmony_activity + - type: light + entity: light.kuchen_theke + name: Küchen-Theke + - type: light + entity: light.stimmungslicht + name: Stimmungslicht + icon: mdi:lightbulb + - type: light + entity: light.ambilight + name: Ambilight - - type: conditional - conditions: - - entity: sensor.harmony_activity - state: "Musik Bluetooth" - card: - type: media-control - entity: media_player.spotify + # Denon + Harmony + - type: vertical-stack + cards: + # Denon + - type: picture-glance + title: Denon AVR + entities: + - entity: switch.harmony_volume_up + icon: mdi:volume-plus + - entity: switch.harmony_volume_down + icon: mdi:volume-minus + - entity: switch.harmony_denon_mute + icon: mdi:volume-off + - entity: switch.harmony_denon_power + icon: mdi:power + image: /local/images/denon.jpg + state_image: + "PowerOff": /local/images/denon-bw.jpg + entity: sensor.harmony_activity + # Harmony + - type: picture-glance + title: Harmony + entities: + - entity: switch.harmony_firetv + icon: mdi:television + - entity: switch.harmony_music_bt + icon: mdi:bluetooth-audio + - entity: switch.harmony_steamlink + icon: mdi:steam + - entity: switch.harmony_playstation + icon: mdi:playstation + state_image: + "PowerOff": /local/images/power.jpg + "Fire TV sehen": /local/images/firetv.jpg + "Musik Bluetooth": /local/images/music.jpg + "SteamLink": /local/images/steamlink.jpg + "PlayStation": /local/images/playstation.jpg + entity: sensor.harmony_activity - - type: vertical-stack - cards: - - type: picture-glance - title: Denon AVR - entities: - - entity: switch.harmony_denon_mute - icon: mdi:volume-off - - entity: switch.harmony_denon_power - icon: mdi:power - image: /local/images/denon.jpg - state_image: - "PowerOff": /local/images/denon-bw.jpg - entity: sensor.harmony_activity - - - type: conditional - conditions: - - entity: sensor.harmony_activity - state_not: "PowerOff" - card: - type: horizontal-stack - cards: - - type: entity-button - entity: switch.harmony_volume_down - name: Leiser - icon: mdi:volume-minus - - type: entity-button - entity: switch.harmony_volume_up - name: Lauter - icon: mdi:volume-plus \ No newline at end of file + # Spotify + - type: conditional + conditions: + - entity: sensor.harmony_activity + state: "Musik Bluetooth" + card: + type: media-control + entity: media_player.spotify \ No newline at end of file diff --git a/lovelace-views/overview.yaml b/lovelace-views/overview.yaml index f73fe1d..bb32e4c 100644 --- a/lovelace-views/overview.yaml +++ b/lovelace-views/overview.yaml @@ -23,6 +23,6 @@ cards: entities: - zone.home - type: glance - title: Geräte + title: Anwesenheit entities: - device_tracker.mobile_fb \ No newline at end of file diff --git a/lovelace-views/spotify.yaml b/lovelace-views/spotify.yaml index b334de8..57fba67 100644 --- a/lovelace-views/spotify.yaml +++ b/lovelace-views/spotify.yaml @@ -2,7 +2,4 @@ icon: mdi:spotify path: spotify cards: - type: media-control - entity: media_player.spotify - - type: glance - entities: - - light.ambilight \ No newline at end of file + entity: media_player.spotify \ No newline at end of file diff --git a/switches.yaml b/switches.yaml index b3f560d..2f6f446 100644 --- a/switches.yaml +++ b/switches.yaml @@ -53,6 +53,7 @@ activity: 'PowerOff' harmony_denon_mute: + friendly_name: Denon Stumm value_template: "{{ state_attr('remote.livingroom_harmony', 'current_activity') != 'PowerOff' }}" turn_on: service: remote.send_command @@ -72,6 +73,7 @@ delay_secs: 0.6 harmony_denon_power: + friendly_name: Denon Power value_template: "{{ state_attr('remote.livingroom_harmony', 'current_activity') != 'PowerOff' }}" turn_on: service: remote.send_command @@ -111,6 +113,7 @@ delay_secs: 0.6 harmony_volume_up: + friendly_name: Denon Lauter value_template: "{{ state_attr('remote.livingroom_harmony', 'current_activity') != 'PowerOff' }}" turn_on: service: remote.send_command diff --git a/ui-lovelace.yaml b/ui-lovelace.yaml index 4e48748..46fdbf2 100644 --- a/ui-lovelace.yaml +++ b/ui-lovelace.yaml @@ -2,6 +2,7 @@ title: Making Home Great Again views: - !include lovelace-views/overview.yaml + - !include lovelace-views/kitchen.yaml - !include lovelace-views/livingroom.yaml - !include lovelace-views/humidity.yaml - !include lovelace-views/spotify.yaml