Merge pull request #459 from kylegordon/sensor-name-changes

Rename devices to match Z2M defaults
kylegordon · Jun 24, 2023 · 60b0e60 · 60b0e60
2 parents b947934 + 43a006f
commit 60b0e60
Show file tree

Hide file tree

Showing 20 changed files with 205 additions and 94 deletions.
diff --git 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
@@ -1,4 +1,6 @@
+---
 alias: "Media playing at night"
+id: media_playing_night
 trigger:
   - platform: state
     entity_id: media_player.living_room_kodi
@@ -8,7 +10,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/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/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
@@ -40,8 +39,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
@@ -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
@@ -94,7 +92,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
@@ -116,9 +114,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
@@ -171,14 +169,14 @@ 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
-    - 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/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/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
@@ -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.ensuite_motion
-          - binary_sensor.living_room_motion
-          - binary_sensor.kitchen_motion
-          - binary_sensor.front_hall_motion
+          - binary_sensor.hallway_bathroom_occupancy
+          - binary_sensor.hallway_rooms_occupancy
+          - binary_sensor.ensuite_motion_occupancy
+          - 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
@@ -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/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

diff --git a/packages/front_hall.yaml b/packages/front_hall.yaml
@@ -10,11 +10,12 @@ input_number:
 
 automation:
   - alias: Front hall motion
+    id: front_hall_motion
     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:
@@ -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/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

diff --git 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
@@ -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
@@ -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
@@ -74,16 +76,17 @@ automation:
       - service: light.toggle
         data_template:
           entity_id:
-            - light.dining_nook_group
+            - light.dining_nook
       - service: logbook.log
         data_template:
           name: EVENT
           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
+        entity_id: binary_sensor.living_room_motion_occupancy
         to: 'off'
         for:
           minutes: 60
@@ -103,9 +106,10 @@ 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
+        entity_id: binary_sensor.living_room_motion_occupancy
         to: 'on'
         from: 'off'
     condition:
@@ -118,7 +122,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 +151,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 %}
diff --git 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