From e398bf42935a27f2215fa70968e2877319e124c4 Mon Sep 17 00:00:00 2001 From: Claus Dethlefsen Date: Wed, 11 Jan 2023 06:58:07 +0100 Subject: [PATCH] Various improvements on lighting --- .HA_VERSION | 2 +- configuration.yaml | 70 +++++++++++++++++-- google_calendars.yaml | 31 ++++++-- .../der_er_nogen_i_indkorslen.yaml | 2 +- include/automations/good_morning.yaml | 8 +-- include/automations/kommerhjem.yaml | 14 ++-- include/binary_sensors/workday.yaml | 48 +++---------- include/groups/groups.yaml | 26 +++++++ include/lights/daniel.yaml | 3 +- include/lights/grupper.yaml | 55 +++++++++++++-- include/lights/sovevaerelse.yaml | 1 + include/resources/hacs_js.yaml | 2 + include/resources/hacs_modules.yaml | 2 + 13 files changed, 191 insertions(+), 73 deletions(-) diff --git a/.HA_VERSION b/.HA_VERSION index c6f173f..9abfbdf 100755 --- a/.HA_VERSION +++ b/.HA_VERSION @@ -1 +1 @@ -2022.10.5 \ No newline at end of file +2023.1.2 \ No newline at end of file diff --git a/configuration.yaml b/configuration.yaml index 08e6918..8010b44 100755 --- a/configuration.yaml +++ b/configuration.yaml @@ -6,7 +6,7 @@ default_config: tts: - platform: google_translate language: 'da' - base_url: !secret tts_base_url +# base_url: !secret tts_base_url homeassistant: @@ -21,6 +21,13 @@ homeassistant: elevation: !secret homeassistant_elevation unit_system: metric time_zone: Europe/Copenhagen + country: DK + allowlist_external_dirs: + - /config + media_dirs: + local: /config/www/media + + # media_dirs: # music: /music # video: /video @@ -36,6 +43,53 @@ http: trusted_proxies: - 127.0.0.1 +## ######################################## +## Recorder +## ######################################## +recorder: + exclude: + domains: + - device_tracker + - media_player + - uptime + - time_date + - mobile_app + entity_globs: + - sensor.clock* + - sensor.date* + - sensor.glances* + - sensor.load_*m + - sensor.time* + - sensor.uptime* + - sensor.ipad_* + - sensor.claus_iphone12* + - light.fordelingsgang* + - binary_sensor.ipad_* + - switch.lille_badevaerelse_* + - number.lille_badevaerelse_* + - switch.sovevaerelse_* + - number.sovevaerelse_* + - switch.daniel_* + - number.andreas_* + - switch.andreas_* + - number.daniel_* + - switch.alrum_* + - number.alrum_* + - switch.kokken_* + - number.kokken_* + - switch.kontor_* + - number.kontor_* + - switch.badevaerelse_* + - number.badevaerelse_* + - light.bad_* + - light.spejl* + - sensor.daniels_iphone_7* + - binary_sensor.daniels_iphone_7* + - sensor.andreas_ipad* + entities: + - sensor.home_assistant_v2_db + - weather.openweathermap + ## ######################################## ## Zones ## ######################################## @@ -95,10 +149,10 @@ sonoff: ## Miele (HACS) ## ######################################## -miele: - client_id: !secret miele_clientid - client_secret: !secret miele_secret - lang: en +#miele: +# client_id: !secret miele_clientid +# client_secret: !secret miele_secret +# lang: en ## ######################################## ## Roth touchline @@ -184,6 +238,8 @@ python_script: # resources: !include_dir_merge_list include/resources/ # mode: yaml -#frontend: -# themes: !include_dir_merge_named themes +# Example configuration.yaml entry + +frontend: + themes: !include_dir_merge_named themes diff --git a/google_calendars.yaml b/google_calendars.yaml index b3cfc17..394322c 100644 --- a/google_calendars.yaml +++ b/google_calendars.yaml @@ -4,46 +4,63 @@ - device_id: vejr ignore_availability: true name: Vejr - track: false - cal_id: claus.dethlefsen@gmail.com entities: - device_id: claus_dethlefsen ignore_availability: true name: Claus Dethlefsen - track: false - cal_id: anne.schusler@gmail.com entities: - device_id: anne_schusler ignore_availability: true name: "Anne Sch\xFCsler" - track: false - cal_id: addressbook#contacts@group.v.calendar.google.com entities: - device_id: fodselsdage ignore_availability: true name: "F\xF8dselsdage" - track: false - cal_id: clujqe0jd7chq07h4vlb2kncv8@group.calendar.google.com entities: - device_id: madplan ignore_availability: true name: Madplan - track: false - cal_id: da.danish#holiday@group.v.calendar.google.com entities: - device_id: helligdage_i_danmark ignore_availability: true name: Helligdage i Danmark - track: false - cal_id: family03545727648936746391@group.calendar.google.com entities: - device_id: familie ignore_availability: true name: Familie - track: false + +- cal_id: 1n1bh522cdkmf97uopca1ci3sc0fptbl@import.calendar.google.com + entities: + - device_id: aula_daniel_schusler_dethlefsen_arskalender + ignore_availability: true + name: "AULA - Daniel Sch\xFCsler Dethlefsen - \xC5rskalender" + +- cal_id: ueevs0vmgvqf10jo10jvcdlpthpnq10r@import.calendar.google.com + entities: + - device_id: aula_andreas_schusler_dethlefsen_arskalender + ignore_availability: true + name: "AULA - Andreas Sch\xFCsler Dethlefsen - \xC5rskalender" + +- cal_id: andreas.schusler.dethlefsen@gmail.com + entities: + - device_id: andreas_schusler_dethlefsen_gmail_com + ignore_availability: true + name: andreas.schusler.dethlefsen@gmail.com + +- cal_id: daniel.schusler.dethlefsen@gmail.com + entities: + - device_id: daniel_schusler_dethlefsen_gmail_com + ignore_availability: true + name: daniel.schusler.dethlefsen@gmail.com diff --git a/include/automations/der_er_nogen_i_indkorslen.yaml b/include/automations/der_er_nogen_i_indkorslen.yaml index afbfaf2..7e25011 100644 --- a/include/automations/der_er_nogen_i_indkorslen.yaml +++ b/include/automations/der_er_nogen_i_indkorslen.yaml @@ -4,7 +4,7 @@ entity_id: binary_sensor.indkorsel_sensor_motion to: 'on' action: - - service: notify.mobile_app_claus_iphone12 + - service: notify.mobile_app_clausiphone data: message: "Der er nogen i indkørslen" # - service: script.sonos_say diff --git a/include/automations/good_morning.yaml b/include/automations/good_morning.yaml index 7a1c14e..b03625e 100644 --- a/include/automations/good_morning.yaml +++ b/include/automations/good_morning.yaml @@ -11,7 +11,7 @@ data: entity_id: input_boolean.first_run - - alias: 'Godmorgen' + - alias: 'Godmorgen - rul gardin lidt op og tænd lys i stue' trigger: platform: state # entity_id: binary_sensor.stue_motion_sensor @@ -32,7 +32,7 @@ entity_id: input_boolean.first_run - service: script.monthly_color_scene - - alias: 'Godmorgen Children arbejdsdag' + - alias: 'Godmorgen Children arbejdsdag - tænd lys i børneværelser kl 6' trigger: platform: time at: '06:00:00' @@ -44,7 +44,7 @@ - service: script.andreas_color_scene - service: script.daniel_color_scene - - alias: 'Godmorgen Children ikke arbejdsdag' + - alias: 'Godmorgen Children ikke arbejdsdag - tænd lys i børneværelser kl 8' trigger: platform: time at: '08:00:00' @@ -56,7 +56,7 @@ - service: script.andreas_color_scene - service: script.daniel_color_scene - - alias: 'Sluk lys stue morgen' + - alias: 'Sluk lys stue morgen når der er lys nok' trigger: platform: numeric_state entity_id: sensor.forgang_sensor_illuminance diff --git a/include/automations/kommerhjem.yaml b/include/automations/kommerhjem.yaml index c3efe0e..a64bb0b 100644 --- a/include/automations/kommerhjem.yaml +++ b/include/automations/kommerhjem.yaml @@ -5,7 +5,7 @@ to: 'home' action: - service: notify.mobile_app_claus_iphone12 + service: notify.mobile_app_clausiphone data: message: 'Mor kommer hjem' @@ -27,7 +27,7 @@ to: 'home' action: - service: notify.mobile_app_claus_iphone12 + service: notify.mobile_app_clausiphone data: message: 'Daniel kommer hjem' @@ -50,7 +50,7 @@ to: 'home' action: - service: notify.mobile_app_claus_iphone12 + service: notify.mobile_app_clausiphone data: message: 'Andreas kommer hjem' @@ -74,7 +74,7 @@ to: 'Skole' action: - service: notify.mobile_app_claus_iphone12 + service: notify.mobile_app_clausiphone data: message: 'Andreas ankommer til skole' @@ -85,7 +85,7 @@ from: 'Skole' action: - service: notify.mobile_app_claus_iphone12 + service: notify.mobile_app_clausiphone data: message: 'Andreas tager fra skole' @@ -110,7 +110,7 @@ to: 'Skole' action: - service: notify.mobile_app_claus_iphone12 + service: notify.mobile_app_clausiphone data: message: 'Daniel ankommer til skole' @@ -121,7 +121,7 @@ from: 'Skole' action: - service: notify.mobile_app_claus_iphone12 + service: notify.mobile_app_clausiphone data: message: 'Daniel tager fra skole' diff --git a/include/binary_sensors/workday.yaml b/include/binary_sensors/workday.yaml index 910a6d9..3c2589e 100644 --- a/include/binary_sensors/workday.yaml +++ b/include/binary_sensors/workday.yaml @@ -2,41 +2,13 @@ name: Arbejdsdag country: DK add_holidays: - - '2022-10-21' - - '2022-10-20' - - '2022-10-19' - - '2022-10-18' - - '2022-10-17' - - '2022-02-22' - - '2022-02-23' - - '2022-02-24' - - '2022-02-25' - - '2022-04-11' - - '2022-04-13' - - '2022-05-27' - - '2022-06-27' - - '2022-06-28' - - '2022-06-29' - - '2022-06-30' - - '2022-07-01' - - '2022-07-04' - - '2022-07-05' - - '2022-07-06' - - '2022-07-07' - - '2022-07-08' - - '2022-07-11' - - '2022-07-12' - - '2022-07-13' - - '2022-07-14' - - '2022-07-15' - - '2022-07-18' - - '2022-07-19' - - '2022-07-20' - - '2022-07-21' - - '2022-07-22' - - '2022-07-25' - - '2022-07-26' - - '2022-07-27' - - '2022-07-28' - - '2022-07-29' - - '2022-08-01' + - '2022-12-23' + - '2022-12-24' + - '2022-12-25' + - '2022-12-26' + - '2022-12-27' + - '2022-12-28' + - '2022-12-29' + - '2022-12-30' + - '2022-12-31' + - '2023-01-01' diff --git a/include/groups/groups.yaml b/include/groups/groups.yaml index 55ab85c..182c911 100644 --- a/include/groups/groups.yaml +++ b/include/groups/groups.yaml @@ -14,6 +14,32 @@ DanielInternet: - switch.localhost # TV - switch.unifi_block_5c_96_66_39_18_4a # PS5 +Varme: + name: Gulvvarme + entities : + - climate.andreas + - climate.daniel +guest_automations_off: + entities: + - automation.der_er_nogen_i_indkorslen + - automation.godmorgen + - automation.godmorgen_children_arbejdsdag + - automation.godnat + - automation.gruppe_kokken_uden_stue_alrum + - automation.gruppe_kokken_stue_alrum + - automation.gruppe_kokken_stue_alrum_bad + - automation.lys_sovevaerelse_dag_arbejdsdag + - automation.lys_sovevaerelse_dag_ikke_arbejdsdag + - automation.sunset_stuff_on + - automation.turn_on_alarms_andreas + - automation.turn_on_alarms_andreas_saturdays + - automation.turn_on_alarms_andreas_tuesdays + - automation.turn_on_alarms_badevaerelse + - automation.turn_on_alarms_badevaerelse_afsted + - automation.turn_on_alarms_daniel + - automation.turn_on_alarms_daniel_afsted + - automation.turn_on_alarms_soft_wakeup + diff --git a/include/lights/daniel.yaml b/include/lights/daniel.yaml index d95422e..36bde50 100644 --- a/include/lights/daniel.yaml +++ b/include/lights/daniel.yaml @@ -1,6 +1,7 @@ - platform: group name: Daniels værelse + unique_id: lys_daniel entities: - - light.daniel + - light.daniel_lysstrip - light.bamse diff --git a/include/lights/grupper.yaml b/include/lights/grupper.yaml index 5101bbc..6905305 100644 --- a/include/lights/grupper.yaml +++ b/include/lights/grupper.yaml @@ -1,18 +1,27 @@ - platform: group name: gang + unique_id: lys_gang entities: - light.fordelingsgang_1 - light.fordelingsgang_2 - light.fordelingsgang_3 - light.fordelingsgang_4 - - light.fordelingsgang_5 + - light.fordelingsgang_5 + +- platform: group + name: pendle + unique_id: lys_pendle + entities: + - light.pendle1 + - light.pendle2 + - platform: group name: Indendørslamper + unique_id: lys_indenfor entities: - light.andreas - light.hue_lightstrip_plus_1 - - light.daniel - light.bamse - light.hue_lightstrip_plus_1_2 - light.raket @@ -21,14 +30,32 @@ - light.pendle2 - light.panton - light.badevaerelse - - light.sovevaerelse + - light.claus + - light.anne + - light.sov_dor + - light.sov_midt + - light.sov_vindue - light.gang - light.forgang - light.sauna - light.sonoff_10006a2cdd + - light.strip + - light.hue_ambiance_lamp_1 + - light.daniel_lysstrip + - light.paradis + - light.andreas_lysstrip + - light.badevaerelse_2 + - light.indkorsel_2 + - light.fordelingsgang_1 + - light.fordelingsgang_2 + - light.fordelingsgang_3 + - light.fordelingsgang_4 + - light.fordelingsgang_5 + - platform: group name: badevaerelse + unique_id: lys_bad entities: - light.bad_nw - light.bad_ne @@ -39,6 +66,7 @@ - platform: group name: livingroom + unique_id: lys_stue entities: - light.raket - light.syd @@ -48,11 +76,14 @@ - platform: group name: kids + unique_id: lys_kids entities: - light.andreas - - light.daniel + - light.andreas_lysstrip + - light.daniel_lysstrip - light.bamse + - platform: group name: bed entities: @@ -69,6 +100,7 @@ - platform: group name: Indkørsel + unique_id: lys_indkorsel entities: - light.indkorsel_plug - light.udendors_forgang @@ -78,11 +110,12 @@ - platform: group name: Udendørslamper + unique_id: lys_udenfor entities: - light.garage - light.indkorsel_plug - light.fordoer - - light.sonoff_100069a6cc # 1 (rønnebær) +# - light.sonoff_100069a6cc # 1 (rønnebær) - light.sonoff_10006a2cdd # 2 (juletræ) - light.sonoff_1000a77121 # 4 (terasse) - light.sonoff_1000a76e41 # 3 (paradisæbletræ) @@ -93,36 +126,42 @@ - platform: group name: drivhus + unique_id: lys_drivhus entities: - light.sonoff_1000a76e41 # 3 (drivhus) - platform: group name: ronnebaer + unique_id: lys_ronnebær entities: - light.sonoff_100069a6cc # 1 (rønnebær) - platform: group name: koste + unique_id: lys_koste entities: - light.sonoff_10006a2cdd # 2 (koste) - platform: group name: terasse + unique_id: lys_terasse entities: - light.sonoff_1000a77121 #4 (terasse) - platform: group name: paradis + unique_id: lys_paradis entities: - light.sonoff_1000a721a1 #10 (paradis) - platform: group name: julelys + unique_id: lys_julelys entities: - - light.ronnebaer +# - light.ronnebaer - light.koste - light.terasse -# - light.paradis + - light.paradis # - light.sonoff_1000a77121 # 4 (terasse) # - light.sonoff_1000a76e41 # 3 (paradisæbletræ) @@ -130,6 +169,7 @@ - platform: group name: Havelys + unique_id: lys_havelys entities: - light.hue_outdoor_spot_1 - light.hue_outdoor_spot_2 @@ -137,6 +177,7 @@ - platform: group name: Alle lys + unique_id: lys_allelys entities: - light.indendorslamper - light.udendorslamper diff --git a/include/lights/sovevaerelse.yaml b/include/lights/sovevaerelse.yaml index 4d76a8d..b0f0181 100644 --- a/include/lights/sovevaerelse.yaml +++ b/include/lights/sovevaerelse.yaml @@ -1,6 +1,7 @@ - platform: group name: Soveværelse + unique_id: lys_soveværelse entities: - light.claus - light.anne diff --git a/include/resources/hacs_js.yaml b/include/resources/hacs_js.yaml index 6efb272..3cad800 100644 --- a/include/resources/hacs_js.yaml +++ b/include/resources/hacs_js.yaml @@ -14,3 +14,5 @@ url: /local/community/lovelace-multiple-entity-row/multiple-entity-row.js - type: js url: /local/community/love-lock-card/love-lock-card.js +- type: js + url: /local/community/scheduler-card/scheduler-card.js?v=0 diff --git a/include/resources/hacs_modules.yaml b/include/resources/hacs_modules.yaml index 1ff0386..ee32c7a 100644 --- a/include/resources/hacs_modules.yaml +++ b/include/resources/hacs_modules.yaml @@ -1,3 +1,5 @@ + - url: /local/community/lovelace-mushroom/mushroom.js + type: module - url: /local/community/lovelace-layout-card/layout-card.js type: module - url: /local/community/lovelace-battery-entity-row/battery-entity-row.js