From 4b59f3b95905d4a11fd2217cd65400433140d18e Mon Sep 17 00:00:00 2001 From: Kyle Gordon Date: Sat, 3 Jun 2023 18:45:58 +0100 Subject: [PATCH 01/14] Rename ensuite sensor --- groups.yaml | 2 +- packages/device_alerts.yaml | 2 +- packages/ensuite.yaml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/groups.yaml b/groups.yaml index 45a2a6ce..4762d2ba 100644 --- a/groups.yaml +++ b/groups.yaml @@ -94,7 +94,7 @@ ensuite: name: Ensuite entities: - sensor.ensuite_lightlevel - - binary_sensor.ensuite_motion + - binary_sensor.ensuite_motion_occupancy - light.ensuite_entrance - light.ensuite_towels - light.ensuite_shower diff --git a/packages/device_alerts.yaml b/packages/device_alerts.yaml index d9dc41d4..77c7152b 100644 --- a/packages/device_alerts.yaml +++ b/packages/device_alerts.yaml @@ -9,7 +9,7 @@ automation: - sensor.garage_temperature - binary_sensor.hall_door_motion - binary_sensor.hall_rooms_motion - - binary_sensor.ensuite_motion + - binary_sensor.ensuite_motion_occupancy - binary_sensor.living_room_motion - binary_sensor.kitchen_motion - binary_sensor.front_hall_motion diff --git a/packages/ensuite.yaml b/packages/ensuite.yaml index f55ce55c..eb9b6ee4 100644 --- a/packages/ensuite.yaml +++ b/packages/ensuite.yaml @@ -44,7 +44,7 @@ automation: - alias: Ensuite motion trigger: - platform: state - entity_id: binary_sensor.ensuite_motion + entity_id: binary_sensor.ensuite_motion_occupancy to: 'on' from: 'off' action: @@ -135,7 +135,7 @@ automation: - alias: Ensuite motion - night timeout trigger: - platform: state - entity_id: binary_sensor.ensuite_motion + entity_id: binary_sensor.ensuite_motion_occupancy to: 'off' for: minutes: 2 @@ -153,7 +153,7 @@ automation: - alias: Ensuite motion - regular timeout trigger: - platform: state - entity_id: binary_sensor.ensuite_motion + entity_id: binary_sensor.ensuite_motion_occupancy to: 'off' for: minutes: 10 From a1aafefc9103d30dde31545a2c8fd65a04ff76ca Mon Sep 17 00:00:00 2001 From: Kyle Gordon Date: Sat, 3 Jun 2023 18:58:11 +0100 Subject: [PATCH 02/14] Guest room --- groups.yaml | 6 +++--- sensors.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/groups.yaml b/groups.yaml index 4762d2ba..061b1ab1 100644 --- a/groups.yaml +++ b/groups.yaml @@ -116,9 +116,9 @@ bedroom_2: name: Guest bedroom entities: - light.guest_bedroom - - sensor.guest_room_temperature - - sensor.guest_room_pressure - - sensor.guest_room_humidity + - sensor.guest_room_multi_sensor_temperature + - sensor.guest_room_multi_sensor_pressure + - sensor.guest_room_multi_sensor_humidity bedroom_3: name: Study diff --git a/sensors.yaml b/sensors.yaml index d0580693..d9472bce 100644 --- a/sensors.yaml +++ b/sensors.yaml @@ -93,7 +93,7 @@ entity_ids: - sensor.front_hall_sensor_humidity - sensor.craft_room_humidity - - sensor.guest_room_humidity + - sensor.guest_room_multi_sensor_humidity - sensor.living_room_humidity - sensor.master_bedroom_humidity - sensor.nook_humidity @@ -175,8 +175,8 @@ guest_room: friendly_name: Guest Room unique_id: guest_room_thermal_comfort - temperature_sensor: sensor.guest_room_temperature - humidity_sensor: sensor.guest_room_humidity + temperature_sensor: sensor.guest_room_multi_sensor_temperature + humidity_sensor: sensor.guest_room_multi_sensor_humidity master_bedroom: friendly_name: Master Bedroom unique_id: master_bedroom_thermal_comfort From a151f7278df79a9a936aa7d534e3240184d2bada Mon Sep 17 00:00:00 2001 From: Kyle Gordon Date: Sat, 3 Jun 2023 19:03:40 +0100 Subject: [PATCH 03/14] Master bathroom --- packages/master_bathroom.yaml | 2 +- sensors.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/master_bathroom.yaml b/packages/master_bathroom.yaml index f6171ea5..5fcbfe22 100644 --- a/packages/master_bathroom.yaml +++ b/packages/master_bathroom.yaml @@ -11,7 +11,7 @@ binary_sensor: {% else %} mdi:window-closed {% endif %} - value_template: "{{ is_state('binary_sensor.bathroom_window_opening_sensor','on') or is_state('binary_sensor.bathroom_window_vibration','on') }}" + value_template: "{{ is_state('binary_sensor.bathroom_window_contact','on') or is_state('binary_sensor.bathroom_window_vibration','on') }}" light: - platform: group diff --git a/sensors.yaml b/sensors.yaml index d9472bce..d49380ef 100644 --- a/sensors.yaml +++ b/sensors.yaml @@ -85,7 +85,7 @@ - sensor.nook_temperature - sensor.hall_temperature - sensor.study_temperature - - sensor.bathroom_temperature + - sensor.bathroom_multi_sensor_temperature - platform: min_max name: House Average Humidity @@ -99,7 +99,7 @@ - sensor.nook_humidity - sensor.hall_humidity - sensor.study_humidity - - sensor.bathroom_humidity + - sensor.bathroom_multi_sensor_humidity - platform: time_date display_options: From 02c4fe111210a7637ad092d43c43af1fc8f9ad76 Mon Sep 17 00:00:00 2001 From: Kyle Gordon Date: Sat, 3 Jun 2023 19:06:49 +0100 Subject: [PATCH 04/14] More likely candidates --- sensors.yaml | 54 ++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/sensors.yaml b/sensors.yaml index d49380ef..36ce4d46 100644 --- a/sensors.yaml +++ b/sensors.yaml @@ -79,26 +79,26 @@ type: mean entity_ids: - sensor.kitchen_temperature - - sensor.craft_room_temperature - - sensor.living_room_temperature - - sensor.master_bedroom_temperature - - sensor.nook_temperature - - sensor.hall_temperature - - sensor.study_temperature + - sensor.craft_room_multi_sensor_temperature + - sensor.living_room_multi_sensor_temperature + - sensor.master_bedroom_multi_sensor_temperature + - sensor.nook_multi_sensor_temperature + - sensor.hall_multi_sensor_temperature + - sensor.study_multi_sensor_temperature - sensor.bathroom_multi_sensor_temperature - platform: min_max name: House Average Humidity type: median entity_ids: - - sensor.front_hall_sensor_humidity - - sensor.craft_room_humidity + - sensor.front_hall_multi_sensor_humidity + - sensor.craft_room_multi_sensor_humidity - sensor.guest_room_multi_sensor_humidity - - sensor.living_room_humidity - - sensor.master_bedroom_humidity - - sensor.nook_humidity - - sensor.hall_humidity - - sensor.study_humidity + - sensor.living_room_multi_sensor_humidity + - sensor.master_bedroom_multi_sensor_humidity + - sensor.nook_multi_sensor_humidity + - sensor.hall_multi_sensor_humidity + - sensor.study_multi_sensor_humidity - sensor.bathroom_multi_sensor_humidity - platform: time_date @@ -140,38 +140,38 @@ living_room: friendly_name: Living Room unique_id: living_room_thermal_comfort - temperature_sensor: sensor.living_room_temperature - humidity_sensor: sensor.living_room_humidity + temperature_sensor: sensor.living_room_multi_sensor_temperature + humidity_sensor: sensor.living_room_multi_sensor_humidity dining_nook: friendly_name: Dining Nook unique_id: dining_nook_thermal_comfort - temperature_sensor: sensor.nook_temperature - humidity_sensor: sensor.nook_humidity + temperature_sensor: sensor.nook_multi_sensor_temperature + humidity_sensor: sensor.nook_multi_sensor_humidity hall: friendly_name: Hall unique_id: hall_thermal_comfort - temperature_sensor: sensor.hall_temperature - humidity_sensor: sensor.hall_humidity + temperature_sensor: sensor.hall_multi_sensor_temperature + humidity_sensor: sensor.hall_multi_sensor_humidity bathroom: friendly_name: Bathroom unique_id: bathroom_thermal_comfort - temperature_sensor: sensor.bathroom_temperature - humidity_sensor: sensor.bathroom_humidity + temperature_sensor: sensor.bathroom_multi_sensor_temperature + humidity_sensor: sensor.bathroom_multi_sensor_humidity front_hall: friendly_name: Front Hall unique_id: front_hall_thermal_comfort - temperature_sensor: sensor.front_hall_sensor_temperature - humidity_sensor: sensor.front_hall_sensor_humidity + temperature_sensor: sensor.front_hall_multi_sensor_temperature + humidity_sensor: sensor.front_hall_multi_sensor_humidity craft_room: friendly_name: Craft Room unique_id: craft_room_thermal_comfort - temperature_sensor: sensor.craft_room_temperature - humidity_sensor: sensor.craft_room_humidity + temperature_sensor: sensor.craft_room_multi_sensor_temperature + humidity_sensor: sensor.craft_room_multi_sensor_humidity study: friendly_name: Study unique_id: study_thermal_comfort - temperature_sensor: sensor.study_temperature - humidity_sensor: sensor.study_humidity + temperature_sensor: sensor.study_multi_sensor_temperature + humidity_sensor: sensor.study_multi_sensor_humidity guest_room: friendly_name: Guest Room unique_id: guest_room_thermal_comfort From cac6f66dd0feab78c9c2ed4822b1c591b0ab7568 Mon Sep 17 00:00:00 2001 From: Kyle Gordon Date: Sat, 3 Jun 2023 20:08:41 +0100 Subject: [PATCH 05/14] More updates --- groups.yaml | 4 ++-- packages/bin_reminder_tts.yaml | 2 +- packages/front_hall.yaml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/groups.yaml b/groups.yaml index 061b1ab1..a3ebb41c 100644 --- a/groups.yaml +++ b/groups.yaml @@ -40,8 +40,8 @@ front_hall: - sensor.front_hall_sensor_humidity - sensor.front_hall_sensor_signal_level - sensor.front_hall_lightlevel - - binary_sensor.front_hall_motion - - binary_sensor.front_hall_door + - binary_sensor.front_hall_motion_occupancy + - binary_sensor.front_hall_door_contact living_room: name: Living Room diff --git a/packages/bin_reminder_tts.yaml b/packages/bin_reminder_tts.yaml index 07b0167d..b57dda58 100644 --- a/packages/bin_reminder_tts.yaml +++ b/packages/bin_reminder_tts.yaml @@ -34,7 +34,7 @@ automation: state: 'on' trigger: - platform: state - entity_id: binary_sensor.front_hall_door + entity_id: binary_sensor.front_hall_door_contact to: 'on' - platform: state entity_id: binary_sensor.front_hall_motion diff --git a/packages/front_hall.yaml b/packages/front_hall.yaml index 2d4c788d..8967dc10 100644 --- a/packages/front_hall.yaml +++ b/packages/front_hall.yaml @@ -13,8 +13,8 @@ automation: trigger: - platform: state entity_id: - - binary_sensor.front_hall_door - - binary_sensor.front_hall_motion + - binary_sensor.front_hall_door_contact + - binary_sensor.front_hall_motion_occupancy to: 'on' from: 'off' condition: From 71cab1a33c7caa6ce3993609c83c65bee8021ad9 Mon Sep 17 00:00:00 2001 From: Kyle Gordon Date: Mon, 5 Jun 2023 09:30:27 +0100 Subject: [PATCH 06/14] Add existing reset scripts --- packages/outside_motion.yaml | 6 ------ persons.yaml | 4 ++-- scripts/hue_reset.yaml | 35 ++++++++++++++++++++++++++++++++++ scripts/ikea_reset.yaml | 35 ++++++++++++++++++++++++++++++++++ scripts/silvercrest_reset.yaml | 35 ++++++++++++++++++++++++++++++++++ 5 files changed, 107 insertions(+), 8 deletions(-) create mode 100644 scripts/hue_reset.yaml create mode 100644 scripts/ikea_reset.yaml create mode 100644 scripts/silvercrest_reset.yaml diff --git a/packages/outside_motion.yaml b/packages/outside_motion.yaml index 310bf04b..245ef2eb 100644 --- a/packages/outside_motion.yaml +++ b/packages/outside_motion.yaml @@ -6,12 +6,6 @@ automation: entity_id: - binary_sensor.outside_front_motion - binary_sensor.outside_driveway_motion - - binary_sensor.back_door_motion - - binary_sensor.front_door_motion - - binary_sensor.back_door_person_occupancy - - binary_sensor.driveway_person_occupancy - - binary_sensor.gates_person_occupancy - - binary_sensor.back_door_all_occupancy to: 'on' condition: - condition: state diff --git a/persons.yaml b/persons.yaml index 09ccf4fb..ad189218 100644 --- a/persons.yaml +++ b/persons.yaml @@ -1,13 +1,13 @@ - name: Kyle id: Kyle001 device_trackers: - - device_tracker.kyle_phone + # - device_tracker.kyle_phone - device_tracker.nothing_phone - name: Charlotte id: Charlotte001 device_trackers: - - device_tracker.charlotte_phone + - device_tracker.mine - name: Ronnie id: Ronnie0001 diff --git a/scripts/hue_reset.yaml b/scripts/hue_reset.yaml new file mode 100644 index 00000000..dc4c7dd5 --- /dev/null +++ b/scripts/hue_reset.yaml @@ -0,0 +1,35 @@ +reset_hue: + alias: reset_hue + sequence: + - service: switch.turn_off + target: + entity_id: switch.candle_arch + - delay: + hours: 0 + minutes: 0 + seconds: 5 + milliseconds: 0 + - repeat: + count: '2' + sequence: + - service: switch.turn_on + target: + entity_id: switch.candle_arch + - delay: + hours: 0 + minutes: 0 + seconds: 8 + milliseconds: 0 + - service: switch.turn_off + target: + entity_id: switch.candle_arch + - delay: + hours: 0 + minutes: 0 + seconds: 2 + milliseconds: 0 + - service: switch.turn_on + target: + entity_id: switch.candle_arch + mode: single + diff --git a/scripts/ikea_reset.yaml b/scripts/ikea_reset.yaml new file mode 100644 index 00000000..e9657902 --- /dev/null +++ b/scripts/ikea_reset.yaml @@ -0,0 +1,35 @@ +reset_ikea: + alias: reset_ikea + sequence: + - service: switch.turn_off + target: + entity_id: switch.boot_room_switch_relay + - delay: + hours: 0 + minutes: 0 + seconds: 5 + milliseconds: 0 + - repeat: + count: '5' + sequence: + - service: switch.turn_on + target: + entity_id: switch.boot_room_switch_relay + - delay: + hours: 0 + minutes: 0 + seconds: 0 + milliseconds: 400 + - service: switch.turn_off + target: + entity_id: switch.boot_room_switch_relay + - delay: + hours: 0 + minutes: 0 + seconds: 1 + milliseconds: 500 + - service: switch.turn_on + target: + entity_id: switch.boot_room_switch_relay + mode: single + diff --git a/scripts/silvercrest_reset.yaml b/scripts/silvercrest_reset.yaml new file mode 100644 index 00000000..dbb823bd --- /dev/null +++ b/scripts/silvercrest_reset.yaml @@ -0,0 +1,35 @@ +reset_silvercrest: + alias: reset_silvercrest + sequence: + - service: switch.turn_off + target: + entity_id: switch.boot_room_switch_relay + - delay: + hours: 0 + minutes: 0 + seconds: 10 + milliseconds: 0 + - repeat: + count: '2' + sequence: + - service: switch.turn_on + target: + entity_id: switch.boot_room_switch_relay + - delay: + hours: 0 + minutes: 0 + seconds: 2 + milliseconds: 0 + - service: switch.turn_off + target: + entity_id: switch.boot_room_switch_relay + - delay: + hours: 0 + minutes: 0 + seconds: 2 + milliseconds: 0 + - service: switch.turn_on + target: + entity_id: switch.boot_room_switch_relay + mode: single + From f151ffbb92a8a937337ed96cb03cda0480e5ae22 Mon Sep 17 00:00:00 2001 From: Kyle Gordon Date: Tue, 6 Jun 2023 09:01:46 +0100 Subject: [PATCH 07/14] More name changes --- automation/media_playing_night.yaml | 2 +- groups.yaml | 12 +++++------- packages/boot_room.yaml | 8 ++++---- packages/device_alerts.yaml | 12 ++++++------ packages/hallway.yaml | 12 ++++++------ packages/kitchen.yaml | 4 ++-- packages/living_room_lights.yaml | 4 ++-- 7 files changed, 26 insertions(+), 28 deletions(-) diff --git a/automation/media_playing_night.yaml b/automation/media_playing_night.yaml index 9345ad21..3ff67a35 100644 --- a/automation/media_playing_night.yaml +++ b/automation/media_playing_night.yaml @@ -8,7 +8,7 @@ condition: entity_id: sensor.average_external_light_level below: 1000 - condition: state - entity_id: binary_sensor.kitchen_motion + entity_id: binary_sensor.kitchen_motion_occupancy state: "off" action: - service: light.turn_off diff --git a/groups.yaml b/groups.yaml index a3ebb41c..7798f0a3 100644 --- a/groups.yaml +++ b/groups.yaml @@ -26,8 +26,7 @@ kitchen: entities: - sensor.kitchen_temperature - sensor.kitchen_esp8266_signal_level - - binary_sensor.kitchen_motion - - sensor.kitchen_motion + - binary_sensor.kitchen_motion_occupancy - light.kitchen_cabinets - light.kitchen - media_player.kitchen @@ -50,8 +49,7 @@ living_room: - media_player.living_room_kodi - media_player.openhome_uuid_4c494e4e_0026_0f22_3637_01475230013f - switch.tellybox - - binary_sensor.living_room_motion - - sensor.living_room_motion + - binary_sensor.living_room_motion_occupancy - sensor.living_room_temperature - sensor.living_room_pressure - sensor.living_room_humidity @@ -171,10 +169,10 @@ hall_view: name: Hall entities: - light.hall - - binary_sensor.hall_rooms_motion + - binary_sensor.hall_rooms_motion_occupancy - sensor.hall_rooms_motion - - binary_sensor.hall_door_motion - - binary_sensor.boot_room_motion + - binary_sensor.hall_door_motion_occupancy + - binary_sensor.boot_room_motion_occupancy - sensor.hall_door_motion - sensor.hall_temperature - sensor.hall_humidity diff --git a/packages/boot_room.yaml b/packages/boot_room.yaml index 87426dbf..f4958c6a 100644 --- a/packages/boot_room.yaml +++ b/packages/boot_room.yaml @@ -34,7 +34,7 @@ automation: initial_state: true trigger: - platform: state - entity_id: binary_sensor.boot_room_motion + entity_id: binary_sensor.boot_room_motion_occupancy to: 'on' from: 'off' # Sensor attached to wrong door at the moment... @@ -83,7 +83,7 @@ automation: initial_state: true trigger: - platform: state - entity_id: binary_sensor.boot_room_motion + entity_id: binary_sensor.boot_room_motion_occupancy to: 'on' from: 'off' # Sensor attached to wrong door at the moment... @@ -114,7 +114,7 @@ automation: - alias: Boot room motion - 2 minute timeout trigger: - platform: state - entity_id: binary_sensor.boot_room_motion + entity_id: binary_sensor.boot_room_motion_occupancy to: 'off' for: minutes: 2 @@ -136,7 +136,7 @@ automation: - alias: Boot room motion - 10 minute timeout trigger: - platform: state - entity_id: binary_sensor.boot_room_motion + entity_id: binary_sensor.boot_room_motion_occupancy to: 'off' for: minutes: 10 diff --git a/packages/device_alerts.yaml b/packages/device_alerts.yaml index 77c7152b..c93084e6 100644 --- a/packages/device_alerts.yaml +++ b/packages/device_alerts.yaml @@ -7,12 +7,12 @@ automation: - sensor.kitchen_temperature - binary_sensor.front_hall_sensor_status - sensor.garage_temperature - - binary_sensor.hall_door_motion - - binary_sensor.hall_rooms_motion + - binary_sensor.hallway_bathroom_occupancy + - binary_sensor.hallway_rooms_occupancy - binary_sensor.ensuite_motion_occupancy - - binary_sensor.living_room_motion - - binary_sensor.kitchen_motion - - binary_sensor.front_hall_motion + - binary_sensor.living_room_motion_occupancy + - binary_sensor.kitchen_motion_occupancy + - binary_sensor.front_hall_motion_occupancy - binary_sensor.front_door_motion - binary_sensor.washing_machine_power_plug_status - binary_sensor.dishwasher_power_plug_status @@ -25,7 +25,7 @@ automation: - binary_sensor.master_bedroom_window - binary_sensor.study_window - binary_sensor.garden_door - - binary_sensor.boot_room_motion + - binary_sensor.boot_room_motion_occupancy - binary_sensor.boot_room_door - binary_sensor.bathroom_window - binary_sensor.dining_table_window diff --git a/packages/hallway.yaml b/packages/hallway.yaml index 1aaae99a..b93480a4 100644 --- a/packages/hallway.yaml +++ b/packages/hallway.yaml @@ -40,8 +40,8 @@ automation: trigger: - platform: state entity_id: - - binary_sensor.hall_door_motion - - binary_sensor.hall_rooms_motion + - binary_sensor.hallway_rooms_occupancy + - binary_sensor.hallway_bathroom_occupancy to: 'on' from: 'off' condition: @@ -65,8 +65,8 @@ automation: trigger: - platform: state entity_id: - - binary_sensor.hall_door_motion - - binary_sensor.hall_rooms_motion + - binary_sensor.hallway_rooms_occupancy + - binary_sensor.hallway_bathroom_occupancy to: 'off' for: minutes: 2 @@ -87,8 +87,8 @@ automation: trigger: - platform: state entity_id: - - binary_sensor.hall_door_motion - - binary_sensor.hall_rooms_motion + - binary_sensor.hallway_rooms_occupancy + - binary_sensor.hallway_bathroom_occupancy to: 'off' for: minutes: 10 diff --git a/packages/kitchen.yaml b/packages/kitchen.yaml index d5b30a5f..2b9f0f33 100644 --- a/packages/kitchen.yaml +++ b/packages/kitchen.yaml @@ -12,7 +12,7 @@ automation: - alias: Kitchen motion trigger: platform: state - entity_id: binary_sensor.kitchen_motion + entity_id: binary_sensor.kitchen_motion_occupancy to: 'on' from: 'off' condition: @@ -31,7 +31,7 @@ automation: - alias: Kitchen motion - 10 minute timeout trigger: platform: state - entity_id: binary_sensor.kitchen_motion + entity_id: binary_sensor.kitchen_motion_occupancy to: 'off' for: minutes: 10 diff --git a/packages/living_room_lights.yaml b/packages/living_room_lights.yaml index f5cc3072..ebd601db 100644 --- a/packages/living_room_lights.yaml +++ b/packages/living_room_lights.yaml @@ -83,7 +83,7 @@ automation: - alias: Living Room motion - motion timeout trigger: - platform: state - entity_id: binary_sensor.living_room_motion + entity_id: binary_sensor.living_room_motion_occupancy to: 'off' for: minutes: 60 @@ -105,7 +105,7 @@ automation: - alias: Living Room motion trigger: - platform: state - entity_id: binary_sensor.living_room_motion + entity_id: binary_sensor.living_room_motion_occupancy to: 'on' from: 'off' condition: From 21c2488a58cd1a10ff6e7c5fdc56b3e029998bca Mon Sep 17 00:00:00 2001 From: Kyle Gordon Date: Tue, 6 Jun 2023 22:38:35 +0100 Subject: [PATCH 08/14] Fix old garage sensor name --- packages/garage.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/garage.yaml b/packages/garage.yaml index 371fb6c3..002f8ab3 100644 --- a/packages/garage.yaml +++ b/packages/garage.yaml @@ -4,7 +4,7 @@ automation: initial_state: true trigger: - platform: state - entity_id: binary_sensor.garage_motion + entity_id: binary_sensor.garage_motion_occupancy to: 'on' from: 'off' action: @@ -14,7 +14,7 @@ automation: - alias: Garage motion - 10 minute timeout trigger: - platform: state - entity_id: binary_sensor.garage_motion + entity_id: binary_sensor.garage_motion_occupancy to: 'off' for: minutes: 10 From 757827c3f77808040ed1acf3ace7dffce9849cd0 Mon Sep 17 00:00:00 2001 From: Kyle Gordon Date: Tue, 6 Jun 2023 22:39:09 +0100 Subject: [PATCH 09/14] Fix formatting --- scripts/hue_reset.yaml | 62 +++++++++++++++++----------------- scripts/ikea_reset.yaml | 62 +++++++++++++++++----------------- scripts/silvercrest_reset.yaml | 62 +++++++++++++++++----------------- 3 files changed, 93 insertions(+), 93 deletions(-) diff --git a/scripts/hue_reset.yaml b/scripts/hue_reset.yaml index dc4c7dd5..cf74edbc 100644 --- a/scripts/hue_reset.yaml +++ b/scripts/hue_reset.yaml @@ -1,35 +1,35 @@ +--- reset_hue: alias: reset_hue sequence: - - service: switch.turn_off - target: - entity_id: switch.candle_arch - - delay: - hours: 0 - minutes: 0 - seconds: 5 - milliseconds: 0 - - repeat: - count: '2' - sequence: - - service: switch.turn_on - target: - entity_id: switch.candle_arch - - delay: - hours: 0 - minutes: 0 - seconds: 8 - milliseconds: 0 - - service: switch.turn_off - target: - entity_id: switch.candle_arch - - delay: - hours: 0 - minutes: 0 - seconds: 2 - milliseconds: 0 - - service: switch.turn_on - target: - entity_id: switch.candle_arch + - service: switch.turn_off + target: + entity_id: switch.candle_arch + - delay: + hours: 0 + minutes: 0 + seconds: 5 + milliseconds: 0 + - repeat: + count: '2' + sequence: + - service: switch.turn_on + target: + entity_id: switch.candle_arch + - delay: + hours: 0 + minutes: 0 + seconds: 8 + milliseconds: 0 + - service: switch.turn_off + target: + entity_id: switch.candle_arch + - delay: + hours: 0 + minutes: 0 + seconds: 2 + milliseconds: 0 + - service: switch.turn_on + target: + entity_id: switch.candle_arch mode: single - diff --git a/scripts/ikea_reset.yaml b/scripts/ikea_reset.yaml index e9657902..87c876b8 100644 --- a/scripts/ikea_reset.yaml +++ b/scripts/ikea_reset.yaml @@ -1,35 +1,35 @@ +--- reset_ikea: alias: reset_ikea sequence: - - service: switch.turn_off - target: - entity_id: switch.boot_room_switch_relay - - delay: - hours: 0 - minutes: 0 - seconds: 5 - milliseconds: 0 - - repeat: - count: '5' - sequence: - - service: switch.turn_on - target: - entity_id: switch.boot_room_switch_relay - - delay: - hours: 0 - minutes: 0 - seconds: 0 - milliseconds: 400 - - service: switch.turn_off - target: - entity_id: switch.boot_room_switch_relay - - delay: - hours: 0 - minutes: 0 - seconds: 1 - milliseconds: 500 - - service: switch.turn_on - target: - entity_id: switch.boot_room_switch_relay + - service: switch.turn_off + target: + entity_id: switch.boot_room_switch_relay + - delay: + hours: 0 + minutes: 0 + seconds: 5 + milliseconds: 0 + - repeat: + count: '5' + sequence: + - service: switch.turn_on + target: + entity_id: switch.boot_room_switch_relay + - delay: + hours: 0 + minutes: 0 + seconds: 0 + milliseconds: 400 + - service: switch.turn_off + target: + entity_id: switch.boot_room_switch_relay + - delay: + hours: 0 + minutes: 0 + seconds: 1 + milliseconds: 500 + - service: switch.turn_on + target: + entity_id: switch.boot_room_switch_relay mode: single - diff --git a/scripts/silvercrest_reset.yaml b/scripts/silvercrest_reset.yaml index dbb823bd..ae3d3bfb 100644 --- a/scripts/silvercrest_reset.yaml +++ b/scripts/silvercrest_reset.yaml @@ -1,35 +1,35 @@ +--- reset_silvercrest: alias: reset_silvercrest sequence: - - service: switch.turn_off - target: - entity_id: switch.boot_room_switch_relay - - delay: - hours: 0 - minutes: 0 - seconds: 10 - milliseconds: 0 - - repeat: - count: '2' - sequence: - - service: switch.turn_on - target: - entity_id: switch.boot_room_switch_relay - - delay: - hours: 0 - minutes: 0 - seconds: 2 - milliseconds: 0 - - service: switch.turn_off - target: - entity_id: switch.boot_room_switch_relay - - delay: - hours: 0 - minutes: 0 - seconds: 2 - milliseconds: 0 - - service: switch.turn_on - target: - entity_id: switch.boot_room_switch_relay + - service: switch.turn_off + target: + entity_id: switch.boot_room_switch_relay + - delay: + hours: 0 + minutes: 0 + seconds: 10 + milliseconds: 0 + - repeat: + count: '2' + sequence: + - service: switch.turn_on + target: + entity_id: switch.boot_room_switch_relay + - delay: + hours: 0 + minutes: 0 + seconds: 2 + milliseconds: 0 + - service: switch.turn_off + target: + entity_id: switch.boot_room_switch_relay + - delay: + hours: 0 + minutes: 0 + seconds: 2 + milliseconds: 0 + - service: switch.turn_on + target: + entity_id: switch.boot_room_switch_relay mode: single - From e11bf68958bdd906ead280a371cf0518635ffc85 Mon Sep 17 00:00:00 2001 From: Kyle Gordon Date: Thu, 8 Jun 2023 08:42:47 +0100 Subject: [PATCH 10/14] Group name tweak --- packages/living_room_lights.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/living_room_lights.yaml b/packages/living_room_lights.yaml index ebd601db..d47212c7 100644 --- a/packages/living_room_lights.yaml +++ b/packages/living_room_lights.yaml @@ -74,7 +74,7 @@ automation: - service: light.toggle data_template: entity_id: - - light.dining_nook_group + - light.dining_nook - service: logbook.log data_template: name: EVENT @@ -118,7 +118,7 @@ automation: entity_id: light.living_room state: "off" - condition: state - entity_id: light.dining_nook_group + entity_id: light.dining_nook state: "off" - condition: numeric_state entity_id: sensor.average_external_light_level @@ -147,7 +147,7 @@ automation: data_template: entity_id: > {% if states('sensor.time_of_day') == "Morning" %} - light.living_room, light.dining_nook_group + light.living_room, light.dining_nook {% else %} - light.living_room, light.dining_nook_group + light.living_room, light.dining_nook {% endif %} From d878f3a28db133b63e5b6c01be22858a7f5c5a83 Mon Sep 17 00:00:00 2001 From: Kyle Gordon Date: Sun, 11 Jun 2023 10:10:42 +0100 Subject: [PATCH 11/14] Provide IDs for traces to be stored --- packages/living_room_lights.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/living_room_lights.yaml b/packages/living_room_lights.yaml index d47212c7..fd10ddf9 100644 --- a/packages/living_room_lights.yaml +++ b/packages/living_room_lights.yaml @@ -39,6 +39,7 @@ light: automation: - alias: Living room light toggle + id: living_room_light_toggle # Can be improved, examples at https://github.com/TheFes/HA-configuration/blob/main/include/automation/01_first_floor/floris/shelly_floris.yaml trigger: - platform: event @@ -60,6 +61,7 @@ automation: message: "Toggling living room lights" - alias: Dining nook light toggle + id: dining_nook_light_toggle # Can be improved, examples at https://github.com/TheFes/HA-configuration/blob/main/include/automation/01_first_floor/floris/shelly_floris.yaml trigger: - platform: event @@ -81,6 +83,7 @@ automation: message: "Toggling dining nook lights" - alias: Living Room motion - motion timeout + id: living_room_motion_timeout trigger: - platform: state entity_id: binary_sensor.living_room_motion_occupancy @@ -103,6 +106,7 @@ automation: entity_id: light.living_room, light.dining_nook_group - alias: Living Room motion + id: living_room_motion trigger: - platform: state entity_id: binary_sensor.living_room_motion_occupancy From 618ef6ce70bd8893311c54676715eed7aab8a28b Mon Sep 17 00:00:00 2001 From: Kyle Gordon Date: Sun, 11 Jun 2023 10:13:12 +0100 Subject: [PATCH 12/14] More IDs for traces --- automation/living_room_sofa_dim.yaml | 1 + automation/media_playing_night.yaml | 2 ++ automation/media_stopped_night.yaml | 2 ++ packages/outside_motion.yaml | 2 ++ 4 files changed, 7 insertions(+) diff --git a/automation/living_room_sofa_dim.yaml b/automation/living_room_sofa_dim.yaml index 4bc0adc9..5efdeaeb 100644 --- a/automation/living_room_sofa_dim.yaml +++ b/automation/living_room_sofa_dim.yaml @@ -1,5 +1,6 @@ --- alias: Living Room TV dimmer +id: living_room_tv_dimmer trigger: - platform: state entity_id: media_player.living_room_kodi diff --git a/automation/media_playing_night.yaml b/automation/media_playing_night.yaml index 3ff67a35..4cdc003a 100644 --- a/automation/media_playing_night.yaml +++ b/automation/media_playing_night.yaml @@ -1,4 +1,6 @@ +--- alias: "Media playing at night" +id: media_playing_night trigger: - platform: state entity_id: media_player.living_room_kodi diff --git a/automation/media_stopped_night.yaml b/automation/media_stopped_night.yaml index 0a2e3843..cd0f5c73 100644 --- a/automation/media_stopped_night.yaml +++ b/automation/media_stopped_night.yaml @@ -1,4 +1,6 @@ +--- alias: "Media stopped at night" +id: media_stopped_night trigger: - platform: state entity_id: media_player.living_room_kodi diff --git a/packages/outside_motion.yaml b/packages/outside_motion.yaml index 245ef2eb..3b2d88d1 100644 --- a/packages/outside_motion.yaml +++ b/packages/outside_motion.yaml @@ -1,6 +1,7 @@ --- automation: - alias: Outdoor lights on + id: outdoor_lights_on trigger: - platform: state entity_id: @@ -47,6 +48,7 @@ automation: entity_id: light.front_door_floodlights - alias: Outdoor lights off + id: outdoor_lights_off trigger: - platform: state entity_id: From a5d30c82ef9bf539eca890caa9ee705d27ac8f3d Mon Sep 17 00:00:00 2001 From: Kyle Gordon Date: Mon, 12 Jun 2023 15:14:23 +0100 Subject: [PATCH 13/14] More name fixes --- groups.yaml | 6 +++--- packages/device_alerts.yaml | 2 +- packages/front_hall.yaml | 7 +++++-- sensors.yaml | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/groups.yaml b/groups.yaml index 7798f0a3..0e596289 100644 --- a/groups.yaml +++ b/groups.yaml @@ -174,9 +174,9 @@ hall_view: - binary_sensor.hall_door_motion_occupancy - binary_sensor.boot_room_motion_occupancy - sensor.hall_door_motion - - sensor.hall_temperature - - sensor.hall_humidity - - sensor.hall_pressure + - sensor.hallway_multi_sensor_temperature + - sensor.hallway_multi_sensor__humidity + - sensor.hallway_multi_sensor__pressure - binary_sensor.boot_room_door outside: diff --git a/packages/device_alerts.yaml b/packages/device_alerts.yaml index c93084e6..f4efe05a 100644 --- a/packages/device_alerts.yaml +++ b/packages/device_alerts.yaml @@ -58,7 +58,7 @@ automation: - sensor.living_room_multi_sensor_battery_level - sensor.master_bedroom_multi_sensor_battery_level - sensor.study_multi_sensor_battery_level - - sensor.hall_multi_sensor_battery_level + - sensor.hallway_multi_sensor_battery_level - sensor.dining_nook_multi_sensor_battery_level - sensor.bathroom_multi_sensor_battery_level to: 'unavailable' diff --git a/packages/front_hall.yaml b/packages/front_hall.yaml index 8967dc10..9e61c6d9 100644 --- a/packages/front_hall.yaml +++ b/packages/front_hall.yaml @@ -10,6 +10,7 @@ input_number: automation: - alias: Front hall motion + id: front_hall_motion trigger: - platform: state entity_id: @@ -37,9 +38,10 @@ automation: - light.front_hall - alias: Front hall - 2 minute timeout + id: front_hall_motion_2_minute trigger: - platform: state - entity_id: binary_sensor.front_hall_motion + entity_id: binary_sensor.front_hall_motion_occupancy to: 'off' for: minutes: 2 @@ -58,9 +60,10 @@ automation: entity_id: light.front_hall - alias: Front hall - 10 minute timeout + id: front_hall_motion_10_minute trigger: - platform: state - entity_id: binary_sensor.front_hall_motion + entity_id: binary_sensor.front_hall_motion_occupancy to: 'off' for: minutes: 10 diff --git a/sensors.yaml b/sensors.yaml index 36ce4d46..dcf27333 100644 --- a/sensors.yaml +++ b/sensors.yaml @@ -83,7 +83,7 @@ - sensor.living_room_multi_sensor_temperature - sensor.master_bedroom_multi_sensor_temperature - sensor.nook_multi_sensor_temperature - - sensor.hall_multi_sensor_temperature + - sensor.hallway_multi_sensor_temperature - sensor.study_multi_sensor_temperature - sensor.bathroom_multi_sensor_temperature @@ -97,7 +97,7 @@ - sensor.living_room_multi_sensor_humidity - sensor.master_bedroom_multi_sensor_humidity - sensor.nook_multi_sensor_humidity - - sensor.hall_multi_sensor_humidity + - sensor.hallway_multi_sensor_humidity - sensor.study_multi_sensor_humidity - sensor.bathroom_multi_sensor_humidity From 43a006f2b126629e937862c6e0fcba4d3cb62588 Mon Sep 17 00:00:00 2001 From: Kyle Gordon Date: Sun, 18 Jun 2023 10:44:58 +0100 Subject: [PATCH 14/14] Fix yaml that still fails to be caught by CI due to the longstanding issue at https://github.com/home-assistant/core/issues/86924 --- groups.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/groups.yaml b/groups.yaml index 0e596289..91bcfcf0 100644 --- a/groups.yaml +++ b/groups.yaml @@ -175,8 +175,8 @@ hall_view: - binary_sensor.boot_room_motion_occupancy - sensor.hall_door_motion - sensor.hallway_multi_sensor_temperature - - sensor.hallway_multi_sensor__humidity - - sensor.hallway_multi_sensor__pressure + - sensor.hallway_multi_sensor_humidity + - sensor.hallway_multi_sensor_pressure - binary_sensor.boot_room_door outside: