From 6731a770938a07d16d70799887abb1f5373727d9 Mon Sep 17 00:00:00 2001 From: Edward Firmo Date: Fri, 27 Sep 2024 09:38:51 +0200 Subject: [PATCH] Routine --- .storage/core.area_registry | 15 +- .storage/emulated_hue.ids | 24 +- .storage/lovelace | 299 ++++++++++-------- configuration.yaml | 6 +- esphome/guest-room-panel.yaml | 5 + esphome/office-workstation-panel.yaml | 40 +-- esphome/packages/base_shelly_plus_1pm.yaml | 4 +- esphome/packages/config_wifi.yaml | 7 +- packages/areas/balcony/balcony_cover.yaml | 27 -- packages/areas/balcony/balcony_door.yaml | 17 - .../areas/balcony/balcony_electricity.yaml | 21 -- packages/areas/balcony/balcony_lights.yaml | 123 ------- packages/areas/bathroom/bathroom_lights.yaml | 197 ------------ .../areas/bathroom/bathroom_occupancy.yaml | 27 -- .../areas/bedroom/bedroom_electricity.yaml | 36 --- .../areas/corridor/corridor_electricity.yaml | 20 -- .../guest_room/guest_room_electricity.yaml | 23 -- packages/areas/hall/hall_electricity.yaml | 21 -- packages/areas/hall/hall_lights.yaml | 4 +- packages/areas/hall/hall_occupancy.yaml | 5 +- packages/areas/kitchen/kitchen_bench.yaml | 17 - .../areas/kitchen/kitchen_electricity.yaml | 46 --- packages/areas/kitchen/kitchen_lights.yaml | 11 +- packages/areas/kitchen/kitchen_table.yaml | 63 ---- .../areas/laundry/laundry_electricity.yaml | 22 -- .../living_room/living_room_electricity.yaml | 38 --- .../areas/living_room/living_room_lights.yaml | 6 - .../media_centre_electricity.yaml | 20 -- packages/areas/office/office_electricity.yaml | 32 +- packages/areas/office/office_lights.yaml | 31 -- packages/climate.yaml | 2 +- packages/electricity/energy_consumption.yaml | 43 --- packages/home.yaml | 211 +----------- 33 files changed, 234 insertions(+), 1229 deletions(-) delete mode 100644 packages/areas/balcony/balcony_cover.yaml delete mode 100644 packages/areas/balcony/balcony_door.yaml delete mode 100644 packages/areas/balcony/balcony_electricity.yaml delete mode 100644 packages/areas/balcony/balcony_lights.yaml delete mode 100644 packages/areas/bathroom/bathroom_lights.yaml delete mode 100644 packages/areas/bathroom/bathroom_occupancy.yaml delete mode 100644 packages/areas/bedroom/bedroom_electricity.yaml delete mode 100644 packages/areas/corridor/corridor_electricity.yaml delete mode 100644 packages/areas/guest_room/guest_room_electricity.yaml delete mode 100644 packages/areas/hall/hall_electricity.yaml delete mode 100644 packages/areas/kitchen/kitchen_electricity.yaml delete mode 100644 packages/areas/kitchen/kitchen_table.yaml delete mode 100644 packages/areas/laundry/laundry_electricity.yaml delete mode 100644 packages/areas/living_room/living_room_electricity.yaml delete mode 100644 packages/areas/living_room/living_room_lights.yaml delete mode 100644 packages/areas/media_centre/media_centre_electricity.yaml delete mode 100644 packages/areas/office/office_lights.yaml delete mode 100644 packages/electricity/energy_consumption.yaml diff --git a/.storage/core.area_registry b/.storage/core.area_registry index 84f70c8..fa8c645 100644 --- a/.storage/core.area_registry +++ b/.storage/core.area_registry @@ -28,9 +28,9 @@ }, { "aliases": [ + "Master", "Quarto", - "Master bedroom", - "Master" + "Master bedroom" ], "floor_id": null, "icon": null, @@ -282,6 +282,17 @@ "picture": null, "created_at": "2024-08-22T19:58:29.217361+00:00", "modified_at": "2024-08-22T19:58:29.217369+00:00" + }, + { + "aliases": [], + "floor_id": "outdoor", + "icon": "mdi:outdoor-lamp", + "id": "deck", + "labels": [], + "name": "Deck", + "picture": null, + "created_at": "2024-09-16T11:20:44.562395+00:00", + "modified_at": "2024-09-16T11:20:44.562405+00:00" } ] } diff --git a/.storage/emulated_hue.ids b/.storage/emulated_hue.ids index 7142b0f..d71bb29 100644 --- a/.storage/emulated_hue.ids +++ b/.storage/emulated_hue.ids @@ -4,24 +4,10 @@ "key": "emulated_hue.ids", "data": { "1": "input_boolean.home_party_mode", - "2": "light.balcony_lamp_light", - "3": "light.balcony_string_lights", - "4": "light.bathroom_ceiling_lights", - "5": "light.bathroom_mirror_light", - "6": "light.bedroom_carol_light", - "7": "light.bedroom_closet_lights", - "8": "light.bedroom_edward_light", - "9": "switch.bedroom_power_strip_1_tv_samsung", - "10": "light.corridor_all_lights", - "11": "light.guest_bathroom_ceiling_light", - "12": "light.guest_bathroom_mirror_lights", - "13": "light.guest_room_closet_lights", - "14": "light.guest_room_wall_lights", - "15": "light.hall_ceiling_light", - "16": "light.kitchen_bench_lights", - "17": "light.kitchen_table_lights", - "18": "light.office_ceiling_lines", - "19": "light.office_workstation_lights", - "20": "light.kitchen_curtain_s_lights" + "2": "light.balcony_light", + "3": "switch.guest_room_panel_relay_1", + "4": "light.kitchen_bench_lights", + "5": "light.kitchen_table_lights", + "6": "light.office_workstation_lights" } } \ No newline at end of file diff --git a/.storage/lovelace b/.storage/lovelace index d701f8c..079770a 100644 --- a/.storage/lovelace +++ b/.storage/lovelace @@ -121,7 +121,10 @@ "icon": "mdi:dog-side", "content": "{% set entity_state = states(entity) %} {% if entity_state == \"home\" %}\n {% set ble_location_entity = \"sensor.dory_s_tracker_area\" %}\n {% set ble_location = states(ble_location_entity) %}\n {% if has_value(ble_location_entity) %}\n {{ ble_location }}\n {% else %}\n {{ state_translated(entity) | default(\"Home\") }}\n {% endif %}\n{% else %}\n {{ state_translated(entity) | default(\"Home\") }}\n{% endif %}", "picture": "{{ state_attr(entity, \"entity_picture\") }}", - "icon_color": "{% if states(entity) != \"home\" %}red{% endif %}\n" + "icon_color": "{% if states(entity) != \"home\" %}red{% endif %}\n", + "tap_action": { + "action": "more-info" + } }, { "type": "template", @@ -129,7 +132,10 @@ "icon": "mdi:dog-side", "content": "{% set entity_state = states(entity) %} {% if entity_state == \"home\" %}\n {% set ble_location_entity = \"sensor.skal_s_tracker_area\" %}\n {% set ble_location = states(ble_location_entity) %}\n {% if has_value(ble_location_entity) %}\n {{ ble_location }}\n {% else %}\n {{ state_translated(entity) | default(\"Home\") }}\n {% endif %}\n{% else %}\n {{ state_translated(entity) | default(\"Home\") }}\n{% endif %}", "picture": "{{ state_attr(entity, \"entity_picture\") }}", - "icon_color": "{% if states(entity) != \"home\" %}red{% endif %}" + "icon_color": "{% if states(entity) != \"home\" %}red{% endif %}", + "tap_action": { + "action": "more-info" + } }, { "type": "conditional", @@ -176,8 +182,17 @@ "type": "template", "entity": "sensor.electricity_price", "icon": "mdi:lightning-bolt-circle", - "icon_color": "{% set price_level = state_attr(entity, 'future_price_level') %} {% if price_level == 'Very expensive' %}\n red\n{% elif price_level == 'Expensive' %}\n orange\n{% elif price_level == 'Cheap' %}\n darkgreen\n{% elif price_level == 'Very cheap' %}\n green\n{%- endif %}", - "content": "{{ state_attr(entity, 'future_price_level') | default('unknown') }}: {{ states(entity) | float(0) | round(2) }} kr/kWh" + "icon_color": "{% set price_level = state_attr(entity, \"price_level_combined\") %} {% if price_level == \"Very expensive\" %}\n red\n{% elif price_level == \"Expensive\" %}\n orange\n{% elif price_level == \"Cheap\" %}\n blue\n{% elif price_level == \"Very cheap\" %}\n green\n{%- endif %}", + "content": "{{ state_attr(entity, \"price_level_combined\") }}:\n{{ states(entity, rounded=true, with_unit=true) }}", + "tap_action": { + "action": "more-info" + }, + "hold_action": { + "action": "more-info" + }, + "double_tap_action": { + "action": "more-info" + } }, { "type": "alarm-control-panel", @@ -231,17 +246,18 @@ "type": "conditional", "conditions": [ { - "entity": "light.balcony_all_lights", + "condition": "state", + "entity": "light.outdoor_lights", "state": "on" } ], "chip": { "type": "light", - "entity": "light.balcony_all_lights", + "entity": "light.outdoor_lights", "content_info": "name", - "name": "Balcony", + "name": "Outdoor", "use_light_color": true, - "icon": "mdi:string-lights" + "icon": "mdi:bee-flower" } }, { @@ -276,6 +292,23 @@ "name": "Bedroom" } }, + { + "type": "conditional", + "conditions": [ + { + "condition": "state", + "entity": "light.common_room_all_lights", + "state": "on" + } + ], + "chip": { + "type": "light", + "entity": "light.common_room_all_lights", + "content_info": "name", + "name": "Common room", + "use_light_color": true + } + }, { "type": "conditional", "conditions": [ @@ -292,6 +325,24 @@ "name": "Corridor" } }, + { + "type": "conditional", + "conditions": [ + { + "condition": "state", + "entity": "light.greenhouse_all_lights", + "state": "on" + } + ], + "chip": { + "type": "light", + "entity": "light.greenhouse_all_lights", + "name": "Greenhouse", + "content_info": "name", + "use_light_color": true, + "icon": "mdi:string-lights" + } + }, { "type": "conditional", "conditions": [ @@ -393,18 +444,65 @@ "type": "conditional", "conditions": [ { - "entity": "sensor.kitchen_dishwasher_operation_state", + "condition": "state", + "entity": "light.spa_all_lights", + "state": "on" + } + ], + "chip": { + "type": "light", + "entity": "light.spa_all_lights", + "name": "Spa", + "icon": "mdi:string-lights", + "content_info": "name", + "use_light_color": true + } + }, + { + "type": "conditional", + "conditions": [ + { + "condition": "state", + "entity": "sensor.borasvagen_dishwasher_operation_state", "state_not": "Ready" }, { - "entity": "sensor.kitchen_dishwasher_operation_state", + "condition": "state", + "entity": "sensor.borasvagen_dishwasher_operation_state", "state_not": "Inactive" } ], "chip": { "type": "entity", - "entity": "sensor.kitchen_dishwasher_operation_state", - "use_entity_picture": false + "entity": "sensor.borasvagen_dishwasher_operation_state", + "use_entity_picture": false, + "icon": "mdi:dishwasher" + } + }, + { + "type": "conditional", + "conditions": [ + { + "condition": "state", + "entity": "binary_sensor.aurora_visibility_visibility_alert", + "state": "on" + } + ], + "chip": { + "type": "template", + "tap_action": { + "action": "more-info" + }, + "hold_action": { + "action": "more-info" + }, + "double_tap_action": { + "action": "more-info" + }, + "icon": "mdi:aurora", + "icon_color": "green", + "content": "Aurora visibility: {{ states(entity) }}%", + "entity": "sensor.aurora_visibility_visibility" } } ] @@ -778,133 +876,61 @@ } ], "card": { - "type": "custom:tabbed-card", - "tabs": [ + "type": "custom:flex-table-card", + "title": "Västtrafik - Göransfors", + "strict": true, + "max_rows": 20, + "sort_by": [ + "Departure+" + ], + "entities": { + "include": "sensor.vasttrafik_departure_table" + }, + "columns": [ { - "attributes": { - "label": "To city centre" - }, - "card": { - "type": "custom:flex-table-card", - "title": "Västtrafik - Göransfors", - "strict": true, - "max_rows": 20, - "sort_by": [ - "Departure+" - ], - "entities": { - "include": "sensor.vasttrafik_departure_table_city_centre" - }, - "columns": [ - { - "name": "Sort column", - "data": "Departure", - "align": "center", - "hidden": true, - "modify": "Math.round((Date.parse(x.estimatedOtherwisePlannedTime) - Date.now())/60000)" - }, - { - "name": "Line", - "data": "Departure", - "modify": "x.serviceJourney.line.shortName", - "align": "center", - "hidden": true, - "style": "'background-color: ' + x.serviceJourney.line.backgroundColor + ';' + 'color: ' + x.serviceJourney.line.foregroundColor + ';'" - }, - { - "name": "Line", - "data": "Departure", - "modify": "'
 ' + x.serviceJourney.line.shortName + ' 
'", - "align": "center" - }, - { - "name": "Direction", - "data": "Departure", - "modify": "x.serviceJourney.directionDetails.shortDirection" - }, - { - "name": "Departure", - "data": "Departure", - "align": "center", - "modify": "var minutes = Math.round(Math.max(0,(Date.parse(x.estimatedOtherwisePlannedTime) - Date.now())/60000));\nif (minutes>=60 || isNaN(minutes)) {\n var date = new Date(x.estimatedOtherwisePlannedTime);\n date.toLocaleTimeString([], {hour: '2-digit', minute: '2-digit'});\n} else if (minutes == 0)\n \"Now\"\nelse\n {{ minutes }}" - }, - { - "name": "Platform", - "data": "Departure", - "align": "center", - "modify": "x.stopPoint.platform + ' '" - } - ], - "css": { - "tbody tr:nth-child(odd)": "color: #f2f2f2; background-color: #535B64;", - "tbody tr:nth-child(even)": "color: #f2f2f2; background-color: #3C4650;" - }, - "style": "ha-card {\n --mdc-icon-size: 16px;\n background-color: #3C4650;\n color: #f2f2f2;\n}\n" - } + "name": "Sort column", + "data": "results", + "align": "center", + "hidden": true, + "modify": "Math.round((Date.parse(x.estimatedOtherwisePlannedTime) - Date.now())/60000)" }, { - "attributes": { - "label": "Towards Borås" - }, - "card": { - "type": "custom:flex-table-card", - "title": "Västtrafik - Göransfors", - "strict": true, - "max_rows": 20, - "sort_by": [ - "Departure+" - ], - "entities": { - "include": "sensor.vasttrafik_departure_table_suburb" - }, - "columns": [ - { - "name": "Sort column", - "data": "Departure", - "align": "center", - "hidden": true, - "modify": "Math.round((Date.parse(x.estimatedOtherwisePlannedTime) - Date.now())/60000)" - }, - { - "name": "Line", - "data": "Departure", - "modify": "x.serviceJourney.line.shortName", - "align": "center", - "hidden": true, - "style": "'background-color: ' + x.serviceJourney.line.backgroundColor + ';' + 'color: ' + x.serviceJourney.line.foregroundColor + ';'" - }, - { - "name": "Line", - "data": "Departure", - "modify": "'
 ' + x.serviceJourney.line.shortName + ' 
'", - "align": "center" - }, - { - "name": "Direction", - "data": "Departure", - "modify": "x.serviceJourney.directionDetails.shortDirection" - }, - { - "name": "Departure", - "data": "Departure", - "align": "center", - "modify": "var minutes = Math.round(Math.max(0,(Date.parse(x.estimatedOtherwisePlannedTime) - Date.now())/60000));\nif (minutes>=60 || isNaN(minutes)){\n var date = new Date(x.estimatedOtherwisePlannedTime);\n date.toLocaleTimeString([], {hour: '2-digit', minute: '2-digit'});\n} else if (minutes == 0)\n \"Now\"\nelse\n {{ minutes }}" - }, - { - "name": "Platform", - "data": "Departure", - "align": "center", - "modify": "x.stopPoint.platform + ' '" - } - ], - "css": { - "tbody tr:nth-child(odd)": "color: #f2f2f2; background-color: #535B64;", - "tbody tr:nth-child(even)": "color: #f2f2f2; background-color: #3C4650;" - }, - "style": "ha-card {\n --mdc-icon-size: 16px;\n background-color: #3C4650;\n color: #f2f2f2;\n}\n" - } + "name": "Line", + "data": "results", + "modify": "x.serviceJourney.line.shortName", + "align": "center", + "hidden": true, + "style": "'background-color: ' + x.serviceJourney.line.backgroundColor + ';' + 'color: ' + x.serviceJourney.line.foregroundColor + ';'" + }, + { + "name": "Line", + "data": "results", + "modify": "'
 ' + x.serviceJourney.line.shortName + ' 
'", + "align": "center" + }, + { + "name": "Direction", + "data": "results", + "modify": "x.serviceJourney.directionDetails.shortDirection" + }, + { + "name": "Departure", + "data": "results", + "align": "center", + "modify": "var minutes = Math.round(Math.max(0,(Date.parse(x.estimatedOtherwisePlannedTime) - Date.now())/60000));\nif (minutes>=60 || isNaN(minutes)) {\n var date = new Date(x.estimatedOtherwisePlannedTime);\n date.toLocaleTimeString([], {hour: '2-digit', minute: '2-digit'});\n} else if (minutes == 0)\n \"Now\"\nelse\n {{ minutes }}" + }, + { + "name": "Platform", + "data": "results", + "align": "center", + "modify": "x.stopPoint.platform + ' '" } - ] + ], + "css": { + "tbody tr:nth-child(odd)": "color: #f2f2f2; background-color: #535B64;", + "tbody tr:nth-child(even)": "color: #f2f2f2; background-color: #3C4650;" + }, + "style": "ha-card {\n --mdc-icon-size: 16px;\n background-color: #3C4650;\n color: #f2f2f2;\n}\n" } } ] @@ -1391,7 +1417,8 @@ "top": "10%", "left": "87%", "font-size": "15px" - } + }, + "suffix": "°C" }, { "entity": "light.balcony_lamp_light", diff --git a/configuration.yaml b/configuration.yaml index 2ff5a7b..ee1e2bb 100644 --- a/configuration.yaml +++ b/configuration.yaml @@ -31,8 +31,10 @@ automation: !include automations.yaml #logbook: #logger: #default: info -# logs: + #logs: # homeassistant.components.rest: debug + #custom_components.bosch: debug + #bosch_thermostat_client: debug #map: #media_source: #mobile_app: @@ -237,7 +239,7 @@ tts: zha: enable_quirks: true - custom_quirks_path: /config/zha/quirks + custom_quirks_path: "/config/zha/quirks" # https://github.com/zigpy/zigpy/wiki/OTA-Device-Firmware-Updates zigpy_config: diff --git a/esphome/guest-room-panel.yaml b/esphome/guest-room-panel.yaml index 40d7eec..96a8368 100644 --- a/esphome/guest-room-panel.yaml +++ b/esphome/guest-room-panel.yaml @@ -12,3 +12,8 @@ packages: files: - nspanel_esphome.yaml # Base package including TFT transfer - esphome/nspanel_esphome_addon_bluetooth_proxy.yaml + + manual_ip: !include + file: packages/config_manual_ip.yaml + vars: + ip: !secret ip_guest_room_panel diff --git a/esphome/office-workstation-panel.yaml b/esphome/office-workstation-panel.yaml index f4296c7..b5b53f5 100644 --- a/esphome/office-workstation-panel.yaml +++ b/esphome/office-workstation-panel.yaml @@ -37,7 +37,7 @@ packages: #heat_package: !include packages/Blackymas/nspanel_esphome_addon_climate_heat.yaml #cool_package: !include packages/Blackymas/nspanel_esphome_addon_climate_cool.yaml #cover_package: !include packages/Blackymas/esphome/nspanel_esphome_addon_cover.yaml - advanced_package: !include packages/Blackymas/esphome/nspanel_esphome_advanced.yaml + #advanced_package: !include packages/Blackymas/esphome/nspanel_esphome_advanced.yaml ble_proxy_package: !include packages/Blackymas/esphome/nspanel_esphome_addon_bluetooth_proxy.yaml #nspanel_core: !include packages/Blackymas/esphome/nspanel_esphome_core.yaml #nspanel_upload_tft: !include packages/Blackymas/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml @@ -53,6 +53,21 @@ packages: # #- nspanel_esphome_core.yaml # Base package # #- nspanel_esphome_upload_tft.yaml # Use only if you have issues with TFT transfer + manual_ip: !include + file: packages/config_manual_ip.yaml + vars: + ip: !secret ip_office_workstation_panel + +#uart: +# - id: !extend tf_uart +# debug: +# direction: BOTH +# dummy_receiver: false +# after: +# delimiter: 0xff, 0xff, 0xff +# sequence: +# - lambda: UARTDebug::log_string(direction, bytes); + #bluetooth_proxy: # active: true #esphome: @@ -102,11 +117,6 @@ packages: #CONFIG_SPIRAM_CACHE_WORKAROUND: "y" #CONFIG_SPIRAM_SUPPORT: "y" -#psram: -# id: ext_ram - #mode: octal - #speed: 120MHz - #button: # - id: release_ble # name: DEBUG Release Bluetooth @@ -155,11 +165,6 @@ packages: # - -DDCONFIG_D0WD_PSRAM_CLK_IO=5 # - -DDCONFIG_D0WD_PSRAM_CS_IO=18 - -#GPIO05 - PSRAM SCLK -#GPIO18 - PSRAM /CE -#GPIO09 - PSRAM SIO[3] - #switch: # - id: nspanel_psram_sw # name: "PSRAM" @@ -214,9 +219,6 @@ packages: #web_server: !remove -#psram: -# id: nspanel_psram - # - source: # type: git # url: https://github.com/edwardtfn/esphome @@ -232,16 +234,6 @@ packages: # exit_reparse_on_start: true # #soft_reset_on_start: false -#uart: -# - id: !extend tf_uart -# debug: -# direction: BOTH -# dummy_receiver: false -# after: -# delimiter: 0xff, 0xff, 0xff -# sequence: -# - lambda: UARTDebug::log_string(direction, bytes); - debug: text_sensor: diff --git a/esphome/packages/base_shelly_plus_1pm.yaml b/esphome/packages/base_shelly_plus_1pm.yaml index 7843130..0bc2674 100644 --- a/esphome/packages/base_shelly_plus_1pm.yaml +++ b/esphome/packages/base_shelly_plus_1pm.yaml @@ -85,12 +85,12 @@ sensor: - id: temp_analog_reading platform: adc pin: GPIO32 - attenuation: 11db + attenuation: 12db - platform: adc name: "Relay Supply Voltage" pin: GPIO33 - attenuation: 11db + attenuation: 12db filters: - multiply: 8 diff --git a/esphome/packages/config_wifi.yaml b/esphome/packages/config_wifi.yaml index ae4a2df..5bd9a41 100644 --- a/esphome/packages/config_wifi.yaml +++ b/esphome/packages/config_wifi.yaml @@ -5,11 +5,16 @@ wifi: domain: !secret lan_domain fast_connect: true ap: - ssid: "ESPHome fallback" + # ssid: "ESPHome fallback" password: !secret fallback_password ap_timeout: minutes: 5 +binary_sensor: + - platform: status + name: "Status" + device_class: connectivity + #button: # - platform: template # name: WiFi restart diff --git a/packages/areas/balcony/balcony_cover.yaml b/packages/areas/balcony/balcony_cover.yaml deleted file mode 100644 index 6b3f282..0000000 --- a/packages/areas/balcony/balcony_cover.yaml +++ /dev/null @@ -1,27 +0,0 @@ -automation: - - alias: Balcony - Covers - Open when the door opens - id: '1668275331938' - description: '' - trigger: - - platform: state - entity_id: - - binary_sensor.balcony_door - from: 'off' - to: 'on' - id: Open - condition: - - condition: numeric_state - entity_id: cover.balcony_curtain - attribute: current_position - below: 90 - action: - - service: cover.open_cover - data: {} - target: - entity_id: cover.balcony_curtain - - service: cover.set_cover_position - data: - position: 0 - target: - entity_id: cover.balcony_curtain - mode: single diff --git a/packages/areas/balcony/balcony_door.yaml b/packages/areas/balcony/balcony_door.yaml deleted file mode 100644 index 46740f0..0000000 --- a/packages/areas/balcony/balcony_door.yaml +++ /dev/null @@ -1,17 +0,0 @@ -automation: - - alias: Balcony - Door - Announce to Alexa - id: '1669284734009' - description: '' - trigger: - - platform: state - entity_id: - - binary_sensor.balcony_door - from: 'off' - to: 'on' - condition: [] - action: - - service: notify.alexa_media - data: - target: Kitchen - message: The balcony''s door is open. - mode: single diff --git a/packages/areas/balcony/balcony_electricity.yaml b/packages/areas/balcony/balcony_electricity.yaml deleted file mode 100644 index e705c1f..0000000 --- a/packages/areas/balcony/balcony_electricity.yaml +++ /dev/null @@ -1,21 +0,0 @@ -sensor: - - name: Balcony - Total power - platform: group - unique_id: 68b06246-8522-4759-bf20-e3e8d5ea13b3 - unit_of_measurement: "W" - device_class: power - type: sum - ignore_non_numeric: true - entities: - - sensor.balcony_lamp_light_power - - sensor.balcony_lamp_sockets_power - - sensor.balcony_string_lights_power - - - name: Balcony - Total energy - platform: integration - unique_id: 7f1885fd-0935-4d2d-91ce-27d7e1146ab0 - source: sensor.balcony_total_power - round: 2 - unit_prefix: k - unit_time: h - method: trapezoidal diff --git a/packages/areas/balcony/balcony_lights.yaml b/packages/areas/balcony/balcony_lights.yaml deleted file mode 100644 index 5df34d4..0000000 --- a/packages/areas/balcony/balcony_lights.yaml +++ /dev/null @@ -1,123 +0,0 @@ -automation: - - alias: Balcony - String lights - Door based - id: '1644095579661' - description: '' - trigger: - - platform: state - entity_id: - - binary_sensor.balcony_door - from: - - 'on' - - 'off' - to: - - 'on' - - 'off' - - platform: state - entity_id: sensor.civil_solar_day_status - condition: [] - action: - - if: - - condition: state - entity_id: binary_sensor.balcony_door - state: 'on' - - condition: state - entity_id: sensor.civil_solar_day_status - state: night - then: - - service: light.turn_on - data: {} - target: - entity_id: light.balcony_string_lights - else: - - service: light.turn_off - data: {} - target: - entity_id: light.balcony_string_lights - mode: restart - - alias: Balcony - String lights - Sun based - id: '1661722572465' - description: '' - trigger: - - platform: state - entity_id: - - sensor.civil_solar_day_status - - platform: state - entity_id: - - sensor.electricity_price - attribute: price_level_combined - - platform: time - at: 05:30:01 - - platform: time - at: '23:30:01' - - platform: numeric_state - entity_id: sun.sun - attribute: elevation - below: '-3' - - platform: numeric_state - entity_id: sun.sun - attribute: elevation - above: '-3' - condition: [] - action: - - if: - - condition: numeric_state - entity_id: sun.sun - attribute: elevation - below: '-3' - - condition: or - conditions: - - condition: state - entity_id: sensor.electricity_price - attribute: price_level_combined - state: Normal - - condition: state - entity_id: sensor.electricity_price - attribute: price_level_combined - state: Cheap - - condition: state - entity_id: sensor.electricity_price - attribute: price_level_combined - state: Very cheap - - condition: time - after: 05:30:00 - before: '23:30:00' - then: - - if: - - condition: state - entity_id: light.balcony_string_lights - state: 'off' - then: - - service: light.turn_on - data: - transition: 2 - brightness_pct: 15 - target: - entity_id: light.balcony_string_lights - else: - - if: - - condition: state - entity_id: input_boolean.home_party_mode - state: 'off' - - condition: or - conditions: - - condition: not - conditions: - - type: is_open - condition: device - device_id: 8021128bf685776f421e7251ce5e5da5 - entity_id: binary_sensor.balcony_door - domain: binary_sensor - then: - - service: light.turn_off - data: {} - target: - entity_id: light.balcony_string_lights - mode: restart - -light: - - platform: group - name: "Balcony - All lights" - unique_id: a43af511-9bcb-47e7-979d-67d61315092e - entities: - - light.balcony_lamp_light - - light.balcony_string_lights diff --git a/packages/areas/bathroom/bathroom_lights.yaml b/packages/areas/bathroom/bathroom_lights.yaml deleted file mode 100644 index eb61793..0000000 --- a/packages/areas/bathroom/bathroom_lights.yaml +++ /dev/null @@ -1,197 +0,0 @@ -automation: - - alias: Bathroom - Lights - Door based - id: '1641033255729' - trigger: - - platform: state - entity_id: binary_sensor.bathroom_door - id: Opening - from: 'off' - to: 'on' - - platform: state - entity_id: binary_sensor.bathroom_door - id: Closing - from: 'on' - to: 'off' - condition: [] - action: - - choose: - - conditions: - - condition: trigger - id: Opening - sequence: - - type: turn_on - device_id: 3cdd74bfe34c054238c9d0f07cccffb5 - entity_id: light.bathroom_ceiling_lights - domain: light - brightness_pct: 15 - - conditions: - - condition: trigger - id: Closing - sequence: - - type: turn_on - device_id: 3cdd74bfe34c054238c9d0f07cccffb5 - entity_id: light.bathroom_ceiling_lights - domain: light - brightness_pct: 50 - default: [] - mode: restart - - alias: Bathroom - Lights - Motion stops - id: '1640068634769' - trigger: - - platform: state - entity_id: - - binary_sensor.bathroom_motion_dual_sensors_state - to: 'off' - for: - hours: 0 - minutes: 2 - seconds: 0 - condition: - - type: is_open - condition: device - device_id: a2e059c66daa6661b4793e090e03c994 - entity_id: binary_sensor.bathroom_door - domain: binary_sensor - - condition: or - conditions: - - condition: not - conditions: - - condition: device - type: is_off - device_id: 3cdd74bfe34c054238c9d0f07cccffb5 - entity_id: light.bathroom_ceiling_lights - domain: light - - condition: not - conditions: - - condition: device - type: is_off - device_id: f1e32768b729bd9e1f146c4511f96613 - entity_id: light.bathroom_mirror_light - domain: light - action: - - service: light.turn_off - target: - entity_id: - - light.bathroom_ceiling_lights - - light.bathroom_mirror_light - data: - transition: 5 - mode: restart - - alias: Bathroom - Lights - Motion based - id: '1641941254795' - description: '' - trigger: - - platform: state - entity_id: - - binary_sensor.bathroom_motion_dual_sensors_state - to: 'on' - from: 'off' - action: - - choose: - - conditions: - - condition: or - conditions: - - condition: not - conditions: - - condition: state - entity_id: light.bathroom_ceiling_lights - state: 'on' - - condition: numeric_state - entity_id: light.bathroom_ceiling_lights - attribute: brightness - below: 9 - sequence: - - service: light.turn_on - data: - transition: 1 - brightness_pct: 10 - target: - entity_id: light.bathroom_ceiling_lights - default: [] - - wait_for_trigger: - - platform: state - entity_id: - - binary_sensor.bathroom_motion_dual_sensors_state - to: 'off' - continue_on_timeout: false - - delay: - hours: 0 - minutes: 0 - seconds: 10 - milliseconds: 0 - - choose: - - conditions: - - condition: state - entity_id: binary_sensor.bathroom_door - state: 'off' - sequence: - - wait_for_trigger: - - platform: state - entity_id: - - binary_sensor.bathroom_door - to: 'on' - continue_on_timeout: false - default: [] - - choose: - - conditions: - - condition: state - entity_id: binary_sensor.bathroom_door - state: 'on' - - condition: not - conditions: - - condition: state - entity_id: light.bathroom_ceiling_lights - state: 'off' - sequence: - - service: light.turn_on - target: - entity_id: light.bathroom_ceiling_lights - data: - transition: 5 - brightness_pct: 5 - - delay: - hours: 0 - minutes: 0 - seconds: 10 - milliseconds: 0 - default: [] - - choose: - - conditions: - - condition: state - entity_id: binary_sensor.bathroom_door - state: 'on' - - condition: or - conditions: - - condition: state - entity_id: light.bathroom_ceiling_lights - state: 'on' - - condition: state - entity_id: light.bathroom_mirror_light - state: 'on' - sequence: - - service: light.turn_off - target: - entity_id: - - light.bathroom_ceiling_lights - - light.bathroom_mirror_light - data: - transition: 5 - default: [] - mode: restart - - alias: Bathroom - Mirror lights - Mirror's doors based - id: '1661764961929' - use_blueprint: - path: EdwardTFN/set_entities_based_on_other_entities.yaml - input: - input_entities: - - binary_sensor.bathroom_mirror_door - target_entities: - - light.bathroom_mirror_light - -light: - - platform: group - name: "Bathroom - All lights" - unique_id: d8aee04c-bce5-423b-84e1-5af7259a5998 - entities: - - light.bathroom_ceiling_lights - - light.bathroom_mirror_light diff --git a/packages/areas/bathroom/bathroom_occupancy.yaml b/packages/areas/bathroom/bathroom_occupancy.yaml deleted file mode 100644 index 9d2e53a..0000000 --- a/packages/areas/bathroom/bathroom_occupancy.yaml +++ /dev/null @@ -1,27 +0,0 @@ -binary_sensor: - - name: Bathroom - Motion - Dual sensors state - platform: group - unique_id: fb0a26b1-c832-406d-8e07-fbef740a6654 - device_class: motion - entities: - - binary_sensor.bathroom_motion - - binary_sensor.bathroom_shower_motion_occupancy - - - name: Bathroom - Mirro's cabinet doors - platform: group - unique_id: 6679ce44-f051-4181-a805-1ff078d54a3a - device_class: opening - entities: - - binary_sensor.bathroom_drawers - - binary_sensor.bathroom_mirror_door - -sensor: - - platform: history_stats - name: Bathroom - Motion ratio in the last 10m - entity_id: binary_sensor.bathroom_motion_dual_sensors_state - state: "on" - type: ratio - #start: "{{ (now() + timedelta(minutes=-10)) }}" - end: "{{ now() }}" - duration: - minutes: 10 diff --git a/packages/areas/bedroom/bedroom_electricity.yaml b/packages/areas/bedroom/bedroom_electricity.yaml deleted file mode 100644 index 193fd1b..0000000 --- a/packages/areas/bedroom/bedroom_electricity.yaml +++ /dev/null @@ -1,36 +0,0 @@ -automation: - - alias: Bedroom - Always on - id: c7ffed8e-cb93-4435-8f08-69b6115897bd - description: '' - use_blueprint: - path: EdwardTFN/always_on.yaml - input: - timeout: 60 - entities_list: - - switch.bedroom_power_strip_1_echo - - switch.bedroom_power_strip_1_usb - -sensor: - - name: Bedroom - Total power - platform: group - unique_id: d8e8383e-16eb-4324-a6b6-586699762b63 - unit_of_measurement: "W" - device_class: power - type: sum - ignore_non_numeric: true - entities: - - sensor.bedroom_ceiling_lights_power - - sensor.bedroom_closet_lights_power - - sensor.bedroom_closet_outlets_power - - sensor.bedroom_outlets_carol_power - - sensor.bedroom_outlets_edward_power - - sensor.bedroom_tv_rack_power - - - name: Bedroom - Total energy - platform: integration - unique_id: 5214fe98-81af-411e-819b-06a0603bf47b - source: sensor.bedroom_total_power - round: 2 - unit_prefix: k - unit_time: h - method: trapezoidal diff --git a/packages/areas/corridor/corridor_electricity.yaml b/packages/areas/corridor/corridor_electricity.yaml deleted file mode 100644 index 206ed4c..0000000 --- a/packages/areas/corridor/corridor_electricity.yaml +++ /dev/null @@ -1,20 +0,0 @@ -sensor: - - name: Corridor - Total power - platform: group - unique_id: 4ab7c4c8-9d8b-4e2c-a412-e3fdf7f47b2b - unit_of_measurement: "W" - device_class: power - type: sum - ignore_non_numeric: true - entities: - - sensor.corridor_ceiling_lights_power - - sensor.corridor_outlet_1_power - - - name: Corridor - Total energy - platform: integration - unique_id: d239babe-b909-4941-af0c-864df6c67a3b - source: sensor.corridor_total_power - round: 2 - unit_prefix: k - unit_time: h - method: trapezoidal diff --git a/packages/areas/guest_room/guest_room_electricity.yaml b/packages/areas/guest_room/guest_room_electricity.yaml deleted file mode 100644 index 45892f3..0000000 --- a/packages/areas/guest_room/guest_room_electricity.yaml +++ /dev/null @@ -1,23 +0,0 @@ -sensor: - - name: Guest room - Total power - platform: group - unique_id: 7c699742-8468-4e35-8e39-4f9cde7314c2 - unit_of_measurement: "W" - device_class: power - type: sum - ignore_non_numeric: true - entities: - - sensor.guest_room_closet_lights_power - - sensor.guest_room_closet_outlets_power - - sensor.guest_room_door_outlets_ceiling_lights_power - - sensor.guest_room_door_outlets_outlet_power - - sensor.guest_room_windows_outlets_power - - - name: Guest room - Total energy - platform: integration - unique_id: d023fdfc-7999-42a4-a2e5-c00c281e4740 - source: sensor.guest_room_total_power - round: 2 - unit_prefix: k - unit_time: h - method: trapezoidal diff --git a/packages/areas/hall/hall_electricity.yaml b/packages/areas/hall/hall_electricity.yaml deleted file mode 100644 index 6a69bf4..0000000 --- a/packages/areas/hall/hall_electricity.yaml +++ /dev/null @@ -1,21 +0,0 @@ -sensor: - - name: Hall - Total power - platform: group - unique_id: e7dfb98d-dd87-4b31-b8fd-10f5f5eeec85 - unit_of_measurement: "W" - device_class: power - type: sum - ignore_non_numeric: true - entities: - - sensor.hall_light_switch_light_power - - sensor.hall_light_switch_panel_power - - sensor.hall_outlets_power - - - name: Hall - Total energy - platform: integration - unique_id: ae63c847-b4a5-4761-8012-96887d6bb04a - source: sensor.hall_total_power - round: 2 - unit_prefix: k - unit_time: h - method: trapezoidal diff --git a/packages/areas/hall/hall_lights.yaml b/packages/areas/hall/hall_lights.yaml index 1ce6c57..6a5ba49 100644 --- a/packages/areas/hall/hall_lights.yaml +++ b/packages/areas/hall/hall_lights.yaml @@ -8,7 +8,7 @@ automation: light_level_high: 75 light_level_dimmer: 25 motion_entity: binary_sensor.hall_presence - light_target: light.hall_ceiling_light + light_target: light.hall_all_lights no_motion_wait_to_dimming: 90 no_motion_wait_to_off: 5 lumens_entity: sensor.hall_motion_illuminance @@ -19,4 +19,4 @@ light: platform: group unique_id: 7782c1bb-f612-4f4a-9fd2-010a028ea34c entities: - - light.hall_ceiling_light + - light.hall_lights diff --git a/packages/areas/hall/hall_occupancy.yaml b/packages/areas/hall/hall_occupancy.yaml index a3cbbed..2c6f097 100644 --- a/packages/areas/hall/hall_occupancy.yaml +++ b/packages/areas/hall/hall_occupancy.yaml @@ -3,8 +3,5 @@ binary_sensor: name: Hall - Presence device_class: presence entities: - - binary_sensor.hall_presence_motion - - binary_sensor.hall_presence_occupancy - - binary_sensor.hall_motion_motion - - binary_sensor.hall_motion_occupancy - binary_sensor.hall_front_door + - binary_sensor.hall_motion_occupancy diff --git a/packages/areas/kitchen/kitchen_bench.yaml b/packages/areas/kitchen/kitchen_bench.yaml index 7af5f54..d352171 100644 --- a/packages/areas/kitchen/kitchen_bench.yaml +++ b/packages/areas/kitchen/kitchen_bench.yaml @@ -15,20 +15,3 @@ automation: no_motion_wait_to_off: 15 pause_entities_on: - input_boolean.home_party_mode - -sensor: - - name: Kitchen - Bench - Total power - platform: group - unique_id: 1b0da3e6-ade5-484e-bd3a-0c6ef60739ec - unit_of_measurement: "W" - device_class: power - type: sum - ignore_non_numeric: true - entities: - - sensor.kitchen_bench_outlets_1_outlets_power - - sensor.kitchen_bench_outlets_1_usb_power - - sensor.kitchen_bench_outlets_2_power - - sensor.kitchen_bench_outlets_3_power - - sensor.kitchen_bench_left_light_power - - sensor.kitchen_bench_right_light_power - - sensor.kitchen_cooker_hood_power diff --git a/packages/areas/kitchen/kitchen_electricity.yaml b/packages/areas/kitchen/kitchen_electricity.yaml deleted file mode 100644 index d2c9c9f..0000000 --- a/packages/areas/kitchen/kitchen_electricity.yaml +++ /dev/null @@ -1,46 +0,0 @@ -automation: - - alias: Kitchen - Always on - id: f711c2a0-4b8a-4aed-b8bb-5a2ce62aed4f - description: '' - use_blueprint: - path: EdwardTFN/always_on.yaml - input: - timeout: 60 - entities_list: - - switch.kitchen_cooker_hood - -sensor: - - name: Kitchen - Total power - platform: group - unique_id: ed9f9dd1-8dfc-421b-8a45-f2461ef0b468 - unit_of_measurement: "W" - device_class: power - type: sum - ignore_non_numeric: true - entities: - - sensor.kitchen_bench_left_light_power - - sensor.kitchen_bench_outlets_1_outlets_power - - sensor.kitchen_bench_outlets_1_usb_power - - sensor.kitchen_bench_outlets_2_power - - sensor.kitchen_bench_outlets_3_power - - sensor.kitchen_bench_right_light_power - - sensor.kitchen_ceiling_lights_table_lights_power - - sensor.kitchen_ceiling_lights_windows_lights_power - - sensor.kitchen_cooktop_l1_outlet_power - - sensor.kitchen_cooktop_l2_outlet_power - - sensor.kitchen_cooktop_l3_outlet_power - - sensor.kitchen_dishwasher_outlet_power - - sensor.kitchen_microwave_power - - sensor.kitchen_oven_power - - sensor.kitchen_refrigeration_freezer_outlet_power - - sensor.kitchen_refrigeration_fridge_outlet_power - - sensor.kitchen_windows_wall_outlet_power - - - name: Kitchen - Total energy - platform: integration - unique_id: 8b737f55-a4c5-4fb9-8306-b6976aee6223 - source: sensor.kitchen_total_power - round: 2 - unit_prefix: k - unit_time: h - method: trapezoidal diff --git a/packages/areas/kitchen/kitchen_lights.yaml b/packages/areas/kitchen/kitchen_lights.yaml index c651663..f64f869 100644 --- a/packages/areas/kitchen/kitchen_lights.yaml +++ b/packages/areas/kitchen/kitchen_lights.yaml @@ -68,14 +68,5 @@ light: unique_id: ffd1b649-a851-4450-b1c0-5a2f9b366a20 entities: - light.kitchen_bench_lights + - light.kitchen_ceiling_lights - light.kitchen_table_lights - - light.curtains_lights_segment_kitchen - - - name: Kitchen - Curtain's lights - platform: group - unique_id: ab310c80-71d4-460d-987c-8a2bb221ffa3 - entities: - - light.curtain_s_lights_master - - light.curtains_lights_segment_kitchen - - light.curtain_s_lights_segment_balcony_door - - light.curtain_s_lights_segment_living_room diff --git a/packages/areas/kitchen/kitchen_table.yaml b/packages/areas/kitchen/kitchen_table.yaml deleted file mode 100644 index 81a2db6..0000000 --- a/packages/areas/kitchen/kitchen_table.yaml +++ /dev/null @@ -1,63 +0,0 @@ -automation: - - alias: Kitchen - Table - Lights - Motion - id: '1668453604752' - description: '' - use_blueprint: - path: EdwardTFN/light_motion_illuminance_2_levels.yaml - input: - motion_entity: binary_sensor.kitchen_table_occupancy_combined - lumens_entity: sensor.kitchen_table_motion_illuminance - light_target: light.kitchen_table_lights - light_level_high: 90 - light_level_dimmer: 25 - no_motion_wait_to_dimming: 90 - max_sun_angle: 90 - max_lumens: 15 - pause_entities_on: - - binary_sensor.living_room_tv_is_on - - input_boolean.home_party_mode - #occupancy_ratio_entity: sensor.kitchen_table_motion_ratio_in_the_last_10m - #occupancy_ratio_threshold: 10 - - alias: Kitchen - Table - Lights - Wall switch - id: '1661932373416' - description: '' - use_blueprint: - path: EdwardTFN/light_switch_toggle.yaml - input: - input_entity: binary_sensor.kitchen_ceiling_lights_table_lights_input - light_target: light.kitchen_table_lights - -binary_sensor: - - name: Kitchen - Table - Occupancy - Combined - platform: group - unique_id: 1b8ed9a2-0985-4407-bbc3-084a568cc401 - device_class: occupancy - entities: - - binary_sensor.kitchen_table_occupancy_motion - - binary_sensor.kitchen_table_occupancy_occupancy - - binary_sensor.kitchen_table_motion_motion - - binary_sensor.kitchen_table_motion_occupancy - - binary_sensor.kitchen_table_presence - - binary_sensor.kitchen_presence_motion - - binary_sensor.kitchen_presence_occupancy - -light: - - platform: group - name: "Kitchen - Table - Lights" - unique_id: 2b57238c-783e-48a1-a40e-f985bcf91953 - #icon: mdi:ceiling-light-multiple - entities: - - light.kitchen_table_light_1 - - light.kitchen_table_light_2 - - light.kitchen_table_light_3 - -sensor: - - name: Kitchen - Table - Motion ratio in the last 10m - platform: history_stats - entity_id: binary_sensor.kitchen_motion_all - state: "on" - type: ratio - #start: "{{ (now() + timedelta(minutes=-10)) }}" - end: "{{ now() }}" - duration: - minutes: 10 diff --git a/packages/areas/laundry/laundry_electricity.yaml b/packages/areas/laundry/laundry_electricity.yaml deleted file mode 100644 index 8a65d3f..0000000 --- a/packages/areas/laundry/laundry_electricity.yaml +++ /dev/null @@ -1,22 +0,0 @@ -sensor: - - name: Laundry - Total power - platform: group - unique_id: c1adb8ac-8515-4959-909f-025c5ceb95a7 - unit_of_measurement: "W" - device_class: power - type: sum - ignore_non_numeric: true - entities: - - sensor.bathroom_towel_warmer_power - - sensor.laundry_bench_outlets_power - - sensor.laundry_dryer_outlet_power - - sensor.laundry_washing_machine_power - - - name: Laundry - Total energy - platform: integration - unique_id: ffd01b7d-fa1c-4af4-83e7-2a7b53471bd4 - source: sensor.laundry_total_power - round: 2 - unit_prefix: k - unit_time: h - method: trapezoidal diff --git a/packages/areas/living_room/living_room_electricity.yaml b/packages/areas/living_room/living_room_electricity.yaml deleted file mode 100644 index 12e598f..0000000 --- a/packages/areas/living_room/living_room_electricity.yaml +++ /dev/null @@ -1,38 +0,0 @@ -automation: - - alias: Living room - Always on - id: 75d18245-d852-41c3-bc38-085b93aaf518 - description: '' - use_blueprint: - path: EdwardTFN/always_on.yaml - input: - timeout: 60 - entities_list: - - switch.living_room_network_strip_1_socket_1 - - switch.living_room_network_strip_1_socket_2 - - switch.living_room_network_strip_1_socket_3 - - switch.living_room_network_strip_1_socket_4 - - switch.living_room_network_strip_1_usb - -sensor: - - name: Living room - Total power - platform: group - unique_id: d456266c-cc95-4cb8-a4df-54ee4380aefb - unit_of_measurement: "W" - device_class: power - type: sum - ignore_non_numeric: true - entities: - - sensor.living_room_lights_map_wall_power - - sensor.living_room_lights_tv_wall_power - - sensor.living_room_map_wall_outlets_power - - sensor.living_room_tv_rack_outlets_power - - sensor.living_room_windows_wall_outlets_power - - - name: Living room - Total energy - platform: integration - unique_id: a1681656-e948-47a7-b0de-7e674110bc5e - source: sensor.living_room_total_power - round: 2 - unit_prefix: k - unit_time: h - method: trapezoidal diff --git a/packages/areas/living_room/living_room_lights.yaml b/packages/areas/living_room/living_room_lights.yaml deleted file mode 100644 index 6aa53c2..0000000 --- a/packages/areas/living_room/living_room_lights.yaml +++ /dev/null @@ -1,6 +0,0 @@ -light: - - name: "Living room - All lights" - platform: group - unique_id: 9537f665-4ac9-4585-8f5a-a2ab5a8ddab2 - entities: - - light.curtains_lights_segment_kitchen diff --git a/packages/areas/media_centre/media_centre_electricity.yaml b/packages/areas/media_centre/media_centre_electricity.yaml deleted file mode 100644 index 6087f83..0000000 --- a/packages/areas/media_centre/media_centre_electricity.yaml +++ /dev/null @@ -1,20 +0,0 @@ -sensor: - - name: Media centre - Total power - platform: group - unique_id: 6261b8f8-27d2-48dd-b924-5812ffcb983a - unit_of_measurement: "W" - device_class: power - type: sum - ignore_non_numeric: true - entities: - - sensor.media_centre_switch_outlets_power - - sensor.media_centre_switch_power_strip_power - - - name: Media centre - Total energy - platform: integration - unique_id: 7eaecc6c-1be6-4cb8-a817-2996117bf951 - source: sensor.media_centre_total_power - round: 2 - unit_prefix: k - unit_time: h - method: trapezoidal diff --git a/packages/areas/office/office_electricity.yaml b/packages/areas/office/office_electricity.yaml index 63d11b6..cb4ab8a 100644 --- a/packages/areas/office/office_electricity.yaml +++ b/packages/areas/office/office_electricity.yaml @@ -1,25 +1,3 @@ -sensor: - - name: Office - Total power - platform: group - unique_id: bc1b1004-a388-4465-9a1f-8d392901a99f - unit_of_measurement: "W" - device_class: power - type: sum - ignore_non_numeric: true - entities: - - sensor.office_door_outlets_power - - sensor.office_windows_outlets_ceiling_lights_power - - sensor.office_windows_outlets_outlets_power - - - name: Office - Total energy - platform: integration - unique_id: d3687764-e2ad-4b5e-9cbd-aa33ff7d22e1 - source: sensor.office_total_power - round: 2 - unit_prefix: k - unit_time: h - method: trapezoidal - zha: device_config: 70:b3:d5:2b:60:01:20:b2_1: @@ -32,3 +10,13 @@ zha: type: "switch" 70:b3:d5:2b:60:01:20:b2_5: type: "switch" + a4:c1:38:5c:a7:f2:c6:d1_1: + type: switch + a4:c1:38:5c:a7:f2:c6:d1_2: + type: switch + a4:c1:38:5c:a7:f2:c6:d1_3: + type: switch + a4:c1:38:5c:a7:f2:c6:d1_4: + type: switch + a4:c1:38:5c:a7:f2:c6:d1_5: + type: switch diff --git a/packages/areas/office/office_lights.yaml b/packages/areas/office/office_lights.yaml deleted file mode 100644 index 735e694..0000000 --- a/packages/areas/office/office_lights.yaml +++ /dev/null @@ -1,31 +0,0 @@ -automation: - - alias: Office - Lights - Motion based - id: '1669505865097' - use_blueprint: - path: EdwardTFN/light_motion_illuminance_2_levels.yaml - input: - motion_entity: binary_sensor.office_motion - lumens_entity: sensor.office_motion_illuminance - light_target: light.office_ceiling_lines - no_motion_wait_to_dimming: 60 - no_motion_wait_to_off: 30 - light_level_high: 35 - light_level_dimmer: 15 - max_lumens: 30 - occupancy_ratio_entity: [] - - alias: Office - Lights - Wall switch based - id: '1660893344529' - description: '' - use_blueprint: - path: EdwardTFN/light_switch_toggle.yaml - input: - input_entity: binary_sensor.office_lights_outlet_input - light_target: light.office_ceiling_lines - -light: - - name: "Office - All lights" - platform: group - unique_id: 5b9b2fd0-edec-4ee9-8488-11abcd5d5b39 - entities: - - light.office_ceiling_lines - - light.office_workstation_lights diff --git a/packages/climate.yaml b/packages/climate.yaml index b2a5793..4a7b98e 100644 --- a/packages/climate.yaml +++ b/packages/climate.yaml @@ -168,7 +168,7 @@ template: unique_id: 98145c69-93c1-4239-842c-4c7c3b7ad530 unit_of_measurement: "°C" device_class: temperature - state: "{{ state_attr('weather.home', 'temperature') | default('unknown') }}" + state: "{{ state_attr('weather.borasvagen', 'temperature') | default('unknown') }}" # - name: Home - Average room temperature (rounded) # unique_id: 42816c14-97c2-4c6f-804b-723fb1a0ba97 diff --git a/packages/electricity/energy_consumption.yaml b/packages/electricity/energy_consumption.yaml deleted file mode 100644 index e13d131..0000000 --- a/packages/electricity/energy_consumption.yaml +++ /dev/null @@ -1,43 +0,0 @@ -sensor: - - name: Total power - platform: group - unique_id: cfc588f6-3143-42d6-968b-1e669e3c7ca4 - unit_of_measurement: "W" - device_class: power - type: sum - ignore_non_numeric: true - entities: - - sensor.balcony_total_power - - sensor.bathroom_total_power - - sensor.bedroom_total_power - - sensor.corridor_total_power - - sensor.guest_room_total_power - - sensor.guest_bathroom_total_power - - sensor.hall_total_power - - sensor.kitchen_total_power - - sensor.laundry_total_power - - sensor.living_room_total_power - - sensor.media_centre_total_power - - sensor.office_total_power - - - name: Total energy - platform: group - unique_id: e6ea5908-d766-47d8-979c-c9b684f42752 - unit_of_measurement: "kWh" - device_class: energy - state_class: total #measurement - type: sum - ignore_non_numeric: true - entities: - - sensor.balcony_total_energy - - sensor.bathroom_total_energy - - sensor.bedroom_total_energy - - sensor.corridor_total_energy - - sensor.guest_room_total_energy - - sensor.guest_bathroom_total_energy - - sensor.hall_total_energy - - sensor.kitchen_total_energy - - sensor.laundry_total_energy - - sensor.living_room_total_energy - - sensor.media_centre_total_energy - - sensor.office_total_energy diff --git a/packages/home.yaml b/packages/home.yaml index d489909..a16b0ee 100644 --- a/packages/home.yaml +++ b/packages/home.yaml @@ -20,175 +20,6 @@ automation: - {{sensors}} threshold: 15 time: '18:00:00' - - alias: Home - Covers - Reset when stuck in a state - id: '1662801171931' - description: '' - trigger: - - platform: state - entity_id: - - cover.balcony_curtain - #- cover.bedroom_curtains - #- cover.bedroom_curtains_dual - - cover.bedroom_curtain_left - - cover.bedroom_curtain_right - - cover.guest_room_shutter_cover - #- cover.living_room_blinds - - cover.living_room_blind_right_cover - - cover.living_room_blind_centre_cover - - cover.living_room_blind_left_cover_2 - - cover.office_roller_blind_1_cover - - cover.office_roller_blind_2_cover - #- cover.office_roller_blinds_all - - cover.office_shutter_1_cover - - cover.office_shutter_2_cover - #- cover.office_shutters_all - for: - hours: 0 - minutes: 15 - seconds: 0 - to: - - closing - - opening - condition: [] - action: - - service: notify.signal_edward - data: - message: 'Cover {{ trigger.entity_id }} is stuck on state "{{ states(trigger.entity_id) }}. Sending a stop call.' - - service: cover.stop_cover - target: - entity_id: '{{ trigger.entity_id }}' - mode: parallel - max: 15 - - alias: Home - Silence hours - id: '1654865795294' - description: '' - trigger: - - platform: time - at: '21:30:00' - id: Prepare for quite hours - - platform: time - at: 07:30:00 - id: Quite hours starts - - platform: time - at: 08:00:00 - id: Quite hours ends - condition: - - condition: state - entity_id: input_boolean.home_party_mode - state: 'off' - - condition: state - entity_id: input_boolean.home_travelling_mode - state: 'off' - action: - - choose: - - conditions: - - condition: trigger - id: Prepare for quite hours - sequence: - - parallel: - - if: - - condition: not - conditions: - - condition: state - entity_id: vacuum.roborock_q_revo - state: "is_docked" - then: - - service: vacuum.return_to_base - data: {} - target: - entity_id: vacuum.roborock_q_revo - - if: - - condition: state - entity_id: switch.laundry_washing_machine_outlet - state: "on" - then: - - wait_for_trigger: - - platform: numeric_state - entity_id: sensor.laundry_washing_machine_power - for: - hours: 0 - minutes: 5 - seconds: 0 - below: '2' - continue_on_timeout: false - - service: switch.turn_off - data: {} - target: - entity_id: switch.laundry_washing_machine_outlet - - if: - - condition: state - entity_id: switch.laundry_dryer_outlet - state: "on" - then: - - wait_for_trigger: - - platform: numeric_state - entity_id: sensor.laundry_dryer_outlet_power - for: - hours: 0 - minutes: 5 - seconds: 0 - below: '2' - continue_on_timeout: false - - service: switch.turn_off - data: {} - target: - entity_id: switch.laundry_dryer_outlet - - conditions: - - condition: trigger - id: Quite hours starts - sequence: - - parallel: - - if: - - condition: not - conditions: - - condition: state - entity_id: vacuum.roborock_q_revo - state: "is_docked" - then: - - service: vacuum.stop - data: {} - target: - entity_id: vacuum.roborock_q_revo - - if: - - condition: state - entity_id: switch.laundry_washing_machine_outlet - state: "on" - then: - - wait_for_trigger: - - platform: numeric_state - entity_id: sensor.laundry_washing_machine_power - above: '10' - continue_on_timeout: false - - service: notify.signal_group_home - data: - message: Silence hours - Looks like the washer was left running at this - time. Please take a look. - - if: - - condition: state - entity_id: switch.laundry_dryer_outlet - state: "on" - then: - - wait_for_trigger: - - platform: numeric_state - entity_id: sensor.laundry_dryer_outlet_power - above: '10' - continue_on_timeout: false - - service: notify.signal_group_home - data: - message: Silence hours - Looks like the dryer was left running at this - time. Please take a look. - - conditions: - - condition: trigger - id: Quite hours ends - sequence: - - service: switch.turn_on - data: {} - target: - entity_id: - - switch.laundry_washing_machine_outlet - - switch.laundry_dryer_outlet - default: [] - mode: restart emulated_hue: # https://www.home-assistant.io/integrations/emulated_hue host_ip: !secret ip_home_assistant @@ -210,54 +41,27 @@ emulated_hue: # https://www.home-assistant.io/integrations/emulated_hue hidden: false #### Balcony #### - light.balcony_lamp_light: - name: Lamp - hidden: false - light.balcony_string_lights: - name: String lights + light.balcony_light: + name: Balcony light hidden: false #### Bathroom #### - light.bathroom_ceiling_lights: - name: Ceiling lights - hidden: false - light.bathroom_mirror_light: - name: Mirror lights - hidden: false #### Bedroom #### light.bedroom_carol_light: name: "Carol's lights" hidden: false - light.bedroom_closet_lights: - name: Closet lights - hidden: false light.bedroom_edward_light: name: "Edward's lights" hidden: false - switch.bedroom_power_strip_1_tv_samsung: # TV Samsung - name: Samsung - hidden: false #### Corridor #### - light.corridor_all_lights: - name: Corridor lights - hidden: false #### Guest bathroom #### - light.guest_bathroom_ceiling_light: - name: Ceiling lights - hidden: false - light.guest_bathroom_mirror_lights: - name: Mirror lights - hidden: false #### Guest room #### - light.guest_room_closet_lights: - name: Closet lights - hidden: false - light.guest_room_wall_lights: - name: Wall lights + switch.guest_room_panel_relay_1: + name: Guest room lights hidden: false #### Hall #### @@ -276,15 +80,9 @@ emulated_hue: # https://www.home-assistant.io/integrations/emulated_hue #### Living room #### #### Office #### - light.office_ceiling_lines: - name: Ceiling lines lights - hidden: false light.office_workstation_lights: name: Workstation lights hidden: false - light.kitchen_curtain_s_lights: - name: Curtains lights - hidden: false input_boolean: home_display_motion_sensors: @@ -309,6 +107,7 @@ light: - light.kitchen_all_lights - light.living_room_all_lights - light.office_all_lights + - light.outdoor_lights - name: "Home - All lights (except bathrooms)" platform: group