Update HA, add vacuum, grid cards, fixes

2021-03-21 18:41:41 +01:00
--- a/config/alerts/windows.yaml
+++ b/config/alerts/windows.yaml
@@ -30,13 +30,13 @@ garage_door_open:
  name: Garagentor geöffnet
  message: "Zur Info - Die *Garage* steht noch *offen*!"
  done_message: "Zur Info - Die *Garage* ist wieder *geschlossen*."
-  entity_id: binary_sensor.lumi_garage_door
+  entity_id: binary_sensor.garage_door
  state: "on"
  repeat:
    - 10
    - 30
  can_acknowledge: true
-  skip_first: true
+  skip_first: false
  notifiers:
    - telegram_group
    - alexa_all
--- a/config/alexa.yaml
+++ b/config/alexa.yaml
@@ -1,6 +1,7 @@
 # Display Categories: https://developer.amazon.com/de/docs/device-apis/alexa-discovery.html#display-categories
  smart_home:
-    endpoint: https://api.amazonalexa.com/v3/events
+    endpoint: https://api.eu.amazonalexa.com/v3/events
+    locale: de-DE
    client_id: !secret alexa_client_id
    client_secret: !secret alexa_client_secret
    filter:
@@ -13,6 +14,7 @@
        - light.onair
        - light.stimmungslicht
        - light.lichterkette
+        - light.philips_iris
        - switch.livingroom_music
        - switch.livingroom_netflix
        - switch.harmony_firetv
@@ -20,6 +22,7 @@
        - switch.harmony_playstation
        - switch.harmony_denon_power
        - switch.desktop_wol
+        - switch.desktop_jenny_wol
        - switch.wallboard_display
        - switch.tplink1
        - switch.osram_plug_01_57b6060a_on_off
@@ -43,7 +46,7 @@
        name: Esstisch
        description: Esstisch-Lichter
      light.office_rgb:
-        name: Büro
+        name: Bürolicht
        description: Büro - Deckenlampe
      light.lichtleiste:
        name: Schreibtischlicht
@@ -57,6 +60,9 @@
      light.onair:
        name: Studio-Treppe
        description: Studio-Treppenlicht
+      light.philips_iris:
+        name: Iris
+        description: Studio-Stimmungslicht
      switch.livingroom_music:
        name: Musik
        description: Wohnzimmer - Musik
@@ -78,6 +84,9 @@
      switch.desktop_wol:
        name: Computer
        description: Computer im Büro
+      switch.desktop_jenny_wol:
+        name: Ronny
+        description: Jennys Computer
      switch.wallboard_display:
        name: Display
        description: Wallboard Display
--- a/config/automations/livingroom.yaml
+++ b/config/automations/livingroom.yaml
@@ -1,3 +1,69 @@
+- alias: Christmas-Tree on
+  trigger:
+    - platform: time
+      at:
+        - "05:30:00"
+        - "16:00:00"
+    - platform: zone
+      entity_id:
+        - person.jenny
+      zone: zone.home
+      event: enter
+  action:
+    service: light.turn_on
+    data:
+      entity_id:
+        - light.weihnachtsbaum
+
+- alias: Christmas-Tree off morning
+  trigger:
+    - platform: time
+      at:
+        - "08:00:00"
+  condition:
+    condition: not
+    conditions:
+      - condition: zone
+        entity_id: person.jenny
+        zone: zone.home
+  action:
+    service: light.turn_off
+    data:
+      entity_id:
+        - light.weihnachtsbaum
+
+- alias: Christmas-Tree off evening
+  trigger:
+    - platform: time
+      at:
+        - "23:00:00"
+  action:
+    service: light.turn_off
+    data:
+      entity_id:
+        - light.weihnachtsbaum
+
+- alias: Christmas-Tree off Presence
+  trigger:
+    - platform: zone
+      entity_id:
+        - person.jenny
+        - person.florian
+      zone: zone.home
+      event: leave
+  condition:
+    - condition: zone
+      entity_id:
+        - person.jenny
+        - person.florian
+      zone: zone.not_home
+  action:
+    service: light.turn_off
+    data:
+      entity_id:
+        - light.weihnachtsbaum
+
+
 - alias: Ambilight HDMI
  trigger:
    platform: state
--- a/config/automations/wallboard.yaml
+++ b/config/automations/wallboard.yaml
@@ -1,25 +1,25 @@
- alias: Wallboard On
-  trigger:
-    - platform: state
-      entity_id: binary_sensor.anyone_home
-      to: 'on'
-    - platform: state
-      entity_id: sensor.harmony_activity
-      from: 'Fire TV sehen'
-  action:
-    service: switch.turn_on
-    data:
-      entity_id: switch.wallboard_display
+#- alias: Wallboard On
+#  trigger:
+#    - platform: state
+#      entity_id: binary_sensor.anyone_home
+#      to: 'on'
+#    - platform: state
+#      entity_id: sensor.harmony_activity
+#      from: 'Fire TV sehen'
+#  action:
+#    service: switch.turn_on
+#    data:
+#      entity_id: switch.wallboard_display

- alias: Wallboard Off
-  trigger:
-    - platform: state
-      entity_id: binary_sensor.anyone_home
-      to: 'off'
-    - platform: state
-      entity_id: sensor.harmony_activity
-      to: 'Fire TV sehen'
-  action:
-    service: switch.turn_off
-    data:
-      entity_id: switch.wallboard_display
+#- alias: Wallboard Off
+#  trigger:
+#    - platform: state
+#      entity_id: binary_sensor.anyone_home
+#      to: 'off'
+#    - platform: state
+#      entity_id: sensor.harmony_activity
+#      to: 'Fire TV sehen'
+#  action:
+#    service: switch.turn_off
+#    data:
+#      entity_id: switch.wallboard_display
--- a/config/cameras.yaml
+++ b/config/cameras.yaml
@@ -1,9 +1,12 @@
- platform: reolink_dev
-  host: !secret cam_livingroom_ip
-  username: !secret cam_livingroom_user
-  password: !secret cam_livingroom_password
-  name: livingroom
-  stream: main
-  protocol: rtmp
-  channel: 0
-  scan_interval: 30
+- platform: generic
+  name: deebot_dobby_live_map
+  still_image_url: "https://hass.f-brinker.de/local/vacuums/Dobby_liveMap.png"
+#- platform: reolink_dev
+#  host: !secret cam_livingroom_ip
+#  username: !secret cam_livingroom_user
+#  password: !secret cam_livingroom_password
+#  name: livingroom
+#  stream: main
+#  protocol: rtmp
+#  channel: 0
+#  scan_interval: 30
--- a/config/customizations/misc.yaml
+++ b/config/customizations/misc.yaml
@@ -1,4 +1,11 @@
 person.jenny:
  entity_picture: "/local/avatars/jenny-bty.jpg"
 person.florian:
-  entity_picture: "/local/avatars/flo-mtb.jpg"
+  entity_picture: "/local/avatars/flo-mtb.jpg"
+
+device_tracker.sm_g985f:
+  entity_picture: "/local/avatars/jenny-bty.jpg"
+  icon: mdi:cellphone
+device_tracker.pixely:
+  entity_picture: "/local/avatars/flo-mtb.jpg"
+  icon: mdi:cellphone
--- a/config/google_assistant.yaml
+++ b/config/google_assistant.yaml
@@ -0,0 +1,63 @@
+# https://console.actions.google.com/u/0/project/home-assistant-e12c3/overview
+project_id: !secret google_project_id
+service_account: !include google_assistant_service_keys.json
+report_state: true
+expose_by_default: false
+exposed_domains:
+  - switch
+  - light
+entity_config:
+  light.ambilight:
+    name: Ambilight
+    room: Wohnzimmer
+  light.kuchen_theke:
+    name: Küche
+    room: Küche
+  light.esstisch:
+    name: Esstisch
+    room: Wohnzimmer
+  light.office_rgb:
+    name: Büro
+    room: Büro
+  light.lichtleiste:
+    name: Schreibtischlicht
+    room: Büro
+  light.stimmungslicht:
+    name: Stimmungslicht
+    room: Wohnzimmer
+  light.lichterkette:
+    name: Lichterkette
+    room: Garten
+  light.weihnachtsbaum:
+    name: Weihnachtsbaum
+    room: Wohnzimmer
+  light.onair:
+    name: Studio-Treppe
+    room: Studio
+  switch.livingroom_music:
+    name: Musik
+    room: Wohnzimmer
+  switch.harmony_firetv:
+    name: Fernseher
+    room: Wohnzimmer
+  switch.harmony_steamlink:
+    name: Konsole
+    room: Wohnzimmer
+  switch.harmony_playstation:
+    name: Playstation
+    room: Wohnzimmer
+  switch.harmony_denon_power:
+    name: Receiver
+    room: Wohnzimmer
+  switch.desktop_wol:
+    name: Computer
+    room: Büro
+  switch.wallboard_display:
+    name: Display
+    room: Wohnzimmer
+  switch.osram_plug_01_57b6060a_on_off:
+    name: Ring
+    room: Studio
+  switch.onair_lamp_recording:
+    name: Aufnahme
+    room: Studio
--- a/config/lights.yaml
+++ b/config/lights.yaml
@@ -1,7 +1,16 @@
-  - platform: hyperion
-    name: Ambilight
-    host: !secret ambilight_ip
-    hdmi_priority: 900
+  - platform: group
+    name: Küchen-Theke
+    entities:
+      - light.kitchen1
+      - light.kitchen2
+  - platform: group
+    name: Esstisch
+    entities:
+      - light.dining1
+      - light.dining2
+#  - platform: hyperion
+#    name: Ambilight
+#    host: !secret ambilight_ip
  - platform: group
    name: onAir
    entities:
@@ -9,7 +18,7 @@
      - light.innr_gu10_rgb_2
  - platform: switch
    name: Lichterkette
-    entity_id: switch.innr_steckdose
+    entity_id: switch.garden_chain_of_lights
  - platform: switch
    name: Stimmungslicht
-    entity_id: switch.livingroom_stimmungslicht
+    entity_id: switch.moodlight
--- a/config/scripts/robots.yaml
+++ b/config/scripts/robots.yaml
@@ -0,0 +1,54 @@
+vacuum_living_room:
+  alias: "Wohnzimmer saugen"
+  sequence:
+    - service: vacuum.send_command
+      data:
+        entity_id: vacuum.dobby
+        command: spot_area
+        params:
+          rooms: 0
+          cleanings: 1
+
+vacuum_kitchen:
+  alias: "Küche saugen"
+  sequence:
+    - service: vacuum.send_command
+      data:
+        entity_id: vacuum.dobby
+        command: spot_area
+        params:
+          rooms: 1
+          cleanings: 1
+
+vacuum_corridor:
+  alias: "Flur saugen"
+  sequence:
+    - service: vacuum.send_command
+      data:
+        entity_id: vacuum.dobby
+        command: spot_area
+        params:
+          rooms: 2
+          cleanings: 1
+
+vacuum_laundry:
+  alias: "HWR saugen"
+  sequence:
+    - service: vacuum.send_command
+      data:
+        entity_id: vacuum.dobby
+        command: spot_area
+        params:
+          rooms: 3
+          cleanings: 1
+
+vacuum_dining_room:
+  alias: "Esszimmer saugen"
+  sequence:
+    - service: vacuum.send_command
+      data:
+        entity_id: vacuum.dobby
+        command: spot_area
+        params:
+          rooms: 4
+          cleanings: 1
--- a/config/sensors/devices.yaml
+++ b/config/sensors/devices.yaml
@@ -1,5 +0,0 @@
-  - platform: template
-    sensors:
-      device_mobile_fb_battery:
-        value_template: '{{ states.device_tracker.mobile_fb.attributes.battery }}'
-        unit_of_measurement: '%'
--- a/config/sensors_binary/cctv.yaml
+++ b/config/sensors_binary/cctv.yaml
@@ -1,9 +0,0 @@
-  - platform: template
-    sensors:
-      motion_livingroom:
-        friendly_name: Motion Livingroom
-        device_class: motion
-        entity_id: camera.livingroom
-        value_template: "{{ is_state('camera.livingroom', 'motion') }}"
-        delay_off:
-          seconds: 30
--- a/config/sensors_binary/misc.yaml
+++ b/config/sensors_binary/misc.yaml
@@ -14,6 +14,12 @@
    count: 2
    scan_interval: 15

+  - platform: ping
+    name: desktop_jenny_ping
+    host: !secret desktop_jenny_ip
+    count: 2
+    scan_interval: 15
+
  - platform: template
    sensors:
      anyone_home:
--- a/config/sensors_binary/wallboard.yaml
+++ b/config/sensors_binary/wallboard.yaml
@@ -1,6 +1,6 @@
-  - platform: command_line
-    name: Wallboard HDMI Status
-    command: !secret wallboard_hdmi_status_cmd
-    payload_on: display_power=1
-    payload_off: display_power=0
-    scan_interval: 60
+#  - platform: command_line
+#    name: Wallboard HDMI Status
+#    command: !secret wallboard_hdmi_status_cmd
+#    payload_on: display_power=1
+#    payload_off: display_power=0
+#    scan_interval: 60
--- a/config/switches/cctv.yaml
+++ b/config/switches/cctv.yaml
@@ -1,53 +0,0 @@
- platform: template
-  switches:
-
-    camera_livingroom_email:
-      value_template: "{{ is_state_attr('camera.livingroom', 'email_enabled', true) }}"
-      turn_on:
-        service: camera.enable_email
-        data:
-          entity_id: camera.livingroom
-      turn_off:
-        service: camera.disable_email
-        data:
-          entity_id: camera.livingroom
-      icon_template: >-
-        {% if is_state_attr('camera.livingroom', 'email_enabled', true) %}
-          mdi:email
-        {% else %}
-          mdi:email-outline
-        {% endif %}
-
-    camera_livingroom_ftp:
-      value_template: "{{ is_state_attr('camera.livingroom', 'ftp_enabled', true) }}"
-      turn_on:
-        service: camera.enable_ftp
-        data:
-          entity_id: camera.livingroom
-      turn_off:
-        service: camera.disable_ftp
-        data:
-          entity_id: camera.livingroom
-      icon_template: >-
-        {% if is_state_attr('camera.livingroom', 'ftp_enabled', true) %}
-          mdi:filmstrip
-        {% else %}
-          mdi:filmstrip-off
-        {% endif %}
-
-    camera_livingroom_ir_lights:
-      value_template: "{{ is_state_attr('camera.livingroom', 'ir_lights_enabled', true) }}"
-      turn_on:
-        service: camera.enable_ir_lights
-        data:
-          entity_id: camera.livingroom
-      turn_off:
-        service: camera.disable_ir_lights
-        data:
-          entity_id: camera.livingroom
-      icon_template: >-
-        {% if is_state_attr('camera.livingroom', 'ir_lights_enabled', true) %}
-          mdi:flashlight
-        {% else %}
-          mdi:flashlight-off
-        {% endif %}
--- a/config/switches/misc.yaml
+++ b/config/switches/misc.yaml
@@ -14,6 +14,19 @@
      turn_off:
        service: script.dummy

+    desktop_jenny_wol:
+      value_template: "{{ is_state('binary_sensor.desktop_jenny_ping', 'on') }}"
+      turn_on:
+        service: shell_command.ssh
+        data:
+          sshkey: !secret sshkey_wakeonlan
+          host: !secret nas_ip
+          user: !secret nas_ssh_user
+          port: !secret nas_ssh_port
+          command_or_param: !secret desktop_jenny_mac
+      turn_off:
+        service: script.dummy
+
    onair_lamp_recording:
      value_template: "{{ is_state('input_boolean.onair_lamp_recording', 'on') }}"
      turn_on:
--- a/config/switches/wallboard.yaml
+++ b/config/switches/wallboard.yaml
@@ -1,10 +1,9 @@
- platform: template
-  switches:
-
-    wallboard_display:
-      friendly_name: Wallboard Display Toggle
-      value_template: "{{ is_state('binary_sensor.wallboard_hdmi_status', 'on') }}"
-      turn_on:
-        service: script.wallboard_hdmi_on
-      turn_off:
-        service: script.wallboard_hdmi_off
+#- platform: template
+#  switches:
+#    wallboard_display:
+#      friendly_name: Wallboard Display Toggle
+#      value_template: "{{ is_state('binary_sensor.wallboard_hdmi_status', 'on') }}"
+#      turn_on:
+#        service: script.wallboard_hdmi_on
+#      turn_off:
+#        service: script.wallboard_hdmi_off
--- a/config/views/devices.yaml
+++ b/config/views/devices.yaml
@@ -1,20 +1,15 @@
 icon: mdi:cellphone-link
 path: devices
 cards:
-  - type: entities
-    entities:
-      - entity: sensor.myip
-        name: Öffentliche IP
-        icon: mdi:earth
  - type: horizontal-stack
    cards:
    - type: entities
      title: Florian
      show_header_toggle: false
      entities:
-        - entity: device_tracker.pixel_4
+        - entity: device_tracker.pixely
          name: Standort
-        - entity: sensor.battery_level
+        - entity: sensor.pixely_akkufullstand
          name: Handy-Akku
          icon: mdi:battery
    - type: entities
@@ -29,28 +24,23 @@ cards:
  - type: horizontal-stack
    cards:
    - type: entities
-      title: Wake On Lan
+      title: WOL Florian
      show_header_toggle: false
      entities:
        - entity: switch.desktop_wol
          name: Desktop-PC
          icon: mdi:desktop-classic
    - type: entities
-      title: Wallboard
+      title: WOL Jenny
      show_header_toggle: false
      entities:
-        - entity: switch.wallboard_display
-          name: Display
-          icon: mdi:tablet
+        - entity: switch.desktop_jenny_wol
+          name: Desktop-PC Ronny
+          icon: mdi:desktop-classic
  - type: entities
-    title: Home Assistant Slaves
+    title: Wallboard
    show_header_toggle: false
    entities:
-    - type: weblink
-      name: Livingroom
-      url: !secret url_haslave_livingroom
-      icon: mdi:home-assistant
-    - type: weblink
-      name: Office
-      url: !secret url_haslave_office
-      icon: mdi:home-assistant
+      - entity: switch.wallboard_display
+        name: Display
+        icon: mdi:tablet
--- a/config/views/floorplan.yaml
+++ b/config/views/floorplan.yaml
@@ -1,6 +1,7 @@
 #icon: mdi:home-variant-outline
 title: Haus
 path: floor
+icon: 'mdi:floor-plan'
 panel: true
 cards:
  - type: picture-elements
--- a/config/views/humidity.yaml
+++ b/config/views/humidity.yaml
@@ -1,151 +1,103 @@
 icon: mdi:water-percent
 path: humidity
 cards:
-  - type: vertical-stack
+
+  - type: grid
+    title: Wohnzimmer
+    columns: 2
+    square: true
    cards:
-      - type: markdown
-        content: "### Elternbad"
-      - type: horizontal-stack
-        cards:
-          - type: sensor
-            entity: sensor.hygro_bathroom_parents_humidity
-            name: Luftfeuchtigkeit
-            graph: line
-            unit: "%"
-            detail: 2
-            hours_to_show: 12
-          - type: sensor
-            entity: sensor.hygro_bathroom_parents_temperature
-            name: Temperatur
-            graph: line
-            unit: °C
-            detail: 2
-            hours_to_show: 12
-      - type: markdown
-        content: "### \"Kinderbad\""
-      - type: horizontal-stack
-        cards:
-          - type: sensor
-            entity: sensor.hygro_bathroom_kids_humidity
-            name: Luftfeuchtigkeit
-            graph: line
-            unit: "%"
-            detail: 2
-            hours_to_show: 12
-          - type: sensor
-            entity: sensor.hygro_bathroom_kids_temperature
-            name: Temperatur
-            graph: line
-            unit: °C
-            detail: 2
-            hours_to_show: 12
-      - type: markdown
-        content: "### Schlafzimmer"
-      - type: horizontal-stack
-        cards:
-          - type: sensor
-            entity: sensor.lumi_bedroom_humidity
-            name: Luftfeuchtigkeit
-            graph: line
-            unit: "%"
-            detail: 2
-            hours_to_show: 12
-          - type: sensor
-            entity: sensor.lumi_bedroom_temperature
-            name: Temperatur
-            graph: line
-            unit: °C
-            detail: 2
-            hours_to_show: 12
-      - type: markdown
-        content: "### Gästezimmer"
-      - type: horizontal-stack
-        cards:
-          - type: sensor
-            entity: sensor.lumi_guestroom_humidity
-            name: Luftfeuchtigkeit
-            graph: line
-            unit: "%"
-            detail: 2
-            hours_to_show: 12
-          - type: sensor
-            entity: sensor.lumi_guestroom_temperature
-            name: Temperatur
-            graph: line
-            unit: °C
-            detail: 2
-            hours_to_show: 12
-  - type: vertical-stack
+      - type: sensor
+        entity: sensor.lumi_livingroom_humidity
+        name: Luftfeuchtigkeit
+        graph: line
+        unit: "%"
+        detail: 2
+        hours_to_show: 24
+      - type: sensor
+        entity: sensor.lumi_livingroom_temperature
+        name: Temperatur
+        graph: line
+        unit: °C
+        detail: 2
+        hours_to_show: 24
+
+  - type: grid
+    title: Schlafzimmer
+    columns: 2
+    square: true
    cards:
-      - type: markdown
-        content: "### Wohnzimmer"
-      - type: horizontal-stack
-        cards:
-          - type: sensor
-            entity: sensor.lumi_livingroom_humidity
-            name: Luftfeuchtigkeit
-            graph: line
-            unit: "%"
-            detail: 2
-            hours_to_show: 12
-          - type: sensor
-            entity: sensor.lumi_livingroom_temperature
-            name: Temperatur
-            graph: line
-            unit: °C
-            detail: 2
-            hours_to_show: 12
-      - type: markdown
-        content: "### Hauswirtschaftsraum"
-      - type: horizontal-stack
-        cards:
-          - type: sensor
-            entity: sensor.hygro_hwr_humidity
-            name: Luftfeuchtigkeit
-            graph: line
-            unit: "%"
-            detail: 2
-            hours_to_show: 12
-          - type: sensor
-            entity: sensor.hygro_hwr_temperature
-            name: Temperatur
-            graph: line
-            unit: °C
-            detail: 2
-            hours_to_show: 12
-      - type: markdown
-        content: "### Büro"
-      - type: horizontal-stack
-        cards:
-          - type: sensor
-            entity: sensor.lumi_office_humidity
-            name: Luftfeuchtigkeit
-            graph: line
-            unit: "%"
-            detail: 2
-            hours_to_show: 12
-          - type: sensor
-            entity: sensor.lumi_office_temperature
-            name: Temperatur
-            graph: line
-            unit: °C
-            detail: 2
-            hours_to_show: 12
-      - type: markdown
-        content: "### Dachboden"
-      - type: horizontal-stack
-        cards:
-          - type: sensor
-            entity: sensor.attic_humidity_2
-            name: Luftfeuchtigkeit
-            graph: line
-            unit: "%"
-            detail: 2
-            hours_to_show: 12
-          - type: sensor
-            entity: sensor.attic_temperature_2
-            name: Temperatur
-            graph: line
-            unit: °C
-            detail: 2
-            hours_to_show: 12
+      - type: sensor
+        entity: sensor.lumi_bedroom_humidity
+        name: Luftfeuchtigkeit
+        graph: line
+        unit: "%"
+        detail: 2
+        hours_to_show: 24
+      - type: sensor
+        entity: sensor.lumi_bedroom_temperature
+        name: Temperatur
+        graph: line
+        unit: °C
+        detail: 2
+        hours_to_show: 24
+
+  - type: grid
+    title: Gästezimmer
+    columns: 2
+    square: true
+    cards:
+      - type: sensor
+        entity: sensor.lumi_guestroom_humidity
+        name: Luftfeuchtigkeit
+        graph: line
+        unit: "%"
+        detail: 2
+        hours_to_show: 24
+      - type: sensor
+        entity: sensor.lumi_guestroom_temperature
+        name: Temperatur
+        graph: line
+        unit: °C
+        detail: 2
+        hours_to_show: 24
+
+  - type: grid
+    title: Büro
+    columns: 2
+    square: true
+    cards:
+      - type: sensor
+        entity: sensor.lumi_office_humidity
+        name: Luftfeuchtigkeit
+        graph: line
+        unit: "%"
+        detail: 2
+        hours_to_show: 24
+      - type: sensor
+        entity: sensor.lumi_office_temperature
+        name: Temperatur
+        graph: line
+        unit: °C
+        detail: 2
+        hours_to_show: 24
+
+  - type: grid
+    title: Dachboden
+    columns: 2
+    square: true
+    cards:
+      - type: sensor
+        entity: sensor.attic_humidity_2
+        name: Luftfeuchtigkeit
+        graph: line
+        unit: "%"
+        detail: 2
+        hours_to_show: 24
+      - type: sensor
+        entity: sensor.attic_temperature_2
+        name: Temperatur
+        graph: line
+        unit: °C
+        detail: 2
+        hours_to_show: 24
--- a/config/views/lights.yaml
+++ b/config/views/lights.yaml
@@ -1,24 +1,42 @@
 title: Lichter
 path: lights
+icon: 'mdi:lightbulb'
 cards:
-  - type: light
-    entity: light.kuchen_theke
-    name: Küchen-Theke
-  - type: light
-    entity: light.stimmungslicht
-    name: Stimmungslicht
-  - type: light
-    entity: light.ambilight
-    name: Ambilight
-  - type: light
-    entity: light.lichterkette
-    name: Lichterkette (Garten)
-  - type: light
-    entity: light.esstisch
-    name: Esstisch
-  - type: light
-    entity: light.tint_rgb_gu10_1
-    name: Kinderbad
+  - type: grid
+    title: Erdgeschoss
+    columns: 3
+    suqare: true
+    cards:
+    - type: light
+      entity: light.kuchen_theke
+      name: Küchen-Theke
+    - type: light
+      entity: light.esstisch
+      name: Esstisch
+    - type: light
+      entity: light.stimmungslicht
+      name: Stimmungslicht
+    - type: light
+      entity: light.ambilight
+      name: Ambilight
+    - type: light
+      entity: light.lichterkette
+      name: Garten
+
+  - type: grid
+    title: 1. Stock
+    columns: 3
+    suqare: true
+    cards:
+    - type: light
+      entity: light.office_rgb
+      name: Bürolicht
+    - type: light
+      entity: light.lichtleiste
+      name: Schreibtischlicht
+    - type: light
+      entity: light.tint_rgb_gu10_1
+      name: Kinderbad

  - type: vertical-stack
    title: Studio
@@ -29,19 +47,11 @@ cards:
      - type: entities
        show_header_toggle: false
        entities:
+          - entity: light.philips_iris
+            name: Iris
          - entity: switch.onair_lamp_recording
            name: Studio Aufnahme
            icon: mdi:camera-rear
          - entity: switch.osram_plug_01_57b6060a_on_off
            name: Studio Ringlicht
            icon: mdi:checkbox-blank-circle-outline
-
-  - type: vertical-stack
-    title: Büro
-    cards:
-      - type: light
-        entity: light.office_rgb
-        name: Deckenlicht
-      - type: light
-        entity: light.lichtleiste
-        name: Schreibtischlicht
--- a/config/views/livingroom.yaml
+++ b/config/views/livingroom.yaml
@@ -1,20 +1,9 @@
-title: Wohnzimmer
-path: livingroom
+title: Media
+path: media
+icon: 'mdi:theater'
 cards:
-  # Lights
-  - type: horizontal-stack
-    cards:
-      - type: entities
-        entities:
-          - entity: light.kuchen_theke
-            name: Küchen-Theke
-          - entity: light.esstisch
-            name: Esstisch
-          - entity: light.stimmungslicht
-            name: Stimmungslicht
-            icon: mdi:lightbulb
-          - entity: light.ambilight
-            name: Ambilight
+  - type: media-control
+    entity: media_player.spotify

  # Denon + Harmony
  - type: vertical-stack
@@ -45,14 +34,11 @@ cards:
            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

  # Spotify
--- a/config/views/network.yaml
+++ b/config/views/network.yaml
@@ -3,6 +3,10 @@ path: network
 cards:
  - type: vertical-stack
    cards:
+    - type: entity
+      entity: sensor.myip
+      name: Öffentliche IP
+      icon: mdi:earth
    - type: gauge
      entity: sensor.adguard_average_processing_speed
      max: 100
--- a/config/views/overview.yaml
+++ b/config/views/overview.yaml
@@ -1,5 +1,6 @@
 title: Übersicht
 path: overview
+icon: "mdi:tablet-dashboard"
 cards:
  - type: conditional
    conditions:
@@ -16,11 +17,12 @@ cards:
  - type: vertical-stack
    cards:
    - type: custom:weather-card
-      entity: weather.openweathermap
      name: Wetter
-    - type: iframe
-      url: !secret iframe_windy
-      aspect_ratio: 75%
+      entity: weather.openweathermap
+      icons: "/local/lovelace/custom/weather-card/icons/"
+#    - type: iframe
+#      url: !secret iframe_windy
+#      aspect_ratio: 75%
 #    - type: iframe
 #      url: !secret iframe_earth
 #      aspect_ratio: 75%
@@ -45,7 +47,7 @@ cards:
          - person.florian
          - person.jenny
      - type: map
-        aspect_ratio: 75%
-        default_zoom: 15
-        entities:
-          - zone.home
+        aspect_ratio: 60%
+        entities: 
+          - device_tracker.sm_g985f
+          - device_tracker.pixel_4
--- a/config/views/landroid.yaml
+++ b/config/views/landroid.yaml
@@ -1,8 +1,48 @@
-title: Mäheroboter
-path: mower
+title: Roboter
+path: robots
 badges: []
 icon: 'mdi:robot-vacuum-variant'
 cards:
+  # Dobby
+  - type: 'custom:vacuum-card'
+    entity: vacuum.dobby
+    map: camera.deebot_dobby_live_map
+    stats:
+      default:
+        - entity_id: sensor.dobby_heap
+          unit: Stunden
+          subtitle: Filter
+        - entity_id: sensor.dobby_sidebrush
+          unit: Stunden
+          subtitle: Seitenbürste
+        - entity_id: sensor.dobby_brush
+          unit: Stunden
+          subtitle: Hauptbürste
+      cleaning:
+        - entity_id: sensor.dobby_stats_area
+          unit: m2
+          subtitle: Gereinigter Bereich
+        - entity_id: sensor.dobby_stats_time
+          unit: Minuten
+          subtitle: Dauer
+    actions:
+      - name: Wohnzimmer
+        service: script.vacuum_living_room
+        icon: 'mdi:sofa'
+      - name: Küche
+        service: script.vacuum_kitchen
+        icon: 'mdi:pot-steam'
+      - name: Esszimmer
+        service: script.vacuum_dining_room
+        icon: 'mdi:table-furniture'
+      - name: HWR
+        service: script.vacuum_laundry
+        icon: 'mdi:washing-machine'
+      - name: Flur
+        service: script.vacuum_corridor
+        icon: 'mdi:door'
+
+  # Hans-Dieter
  - type: vertical-stack
    cards:
      - elements:
--- a/config/views/spotify.yaml
+++ b/config/views/spotify.yaml
@@ -1,5 +0,0 @@
-icon: mdi:spotify
-path: spotify
-cards:
-    - type: media-control
-      entity: media_player.spotify