clean up of old code

2025-09-13 15:05:00 +00:00 · 2020-09-27 21:29:23 -04:00
parent d213f075e7
commit 7eebcce956
21 changed files with 769 additions and 932 deletions
--- a/packages/alarm_clock.yaml
+++ b/packages/alarm_clock.yaml
@@ -44,7 +44,7 @@ input_boolean:
 input_label:
  alarm_current_time:
    name: Current Alarm Time
-    icon: mdi:timer
+    icon: mdi:timer-outline

 ###############################################################################
 #                _                        _   _
--- a/packages/cameras.yaml
+++ b/packages/cameras.yaml
@@ -267,8 +267,8 @@ automation:
              - "/home/homeassistant/.homeassistant/www/downloads/camera/frontdoor/frontdoor_latest.jpg"
      - condition: template
        value_template: >
-          {% if states('binary_sensor.single_car_garage_door_tilt_sensor_sensor') == "on" or
-                states('binary_sensor.two_car_garage_door_tilt_sensor_sensor') == "on" %}
+          {% if states('binary_sensor.door_window_sensor_158d0004248d5b') == "on" or
+                states('binary_sensor.door_window_sensor_158d0004231f7b') == "on" %}
            True
          {% else %}
            False
@@ -345,8 +345,8 @@ automation:
              - "/home/homeassistant/.homeassistant/www/downloads/camera/driveway/driveway_latest.jpg"
      - condition: template
        value_template: >
-          {% if states('binary_sensor.single_car_garage_door_tilt_sensor_sensor') == "on" or
-                states('binary_sensor.two_car_garage_door_tilt_sensor_sensor') == "on" %}
+          {% if states('binary_sensor.door_window_sensor_158d0004248d5b') == "on" or
+                states('binary_sensor.door_window_sensor_158d0004231f7b') == "on" %}
            True
          {% else %}
            False
@@ -377,8 +377,8 @@ automation:
          entity_id: image_processing.tensorflow_garage_camera
      - condition: template
        value_template: >
-          {% if states('binary_sensor.single_car_garage_door_tilt_sensor_sensor') == "on" or
-                states('binary_sensor.two_car_garage_door_tilt_sensor_sensor') == "on" %}
+          {% if states('binary_sensor.door_window_sensor_158d0004248d5b') == "on" or
+                states('binary_sensor.door_window_sensor_158d0004231f7b') == "on" %}
            True
          {% else %}
            False
@@ -544,7 +544,7 @@ automation:
      - condition: template
        value_template: "{{ states('alarm_control_panel.home') == 'armed_home' or states('alarm_control_panel.home') == 'armed_away' }}"
    action:
-      - delay: "{{ '00:00:08' if states('binary_sensor.aeotec_zw120_door_window_sensor_gen5_sensor') == 'on' else '0:0:0' }}"
+      - delay: "{{ '00:00:08' if states('binary_sensor.door_window_sensor_158d000424a6d6') == 'on' else '0:0:0' }}"
      - service: camera.snapshot
        data_template:
          entity_id: "camera.frontdoor_camera"
--- a/packages/door_sensors.yaml
+++ b/packages/door_sensors.yaml
@@ -4,11 +4,11 @@ homeassistant:
      door_notification_script: &door_notification_script
        message: >
          {% set doors = "" %}
-            {% if states('binary_sensor.two_car_garage_door_tilt_sensor_sensor') == "on"  and
-                  states('binary_sensor.single_car_garage_door_tilt_sensor_sensor') == "on" %}
+            {% if states('binary_sensor.door_window_sensor_158d0004231f7b') == "on"  and
+                  states('binary_sensor.door_window_sensor_158d0004248d5b') == "on" %}
              {% set doors = "Attention! Both Garage Doors are OPEN" %}
-            {% elif states('binary_sensor.two_car_garage_door_tilt_sensor_sensor') == "off"  and
-                    states('binary_sensor.single_car_garage_door_tilt_sensor_sensor') == "off" %}
+            {% elif states('binary_sensor.door_window_sensor_158d0004231f7b') == "off"  and
+                    states('binary_sensor.door_window_sensor_158d0004248d5b') == "off" %}
              {% set doors = "Both Garage Doors are now CLOSED" %}
            {% else %}
              {% if trigger.to_state.state | lower == "on" %}
@@ -25,15 +25,15 @@ sensor:
      single_car_garage_door_sensor_status:
        friendly_name: Single Car Garage Door Sensor Status
        value_template: >-
-          {% if states('binary_sensor.single_car_garage_door_tilt_sensor_sensor') == 'on' %}
+          {% if states('binary_sensor.door_window_sensor_158d0004248d5b') == 'on' %}
            Open
-          {% elif states('binary_sensor.single_car_garage_door_tilt_sensor_sensor') == 'off' %}
+          {% elif states('binary_sensor.door_window_sensor_158d0004248d5b') == 'off' %}
            Closed
          {% else %}
            Unknown
          {% endif %}
        icon_template: >-
-          {% set door_status = states('binary_sensor.single_car_garage_door_tilt_sensor_sensor') %}
+          {% set door_status = states('binary_sensor.door_window_sensor_158d0004248d5b') %}
          {% if door_status == 'unknown' %}
            mdi:alert-circle
          {% else %}
@@ -48,16 +48,16 @@ sensor:
    sensors:
      two_car_garage_door_sensor_status:
        value_template: >-
-          {% if states('binary_sensor.two_car_garage_door_tilt_sensor_sensor') == 'on' %}
+          {% if states('binary_sensor.door_window_sensor_158d0004231f7b') == 'on' %}
            Open
-          {% elif states('binary_sensor.two_car_garage_door_tilt_sensor_sensor') == 'off' %}
+          {% elif states('binary_sensor.door_window_sensor_158d0004231f7b') == 'off' %}
            Closed
          {% else %}
            Unknown
          {% endif %}
        friendly_name: Double Car Garage Door Sensor Status
        icon_template: >-
-          {% set door_status = states('binary_sensor.two_car_garage_door_tilt_sensor_sensor') %}
+          {% set door_status = states('binary_sensor.door_window_sensor_158d0004231f7b') %}
          {% if door_status == 'unknown' %}
            mdi:alert-circle
          {% else %}
@@ -77,14 +77,6 @@ binary_sensor:
    payload_off: "off"
    value_template: "{{ value }}"

-  - platform: mqtt
-    state_topic: "/kitchen/motion"
-    name: "Kitchen Camera Motion"
-    device_class: motion
-    payload_on: "on"
-    payload_off: "off"
-    value_template: "{{ value }}"
-
  - platform: mqtt
    state_topic: "/frontroom/motion"
    name: "Frontroom Camera Motion"
@@ -129,21 +121,6 @@ automation:
      - service: switch.turn_on
        entity_id: switch.garage

-  - alias: Kitchen Camera Motion Reset
-    initial_state: true
-    trigger:
-      - platform: state
-        entity_id: binary_sensor.kitchen_camera_motion
-        to: "on"
-        from: "off"
-    action:
-      - delay: "00:00:30"
-      - service: mqtt.publish
-        data:
-          topic: "/kitchen/motion"
-          payload: "off"
-          retain: false
-
  - alias: Frontroom Camera Motion Reset
    initial_state: true
    trigger:
@@ -167,8 +144,8 @@ automation:
    trigger:
      platform: state
      entity_id:
-        - binary_sensor.two_car_garage_door_tilt_sensor_sensor
-        - binary_sensor.single_car_garage_door_tilt_sensor_sensor
+        - binary_sensor.door_window_sensor_158d0004231f7b
+        - binary_sensor.door_window_sensor_158d0004248d5b
    condition:
      - condition: template
        value_template: "{{ trigger.from_state.state not in ['unavailable', 'unknown'] }}"
@@ -206,17 +183,17 @@ automation:
          title: 'Garage Door Status {{ now().strftime("%d %h %Y, %I:%M:%S %p") }}'
          message: >-
            {% set doors = "" %}
-            {% if states('binary_sensor.two_car_garage_door_tilt_sensor_sensor') == "on"  and
-                  states('binary_sensor.single_car_garage_door_tilt_sensor_sensor') == "on" %}
+            {% if states('binary_sensor.door_window_sensor_158d0004231f7b') == "on"  and
+                  states('binary_sensor.door_window_sensor_158d0004248d5b') == "on" %}
              {% set doors = "Both Garage Doors are OPEN" %}
-            {% elif states('binary_sensor.two_car_garage_door_tilt_sensor_sensor') == "off"  and
-                    states('binary_sensor.single_car_garage_door_tilt_sensor_sensor') == "off" %}
+            {% elif states('binary_sensor.door_window_sensor_158d0004231f7b') == "off"  and
+                    states('binary_sensor.door_window_sensor_158d0004248d5b') == "off" %}
              {% set doors = "Both Garage Doors are CLOSED" %}
            {% else %}
-              {% set doors = states.binary_sensor.single_car_garage_door_tilt_sensor_sensor.name ~ " is " ~
-                            ('Closed' if states('binary_sensor.single_car_garage_door_tilt_sensor_sensor') == 'off' else 'OPEN')
-                             ~ " and " ~ state_attr('binary_sensor.two_car_garage_door_tilt_sensor_sensor', 'friendly_name') ~ " is " ~
-                            ('Closed' if states('binary_sensor.two_car_garage_door_tilt_sensor_sensor') == 'off' else 'OPEN') %}
+              {% set doors = states.binary_sensor.door_window_sensor_158d0004248d5b.name ~ " is " ~
+                            ('Closed' if states('binary_sensor.door_window_sensor_158d0004248d5b') == 'off' else 'OPEN')
+                             ~ " and " ~ state_attr('binary_sensor.door_window_sensor_158d0004231f7b', 'friendly_name') ~ " is " ~
+                            ('Closed' if states('binary_sensor.door_window_sensor_158d0004231f7b') == 'off' else 'OPEN') %}
            {% endif %}
            Your {{doors}} on {{ now().strftime("%d %h %Y, at %I:%M:%S %p") }}. Please check the garage snapshot below.
          data:
@@ -240,8 +217,8 @@ automation:
    trigger:
      platform: state
      entity_id:
-        - binary_sensor.aeotec_zw120_door_window_sensor_gen5_sensor
-        - binary_sensor.back_door_sensor_sensor
+        - binary_sensor.door_window_sensor_158d000424a6d6 # Front Door
+        - binary_sensor.door_window_sensor_158d00040ad8fc # Back Door
    condition:
      - condition: template
        value_template: "{{ trigger.from_state.state not in ['unavailable', 'unknown']  }}"
@@ -278,7 +255,7 @@ automation:
    initial_state: true
    trigger:
      platform: state
-      entity_id: binary_sensor.aeotec_zw120_door_window_sensor_gen5_sensor
+      entity_id: binary_sensor.door_window_sensor_158d000424a6d6
      to: "on"
    condition:
      - condition: template
@@ -292,7 +269,7 @@ automation:
    initial_state: true
    trigger:
      - platform: state
-        entity_id: binary_sensor.back_door_sensor_sensor
+        entity_id: binary_sensor.door_window_sensor_158d00040ad8fc
        to: "on"
    condition:
      - condition: template
@@ -322,9 +299,9 @@ automation:
        - condition: and
          conditions:
            - condition: template
-              value_template: "{{ states('binary_sensor.single_car_garage_door_tilt_sensor_sensor') == 'off' }}"
+              value_template: "{{ states('binary_sensor.door_window_sensor_158d0004248d5b') == 'off' }}"
            - condition: template
-              value_template: "{{ states('binary_sensor.two_car_garage_door_tilt_sensor_sensor') == 'off' }}"
+              value_template: "{{ states('binary_sensor.door_window_sensor_158d0004231f7b') == 'off' }}"
    action:
      - service: switch.turn_on
        entity_id: switch.garage
--- a/packages/emergency.yaml
+++ b/packages/emergency.yaml
@@ -151,8 +151,8 @@
 #         - binary_sensor.kitchen_motion_sensor_sensor
 #         - binary_sensor.stairs_motion_sensor_sensor
 #         - binary_sensor.upstairs_multi_sensor_sensor
-#         - binary_sensor.two_car_garage_door_tilt_sensor_sensor
-#         - binary_sensor.single_car_garage_door_tilt_sensor_sensor
+#         - binary_sensor.door_window_sensor_158d0004231f7b
+#         - binary_sensor.door_window_sensor_158d0004248d5b
 #         - binary_sensor.motion_sensor_158d0001a662fe
 #         - binary_sensor.motion_sensor_158d0001a25041
 #         - binary_sensor.motion_sensor_158d00016db6d2
--- a/packages/homesecurity.yaml
+++ b/packages/homesecurity.yaml
@@ -225,9 +225,9 @@ automation:
 #       - condition: or
 #         conditions:
 #         - condition: template
-#           value_template: '{{ states('binary_sensor.two_car_garage_door_tilt_sensor_sensor') == "on" }}'
+#           value_template: '{{ states('binary_sensor.door_window_sensor_158d0004231f7b') == "on" }}'
 #         - condition: template
-#           value_template: '{{ states('binary_sensor.single_car_garage_door_tilt_sensor_sensor') == "on" }}'
+#           value_template: '{{ states('binary_sensor.door_window_sensor_158d0004248d5b') == "on" }}'
 #   action:
 #     - service: switch.turn_on
 #       entity_id: switch.garage
@@ -235,7 +235,7 @@ automation:
 #       data_template:
 #         message: >
 #           Attention! Your home Security system is set to {{ states('alarm_control_panel.home').split('_')[1] | upper }} mode.
-#           BUT THE {% if states('binary_sensor.two_car_garage_door_tilt_sensor_sensor') == "on" -%}DOUBLE CAR {%- else  %}SINGLE CAR {% endif %}GARAGE DOOR IS STILL OPEN!
+#           BUT THE {% if states('binary_sensor.door_window_sensor_158d0004231f7b') == "on" -%}DOUBLE CAR {%- else  %}SINGLE CAR {% endif %}GARAGE DOOR IS STILL OPEN!
 #     - service: camera.snapshot
 #       data_template:
 #         entity_id: "camera.garage_camera"
@@ -262,12 +262,12 @@ automation:
 #             {%- endif %} {{ dt.strftime("%B %Y")}}
 #           {%- endmacro -%}
 #           {% set doors = "" %}
-#           {% if states('binary_sensor.two_car_garage_door_tilt_sensor_sensor') == "on"  and states('binary_sensor.single_car_garage_door_tilt_sensor_sensor') == "on" %}
+#           {% if states('binary_sensor.door_window_sensor_158d0004231f7b') == "on"  and states('binary_sensor.door_window_sensor_158d0004248d5b') == "on" %}
 #             {% set doors = "Both garage doors" %}
-#             {% elif states('binary_sensor.single_car_garage_door_tilt_sensor_sensor') == "on"%}
-#               {% set doors = states('binary_sensor.single_car_garage_door_tilt_sensor_sensor.name %}
-#             {% elif states('binary_sensor.two_car_garage_door_tilt_sensor_sensor') == "on" %}
-#               {% set doors = states('binary_sensor.two_car_garage_door_tilt_sensor_sensor.name %}
+#             {% elif states('binary_sensor.door_window_sensor_158d0004248d5b') == "on"%}
+#               {% set doors = states('binary_sensor.door_window_sensor_158d0004248d5b.name %}
+#             {% elif states('binary_sensor.door_window_sensor_158d0004231f7b') == "on" %}
+#               {% set doors = states('binary_sensor.door_window_sensor_158d0004231f7b.name %}
 #             {% endif %}
 #           Your {{ doors }} seem to be open while your home security system is set to "{{ states('alarm_control_panel.home').split('_')[1]| title }}" mode. Today is {{ get_date(now()) }}, and time is {{ now().strftime("%I:%M:%S %p") }}. Please see the attached pictures and make sure everything is okay.
 #         data:
@@ -281,12 +281,12 @@ automation:
 #       data_template:
 #         message: >
 #           {% set doors = "" %}
-#           {% if states('binary_sensor.two_car_garage_door_tilt_sensor_sensor') == "on"  and states('binary_sensor.single_car_garage_door_tilt_sensor_sensor') == "on" %}
+#           {% if states('binary_sensor.door_window_sensor_158d0004231f7b') == "on"  and states('binary_sensor.door_window_sensor_158d0004248d5b') == "on" %}
 #             {% set doors = "Both garage doors" %}
-#             {% elif states('binary_sensor.single_car_garage_door_tilt_sensor_sensor') == "on"%}
-#               {% set doors = states('binary_sensor.single_car_garage_door_tilt_sensor_sensor.name %}
-#             {% elif states('binary_sensor.single_car_garage_door_tilt_sensor_sensor') == "on" %}
-#               {% set doors = states('binary_sensor.two_car_garage_door_tilt_sensor_sensor.name %}
+#             {% elif states('binary_sensor.door_window_sensor_158d0004248d5b') == "on"%}
+#               {% set doors = states('binary_sensor.door_window_sensor_158d0004248d5b.name %}
+#             {% elif states('binary_sensor.door_window_sensor_158d0004248d5b') == "on" %}
+#               {% set doors = states('binary_sensor.door_window_sensor_158d0004231f7b.name %}
 #             {% endif %}
 #           Attention! Your home Security system is set to {{ states('alarm_control_panel.home').split('_')[1] | upper }} mode.
 #           BUT the {{ doors }} {{ 'are' if doors.endswith('s') else 'is' }} open.
@@ -308,8 +308,8 @@ automation:
 #     - service_template: >-
 #         {% if states('binary_sensor.back_door_sensor_sensor') == "off" and
 #               states('binary_sensor.aeotec_zw120_door_window_sensor_gen5_sensor')  == "off" and
-#               states('binary_sensor.two_car_garage_door_tilt_sensor_sensor') == "off" and
-#               states('binary_sensor.single_car_garage_door_tilt_sensor_sensor') == "off" %}
+#               states('binary_sensor.door_window_sensor_158d0004231f7b') == "off" and
+#               states('binary_sensor.door_window_sensor_158d0004248d5b') == "off" %}
 #           alarm_control_panel.alarm_arm_home
 #         {% else %}
 #           alarm_control_panel.disarm
@@ -321,8 +321,8 @@ automation:
 #         message: >
 #           {% if states('binary_sensor.back_door_sensor_sensor') == "off" and
 #                 states('binary_sensor.aeotec_zw120_door_window_sensor_gen5_sensor')  == "off" and
-#                 states('binary_sensor.two_car_garage_door_tilt_sensor_sensor') == "off" and
-#                 states('binary_sensor.single_car_garage_door_tilt_sensor_sensor') == "off" %}
+#                 states('binary_sensor.door_window_sensor_158d0004231f7b') == "off" and
+#                 states('binary_sensor.door_window_sensor_158d0004248d5b') == "off" %}
 #             It's getting dark outside, and your home security system is now set to HOME mode.
 #           {% else %}
 #              It is getting dark outside.
@@ -336,14 +336,14 @@ automation:
 #                  {%- set doors = doors ~ " Front Door" -%}
 #                {% endif %}
 #              {%- endif -%}
-#              {%- if states('binary_sensor.two_car_garage_door_tilt_sensor_sensor') == "on" -%}
+#              {%- if states('binary_sensor.door_window_sensor_158d0004231f7b') == "on" -%}
 #                {% if doors | trim != "" %}
 #                  {%- set doors = doors ~ " and Two Car Garage Door" -%}
 #                {% else %}
 #                  {%- set doors = doors ~ " Two Car Garage Door" -%}
 #                {% endif %}
 #              {%- endif -%}
-#              {%- if states('binary_sensor.single_car_garage_door_tilt_sensor_sensor') == "on"  -%}
+#              {%- if states('binary_sensor.door_window_sensor_158d0004248d5b') == "on"  -%}
 #                {% if doors | trim != "" %}
 #                  {%- set doors = doors ~ " and Single Car Garage Door" -%}
 #                {% else %}
@@ -357,8 +357,8 @@ automation:
 #         message: >
 #           {% if states('binary_sensor.back_door_sensor_sensor') == "off" and
 #                 states('binary_sensor.aeotec_zw120_door_window_sensor_gen5_sensor')  == "off" and
-#                 states('binary_sensor.two_car_garage_door_tilt_sensor_sensor') == "off" and
-#                 states('binary_sensor.single_car_garage_door_tilt_sensor_sensor') == "off" %}
+#                 states('binary_sensor.door_window_sensor_158d0004231f7b') == "off" and
+#                 states('binary_sensor.door_window_sensor_158d0004248d5b') == "off" %}
 #             It's getting dark outside, and your home security system is now set to HOME mode.
 #           {% else %}
 #              It is getting dark outside.
@@ -372,14 +372,14 @@ automation:
 #                  {%- set doors = doors ~ " Front Door" -%}
 #                {% endif %}
 #              {%- endif -%}
-#              {%- if states('binary_sensor.two_car_garage_door_tilt_sensor_sensor') == "on" -%}
+#              {%- if states('binary_sensor.door_window_sensor_158d0004231f7b') == "on" -%}
 #                {% if doors | trim != "" %}
 #                  {%- set doors = doors ~ " and Two Car Garage Door" -%}
 #                {% else %}
 #                  {%- set doors = doors ~ " Two Car Garage Door" -%}
 #                {% endif %}
 #              {%- endif -%}
-#              {%- if states('binary_sensor.single_car_garage_door_tilt_sensor_sensor') == "on"  -%}
+#              {%- if states('binary_sensor.door_window_sensor_158d0004248d5b') == "on"  -%}
 #                {% if doors | trim != "" %}
 #                  {%- set doors = doors ~ " and Single Car Garage Door" -%}
 #                {% else %}
@@ -426,8 +426,8 @@ automation:
 #   trigger:
 #     platform: state
 #     entity_id:
-#       - binary_sensor.two_car_garage_door_tilt_sensor_sensor
-#       - binary_sensor.single_car_garage_door_tilt_sensor_sensor
+#       - binary_sensor.door_window_sensor_158d0004231f7b
+#       - binary_sensor.door_window_sensor_158d0004248d5b
 #     to: 'on'
 #   condition:
 #     - condition: template
--- a/packages/led_notify.yaml
+++ b/packages/led_notify.yaml
@@ -23,8 +23,8 @@ automation:
    trigger:
      platform: state
      entity_id:
-        - binary_sensor.two_car_garage_door_tilt_sensor_sensor
-        - binary_sensor.single_car_garage_door_tilt_sensor_sensor
+        - binary_sensor.door_window_sensor_158d0004231f7b
+        - binary_sensor.door_window_sensor_158d0004248d5b
    condition:
      - condition: template
        value_template: "{{ trigger.from_state.state not in ['unavailable', 'unknown'] }}"
@@ -37,11 +37,11 @@ automation:
        data_template:
          message: >
            {% set doors = "" %}
-              {% if states('binary_sensor.two_car_garage_door_tilt_sensor_sensor') == "on"  and
-                    states('binary_sensor.single_car_garage_door_tilt_sensor_sensor') == "on" %}
+              {% if states('binary_sensor.door_window_sensor_158d0004231f7b') == "on"  and
+                    states('binary_sensor.door_window_sensor_158d0004248d5b') == "on" %}
                {% set doors = "Attention! Both Garage Doors are OPEN" %}
-              {% elif states('binary_sensor.two_car_garage_door_tilt_sensor_sensor') == "off"  and
-                      states('binary_sensor.single_car_garage_door_tilt_sensor_sensor') == "off" %}
+              {% elif states('binary_sensor.door_window_sensor_158d0004231f7b') == "off"  and
+                      states('binary_sensor.door_window_sensor_158d0004248d5b') == "off" %}
                {% set doors = "Both Garage Doors are now CLOSED" %}
              {% else %}
                {% if trigger.to_state.state | lower == "on" %}
--- a/packages/lights.yaml
+++ b/packages/lights.yaml
@@ -138,6 +138,20 @@ input_boolean:
    name: Long Flash Lights
    initial: off

+light:
+  - platform: group
+    name: Family Room Lights
+    entities:
+      - light.hue_color_lamp_1
+      - light.hue_color_lamp_2
+      - light.hue_color_lamp_3
+
+  - platform: group
+    name: Master Bedroom Lights
+    entities:
+      - light.master_bedroom_1
+      - light.master_bedroom_2
+
 ###############################################################################
 #                _                        _   _
 #     /\        | |                      | | (_)
--- a/packages/motion_counts.yaml
+++ b/packages/motion_counts.yaml
@@ -52,12 +52,20 @@ homeassistant:
      unit_of_measurement: "count"
    input_label.upstairs_multi_sensor_sensor:
      unit_of_measurement: "count"
+    input_label.door_window_sensor_158d0004231f7b:
+      unit_of_measurement: "count"
+    input_label.door_window_sensor_158d0004248d5b:
+      unit_of_measurement: "count"
+    input_label.door_window_sensor_158d00040ad8fc:
+      unit_of_measurement: "count"
+    input_label.door_window_sensor_158d000424a6d6:
+      unit_of_measurement: "count"

 input_label:
-  aeotec_zw120_door_window_sensor_gen5_sensor:
+  door_window_sensor_158d000424a6d6:
    name: Front Door
    icon: mdi:run-fast
-  back_door_sensor_sensor:
+  door_window_sensor_158d00040ad8fc:
    name: Back Door
    icon: mdi:run-fast
  basement_door_sensor_sensor:
@@ -123,10 +131,10 @@ input_label:
    name: Office Room Motion (Xiaomi)
    icon: mdi:run-fast

-  single_car_garage_door_tilt_sensor_sensor:
+  door_window_sensor_158d0004248d5b:
    name: Single Car Garage Door
    icon: mdi:run-fast
-  two_car_garage_door_tilt_sensor_sensor:
+  door_window_sensor_158d0004231f7b:
    name: Double Car Garage Door
    icon: mdi:run-fast
  stairs_motion_sensor_sensor:
@@ -142,8 +150,8 @@ automation:
      - platform: state
        to: "on"
        entity_id:
-          - binary_sensor.aeotec_zw120_door_window_sensor_gen5_sensor
-          - binary_sensor.back_door_sensor_sensor
+          - binary_sensor.door_window_sensor_158d000424a6d6
+          - binary_sensor.door_window_sensor_158d00040ad8fc
          - binary_sensor.basement_door_sensor_sensor
          - binary_sensor.downstairs_multi_sensor_sensor
          - binary_sensor.front_room_multi_sensor_sensor
@@ -164,9 +172,9 @@ automation:
          - binary_sensor.motion_sensor_158d00047b6f69
          - binary_sensor.motion_sensor_158d000272bf48
          - binary_sensor.motion_sensor_158d000272bfd7
-          - binary_sensor.single_car_garage_door_tilt_sensor_sensor
          - binary_sensor.stairs_motion_sensor_sensor
-          - binary_sensor.two_car_garage_door_tilt_sensor_sensor
+          - binary_sensor.door_window_sensor_158d0004248d5b # Single Car Garage
+          - binary_sensor.door_window_sensor_158d0004231f7b # Double Car Garage
          - binary_sensor.upstairs_multi_sensor_sensor
    action:
      - service: input_label.set_value
@@ -185,8 +193,6 @@ automation:
        data:
          value: 0
          entity_id:
-            - input_label.aeotec_zw120_door_window_sensor_gen5_sensor
-            - input_label.back_door_sensor_sensor
            - input_label.basement_door_sensor_sensor
            - input_label.downstairs_multi_sensor_sensor
            - input_label.front_room_multi_sensor_sensor
@@ -207,19 +213,5 @@ automation:
            - input_label.motion_sensor_158d00047b6f69
            - input_label.motion_sensor_158d000272bf48
            - input_label.motion_sensor_158d000272bfd7
-            - input_label.single_car_garage_door_tilt_sensor_sensor
-            - input_label.stairs_motion_sensor_sensor
-            - input_label.two_car_garage_door_tilt_sensor_sensor
-            - input_label.upstairs_multi_sensor_sensor
-# {% for x in states.binary_sensor if   'camera' not in x.entity_id and
-#                                       'cube' not in x.entity_id and
-#                                       'tesla' not in x.entity_id and
-#                                       'drone' not in x.entity_id and
-#                                       'audio' not in x.entity_id and
-#                                       'protection' not in x.entity_id and
-#                                       'tv' not in x.entity_id and
-#                                       'workday' not in x.entity_id and
-#                                       'home_away' not in x.entity_id and
-#                                       'dining_room' not in x.entity_id %}
-# {{ x.entity_id }}
-# {%- endfor %}
+            - input_label.door_window_sensor_158d000424a6d6
+            - input_label.door_window_sensor_158d00040ad8fc
--- a/packages/watchdog.yaml
+++ b/packages/watchdog.yaml
@@ -42,8 +42,8 @@ automation:
    trigger:
      - platform: state
        entity_id:
-          - binary_sensor.two_car_garage_door_tilt_sensor_sensor
-          - binary_sensor.single_car_garage_door_tilt_sensor_sensor
+          - binary_sensor.door_window_sensor_158d0004231f7b
+          - binary_sensor.door_window_sensor_158d0004248d5b
        to: "on"
        for:
          minutes: 5
@@ -62,7 +62,7 @@ automation:
        data_template:
          message: >
            Attention! Your {{ trigger.to_state.attributes.friendly_name }} is open for more than 5 minutes.
-      - service: scipt.led_notify
+      - service: script.led_message
        data_template:
          message: >
            Your {{ trigger.to_state.attributes.friendly_name }} is OPEN for more than 5 minutes!
--- a/packages/zwave_sensors.yaml
+++ b/packages/zwave_sensors.yaml
@@ -13,366 +13,245 @@ homeassistant:
    # ZWave Binary Sensors
    binary_sensor.audio_detector_sensor:
      friendly_name: Audio Detector Sensor
-      ## <<: *not_exposed
-    binary_sensor.back_door_sensor_sensor:
-      friendly_name: Back Door Sensor
-      ## <<: *not_exposed
    binary_sensor.basement_door_sensor_sensor:
      friendly_name: Basement Door Sensor
-      ## <<: *not_exposed
    binary_sensor.downstairs_multi_sensor_sensor:
      friendly_name: Downstairs Multi Sensor
-      ## <<: *not_exposed
    binary_sensor.front_door_sensor_sensor:
      friendly_name: Front Door Sensor
-      ## <<: *not_exposed
    binary_sensor.front_room_multi_sensor_sensor:
      friendly_name: Front Room Multi Sensor
-      ## <<: *not_exposed
    binary_sensor.garage_door_sensor_sensor:
      friendly_name: Garage Door Sensor
-      ## <<: *not_exposed
    binary_sensor.guest_bedroom_multi_sensor_sensor:
      friendly_name: Guest Bedroom Multi Sensor
-      ## <<: *not_exposed
    binary_sensor.kitchen_motion_sensor_sensor:
      friendly_name: Kitchen Motion Sensor
-      ## <<: *not_exposed
-    binary_sensor.single_car_garage_door_tilt_sensor_sensor:
+    binary_sensor.door_window_sensor_158d0004248d5b:
      friendly_name: Single Car Garage Door
-      ## <<: *not_exposed
    binary_sensor.stairs_motion_sensor_sensor:
      friendly_name: Stairs Motion Sensor
-      ## <<: *not_exposed
    binary_sensor.tv_multi_sensor_sensor:
      friendly_name: TV Multi Sensor
-      ## <<: *not_exposed
-    binary_sensor.two_car_garage_door_tilt_sensor_sensor:
+    binary_sensor.door_window_sensor_158d0004231f7b:
      friendly_name: Double Car Garage Door
-      ## <<: *not_exposed
    binary_sensor.upstairs_multi_sensor_sensor:
      friendly_name: Upstairs Multi Sensor
-      ## <<: *not_exposed

    # ZWave Sensors
    sensor.audio_detector_alarm_level:
      friendly_name: Audio Detector Alarm Level
-      # <<: *not_exposed
    sensor.audio_detector_alarm_type:
      friendly_name: Audio Detector Alarm Type
-      # <<: *not_exposed
    sensor.audio_detector_burglar:
      friendly_name: Audio Detector Burglar
-      # <<: *not_exposed
    sensor.audio_detector_carbon_monoxide:
      friendly_name: Audio Detector Carbon Monoxide
-      # <<: *not_exposed
    sensor.audio_detector_power_management:
      friendly_name: Audio Detector Power Management
-      # <<: *not_exposed
    sensor.audio_detector_smoke:
      friendly_name: Audio Detector Smoke
-      # <<: *not_exposed
    sensor.audio_detector_sourcenodeid:
      friendly_name: Audio Detector SourceNodeId
-      # <<: *not_exposed
    sensor.audio_detector_temperature:
      friendly_name: Audio Detector Temperature
-      # <<: *not_exposed
    sensor.back_door_sensor_access_control:
      friendly_name: Back Door Sensor Access Control
-      # <<: *not_exposed
    sensor.back_door_sensor_alarm_level:
      friendly_name: Back Door Sensor Alarm Level
-      # <<: *not_exposed
    sensor.back_door_sensor_alarm_type:
      friendly_name: Back Door Sensor Alarm Type
-      # <<: *not_exposed
    sensor.back_door_sensor_burglar:
      friendly_name: Back Door Sensor Burglar
-      # <<: *not_exposed
    sensor.back_door_sensor_power_management:
      friendly_name: Back Door Sensor Power Management
-      # <<: *not_exposed
    sensor.back_door_sensor_sourcenodeid:
      friendly_name: Back Door Sensor SourceNodeId
-      # <<: *not_exposed
    sensor.basement_door_sensor_access_control:
      friendly_name: Basement Door Sensor Access Control
-      # <<: *not_exposed
    sensor.basement_door_sensor_alarm_level:
      friendly_name: Basement Door Sensor Alarm Level
-      # <<: *not_exposed
    sensor.basement_door_sensor_alarm_type:
      friendly_name: Basement Door Sensor Alarm Type
-      # <<: *not_exposed
    sensor.basement_door_sensor_burglar:
      friendly_name: Basement Door Sensor Burglar
-      # <<: *not_exposed
    sensor.basement_door_sensor_power_management:
      friendly_name: Basement Door Sensor Power Management
-      # <<: *not_exposed
    sensor.basement_door_sensor_sourcenodeid:
      friendly_name: Basement Door Sensor SourceNodeId
-      # <<: *not_exposed
    sensor.downstairs_multi_sensor_alarm_level:
      friendly_name: Downstairs Multi Sensor Alarm Level
-      # <<: *not_exposed
    sensor.downstairs_multi_sensor_alarm_type:
      friendly_name: Downstairs Multi Sensor Alarm Type
-      # <<: *not_exposed
    sensor.downstairs_multi_sensor_burglar:
      friendly_name: Downstairs Multi Sensor Burglar
-      # <<: *not_exposed
    sensor.downstairs_multi_sensor_luminance:
      friendly_name: Downstairs Multi Sensor Luminance
-      # <<: *not_exposed
    sensor.downstairs_multi_sensor_power:
      friendly_name: Downstairs Multi Sensor Power
-      # <<: *not_exposed
    sensor.downstairs_multi_sensor_relative_humidity:
      friendly_name: Downstairs Multi Sensor Relative Humidity
-      # <<: *not_exposed
    sensor.downstairs_multi_sensor_sourcenodeid:
      friendly_name: Downstairs Multi Sensor SourceNodeId
-      # <<: *not_exposed
    sensor.downstairs_multi_sensor_temperature:
      friendly_name: Downstairs Multi Sensor Temperature
-      # <<: *not_exposed
    sensor.front_room_multi_sensor_alarm_level:
      friendly_name: Front Room Multi Sensor Alarm Level
-      # <<: *not_exposed
    sensor.front_room_multi_sensor_alarm_type:
      friendly_name: Front Room Multi Sensor Alarm Type
-      # <<: *not_exposed
    sensor.front_room_multi_sensor_burglar:
      friendly_name: Front Room Multi Sensor Burglar
-      # <<: *not_exposed
    sensor.front_room_multi_sensor_luminance:
      friendly_name: Front Room Multi Sensor Luminance
-      # <<: *not_exposed
    sensor.front_room_multi_sensor_relative_humidity:
      friendly_name: Front Room Multi Sensor Relative Humidity
-      # <<: *not_exposed
    sensor.front_room_multi_sensor_sourcenodeid:
      friendly_name: Front Room Multi Sensor SourceNodeId
-      # <<: *not_exposed
    sensor.front_room_multi_sensor_temperature:
      friendly_name: Front Room Multi Sensor Temperature
-      # <<: *not_exposed
    sensor.front_room_multi_sensor_ultraviolet:
      friendly_name: Front Room Multi Sensor Ultraviolet
-      # <<: *not_exposed
    sensor.garage_door_sensor_access_control:
      friendly_name: Garage Door Sensor Access Control
-      # <<: *not_exposed
    sensor.garage_door_sensor_alarm_level:
      friendly_name: Garage Door Sensor Alarm Level
-      # <<: *not_exposed
    sensor.garage_door_sensor_alarm_type:
      friendly_name: Garage Door Sensor Alarm Type
-      # <<: *not_exposed
    sensor.garage_door_sensor_burglar:
      friendly_name: Garage Door Sensor Burglar
-      # <<: *not_exposed
    sensor.garage_door_sensor_power_management:
      friendly_name: Garage Door Sensor Power Management
-      # <<: *not_exposed
    sensor.garage_door_sensor_sourcenodeid:
      friendly_name: Garage Door Sensor SourceNodeId
-      # <<: *not_exposed
    sensor.single_car_garage_door_sensor_status:
      friendly_name: Single Car Garage Door Sensor Status
-      # <<: *not_exposed
    sensor.two_car_garage_door_sensor_status:
      friendly_name: Double Car Garage Door Sensor Status
-      # <<: *not_exposed
    sensor.guest_bedroom_multi_sensor_alarm_level:
      friendly_name: Guest Bedroom Multi Sensor Alarm Level
-      # <<: *not_exposed
    sensor.guest_bedroom_multi_sensor_alarm_type:
      friendly_name: Guest Bedroom Multi Sensor Alarm Type
-      # <<: *not_exposed
    sensor.guest_bedroom_multi_sensor_burglar:
      friendly_name: Guest Bedroom Multi Sensor Burglar
-      # <<: *not_exposed
    sensor.guest_bedroom_multi_sensor_luminance:
      friendly_name: Guest Bedroom Multi Sensor Luminance
-      # <<: *not_exposed
    sensor.guest_bedroom_multi_sensor_relative_humidity:
      friendly_name: Guest Bedroom Multi Sensor Relative Humidity
-      # <<: *not_exposed
    sensor.guest_bedroom_multi_sensor_sourcenodeid:
      friendly_name: Guest Bedroom Multi Sensor SourceNodeId
-      # <<: *not_exposed
    sensor.guest_bedroom_multi_sensor_temperature:
      friendly_name: Guest Bedroom Multi Sensor Temperature
-      # <<: *not_exposed
    sensor.guest_bedroom_multi_sensor_ultraviolet:
      friendly_name: Guest Bedroom Multi Sensor Ultraviolet
-      # <<: *not_exposed
    sensor.kitchen_motion_sensor_alarm_level:
      friendly_name: Kitchen Motion Sensor Alarm Level
-      # <<: *not_exposed
    sensor.kitchen_motion_sensor_alarm_type:
      friendly_name: Kitchen Motion Sensor Alarm Type
-      # <<: *not_exposed
    sensor.kitchen_motion_sensor_burglar:
      friendly_name: Kitchen Motion Sensor Burglar
-      # <<: *not_exposed
    sensor.kitchen_motion_sensor_power_management:
      friendly_name: Kitchen Motion Sensor Power Management
-      # <<: *not_exposed
    sensor.kitchen_motion_sensor_sourcenodeid:
      friendly_name: Kitchen Motion Sensor SourceNodeId
-      # <<: *not_exposed
    sensor.single_car_garage_door_tilt_sensor_access_control:
      friendly_name: Single Car Garage Door Tilt Sensor Access Control
-      # <<: *not_exposed
    sensor.single_car_garage_door_tilt_sensor_alarm_level:
      friendly_name: Single Car Garage Door Tilt Sensor Alarm Level
-      # <<: *not_exposed
    sensor.single_car_garage_door_tilt_sensor_alarm_type:
      friendly_name: Single Car Garage Door Tilt Sensor Alarm Type
-      # <<: *not_exposed
    sensor.single_car_garage_door_tilt_sensor_burglar:
      friendly_name: Single Car Garage Door Tilt Sensor Burglar
-      # <<: *not_exposed
    sensor.single_car_garage_door_tilt_sensor_power_management:
      friendly_name: Single Car Garage Door Tilt Sensor Power Management
-      # <<: *not_exposed
    sensor.single_car_garage_door_tilt_sensor_sourcenodeid:
      friendly_name: Single Car Garage Door Tilt Sensor SourceNodeId
-      # <<: *not_exposed
    sensor.stairs_motion_sensor_alarm_level:
      friendly_name: Stairs Motion Sensor Alarm Level
-      # <<: *not_exposed
    sensor.stairs_motion_sensor_alarm_type:
      friendly_name: Stairs Motion Sensor Alarm Type
-      # <<: *not_exposed
    sensor.stairs_motion_sensor_burglar:
      friendly_name: Stairs Motion Sensor Burglar
-      # <<: *not_exposed
    sensor.stairs_motion_sensor_power_management:
      friendly_name: Stairs Motion Sensor Power Management
-      # <<: *not_exposed
    sensor.stairs_motion_sensor_sourcenodeid:
      friendly_name: Stairs Motion Sensor SourceNodeId
-      # <<: *not_exposed
    sensor.tv_multi_sensor_alarm_level:
      friendly_name: TV Multi Sensor Alarm Level
-      # <<: *not_exposed
    sensor.tv_multi_sensor_alarm_type:
      friendly_name: TV Multi Sensor Alarm Type
-      # <<: *not_exposed
    sensor.tv_multi_sensor_burglar:
      friendly_name: TV Multi Sensor Burglar
-      # <<: *not_exposed
    sensor.tv_multi_sensor_luminance:
      friendly_name: TV Multi Sensor Luminance
-      # <<: *not_exposed
    sensor.tv_multi_sensor_relative_humidity:
      friendly_name: TV Multi Sensor Relative Humidity
-      # <<: *not_exposed
    sensor.tv_multi_sensor_sourcenodeid:
      friendly_name: TV Multi Sensor SourceNodeId
-      # <<: *not_exposed
    sensor.tv_multi_sensor_temperature:
      friendly_name: TV Multi Sensor Temperature
-      # <<: *not_exposed
    sensor.tv_multi_sensor_ultraviolet:
      friendly_name: TV Multi Sensor Ultraviolet
-      # <<: *not_exposed
    sensor.two_car_garage_door_tilt_sensor_access_control:
      friendly_name: Two Car Garage Door Tilt Sensor Access Control
-      # <<: *not_exposed
    sensor.two_car_garage_door_tilt_sensor_alarm_level:
      friendly_name: Two Car Garage Door Tilt Sensor Alarm Level
-      # <<: *not_exposed
    sensor.two_car_garage_door_tilt_sensor_alarm_type:
      friendly_name: Two Car Garage Door Tilt Sensor Alarm Type
-      # <<: *not_exposed
    sensor.two_car_garage_door_tilt_sensor_burglar:
      friendly_name: Two Car Garage Door Tilt Sensor Burglar
-      # <<: *not_exposed
    sensor.two_car_garage_door_tilt_sensor_power_management:
      friendly_name: Two Car Garage Door Tilt Sensor Power Management
-      # <<: *not_exposed
    sensor.two_car_garage_door_tilt_sensor_sourcenodeid:
      friendly_name: Two Car Garage Door Tilt Sensor SourceNodeId
-      # <<: *not_exposed
    sensor.upstairs_multi_sensor_alarm_level:
      friendly_name: Upstairs Multi Sensor Alarm Level
-      # <<: *not_exposed
    sensor.upstairs_multi_sensor_alarm_type:
-      # <<: *not_exposed
      friendly_name: Upstairs Multi Sensor Alarm Type
    sensor.upstairs_multi_sensor_burglar:
-      # <<: *not_exposed
      friendly_name: Upstairs Multi Sensor Burglar
    sensor.upstairs_multi_sensor_luminance:
-      # <<: *not_exposed
      friendly_name: Upstairs Multi Sensor Luminance
    sensor.upstairs_multi_sensor_relative_humidity:
-      # <<: *not_exposed
      friendly_name: Upstairs Multi Sensor Relative Humidity
    sensor.upstairs_multi_sensor_sourcenodeid:
-      # <<: *not_exposed
      friendly_name: Upstairs Multi Sensor SourceNodeId
    sensor.upstairs_multi_sensor_temperature:
-      # <<: *not_exposed
      friendly_name: Upstairs Multi Sensor Temperature
    sensor.upstairs_multi_sensor_ultraviolet:
-      # <<: *not_exposed
      friendly_name: Upstairs Multi Sensor Ultraviolet
    sensor.wallmote_alarm_level:
-      # <<: *not_exposed
      friendly_name: Wallmote Alarm Level
    sensor.wallmote_alarm_type:
      friendly_name: Wallmote Alarm Type
-      # <<: *not_exposed
    sensor.wallmote_power_management:
      friendly_name: Wallmote Power Management
-      # <<: *not_exposed
    sensor.wallmote_sourcenodeid:
      friendly_name: Wallmote SourceNodeId
-      # <<: *not_exposed
    sensor.zwave_smart_switch_current:
      friendly_name: ZWave Smart Switch Current
-      # <<: *not_exposed
    sensor.zwave_smart_switch_energy:
      friendly_name: ZWave Smart Switch Energy
-      # <<: *not_exposed
    sensor.zwave_smart_switch_power:
      friendly_name: ZWave Smart Switch Power
-      # <<: *not_exposed
    sensor.zwave_smart_switch_previous_reading:
      friendly_name: ZWave Smart Switch Previous Reading
-      # <<: *not_exposed
    sensor.zwave_smart_switch_voltage:
      friendly_name: ZWave Smart Switch Voltage
-      # <<: *not_exposed

    # ZWave Switches

    switch.kitchen_siren_switch:
      friendly_name: Kitchen Siren Switch 1
-      # <<: *not_exposed
    switch.kitchen_siren_switch_2:
      friendly_name: Kitchen Siren Switch 2
-      # <<: *not_exposed
    switch.kitchen_siren_switch_3:
      friendly_name: Kitchen Siren Switch 3
-      # <<: *not_exposed
    switch.kitchen_siren_switch_4:
      friendly_name: Kitchen Siren Switch 4
-      # <<: *not_exposed
    switch.kitchen_siren_switch_5:
      friendly_name: Kitchen Siren Switch 5
-      # <<: *not_exposed
    switch.wallmote_switch:
      friendly_name: Wallmote Switch
-      # <<: *not_exposed

 zwave:
  usb_path: /dev/ttyACM0