Clean up!

configuration.yaml

@@ -31,6 +31,8 @@ discovery:
   ignore:
     - homekit
 
+shopping_list:
+
 homekit:
   autostart: true
   filter:

logging.yaml

@@ -1,40 +1,40 @@
-default: error
+default: warning
 logs:
   gsp: critical
-  root: error
+  root: warning
-  pyhap: error
+  pyhap: warning
-  openzwave: error
+  openzwave: warning
-  py.warnings: error
+  py.warnings: warning
-  pywemo.ssdp: error
+  pywemo.ssdp: warning
-  libopenzwave: error
+  libopenzwave: warning
-  simplipy.api: error
+  simplipy.api: warning
-  netdisco.ssdp: error
+  netdisco.ssdp: warning
-  aiohttp.server: error
+  aiohttp.server: warning
   homeassistant.core: critical
-  homeassistant.setup: error
+  homeassistant.setup: warning
-  homeassistant.loader: error # hide custom_component warnings
+  homeassistant.loader: warning # hide custom_component warnings
-  homeassistant.exceptions: error
+  homeassistant.exceptions: warning
-  homeassistant.helpers.script: error
+  homeassistant.helpers.script: warning
-  homeassistant.helpers.entity: error
+  homeassistant.helpers.entity: warning
   homeassistant.components.wemo: critical
-  homeassistant.components.cloud.iot: error
+  homeassistant.components.cloud.iot: warning
   homeassistant.components.hue: critical
-  homeassistant.components.http: error
+  homeassistant.components.http: warning
-  homeassistant.components.camera: error
+  homeassistant.components.camera: warning
-  homeassistant.components.zwave: error
+  homeassistant.components.zwave: warning
-  homeassistant.components.sensor: error
+  homeassistant.components.sensor: warning
-  homeassistant.components.image_processing: error
+  homeassistant.components.image_processing: warning
-  homeassistant.components.homekit: error
+  homeassistant.components.homekit: warning
-  custom_components.sensor.life360: error
+  custom_components.sensor.life360: warning
-  custom_components.sensor.paloalto: error
+  custom_components.sensor.paloalto: warning
-  homeassistant.components.recorder: error
+  homeassistant.components.recorder: warning
-  homeassistant.components.discovery: error
+  homeassistant.components.discovery: warning
-  homeassistant.components.automation: error
+  homeassistant.components.automation: warning
-  custom_components.sensor.command_line: error
+  custom_components.sensor.command_line: warning
-  homeassistant.components.climate.nest: error
+  homeassistant.components.climate.nest: warning
-  homeassistant.components.media_player: error
+  homeassistant.components.media_player: warning
-  custom_components.media_player.sharptv: error
+  custom_components.media_player.sharptv: warning
-  homeassistant.components.switch.tplink: error
+  homeassistant.components.switch.tplink: warning
-  homeassistant.components.emulated_hue: error
+  homeassistant.components.emulated_hue: warning
-  homeassistant.components.device_tracker: error
+  homeassistant.components.device_tracker: warning
-  homeassistant.components.camera.generic: error
+  homeassistant.components.camera.generic: warning

lovelace/00_myhome_view.yaml

@@ -243,7 +243,6 @@ cards:
       - binary_sensor.playarea_camera_motion
       - binary_sensor.frontdoor_camera_motion
       - binary_sensor.driveway_camera_motion
-      - binary_sensor.aeotec_water_sensor_sensor
       - binary_sensor.audio_detector_sensor
       - binary_sensor.basement_door_sensor_sensor
       - binary_sensor.downstairs_multi_sensor_sensor
@@ -317,9 +316,9 @@ cards:
     title: Z-Wave Batteries
     show_header_toggle: false
     entities:
-      - input_label.aeotec_water_sensor
       - input_label.audio_detector
       - input_label.back_door_sensor
+      - input_label.zwave_front_door_sensor
       - input_label.basement_door_sensor
       - input_label.downstairs_multi_sensor
       - input_label.front_room_multi_sensor

lovelace/02_climate_view.yaml

@@ -49,8 +49,6 @@ cards:
     title: Temperature Levels
     show_header_toggle: false
     entities:
-      - entity: sensor.aeotec_water_sensor_temperature
-        name: Basement Temperature in HVAC Room
       - entity: sensor.audio_detector_temperature
         name: Hallway Temperature
       - sensor.downstairs_multi_sensor_temperature

packages/apcups.yaml

@@ -1,77 +1,77 @@
+# # ###############################################################################
+# # #   @author         :   Mahasri Kalavala
+# # #   @date           :   11/27/2017
+# # #   @package        :   APC UPS Backup
+# # #   @description    :   UPS Backup
+# # ###############################################################################
+# apcupsd:
+#   host: 127.0.0.1
+#   port: 3551
+
+# sensor:
+#   - platform: apcupsd
+#     #  name: Network Backup UPS
+#     resources:
+#       - bcharge
+#       - linev
+#       - loadpct
+#       - nominv
+#       - numxfers
+#       - status
+#       - timeleft
+#       - tonbatt
+
 # ###############################################################################
-# #   @author         :   Mahasri Kalavala
+# #                _                        _   _
-# #   @date           :   11/27/2017
+# #     /\        | |                      | | (_)
-# #   @package        :   APC UPS Backup
+# #    /  \  _   _| |_ ___  _ __ ___   __ _| |_ _  ___  _ __  ___
-# #   @description    :   UPS Backup
+# #   / /\ \| | | | __/ _ \| '_ ` _ \ / _` | __| |/ _ \| '_ \/ __|
+# #  / ____ \ |_| | || (_) | | | | | | (_| | |_| | (_) | | | \__ \
+# # /_/    \_\__,_|\__\___/|_| |_| |_|\__,_|\__|_|\___/|_| |_|___/
+# #
 # ###############################################################################
-apcupsd:
-  host: 127.0.0.1
-  port: 3551
 
-sensor:
+# automation:
-  - platform: apcupsd
+#   - alias: UPS State Change
-    #  name: Network Backup UPS
+#     initial_state: true
-    resources:
+#     trigger:
-      - bcharge
+#       - platform: state
-      - linev
+#         entity_id: sensor.ups_status
-      - loadpct
+#     action:
-      - nominv
+#       - service: script.notify_me
-      - numxfers
+#         data_template:
-      - status
+#           message: "UPS Status changed from {{ trigger.from_state.state }}
-      - timeleft
+#             to {{ trigger.to_state.state }}
-      - tonbatt
+#             at {{ as_timestamp(now()) | timestamp_custom('%I:%M:%S %p, %B %d,%Y', true) }}."
 
-###############################################################################
+#   # # Power Failure Notification
-#                _                        _   _
+#   # ###############################################################################
-#     /\        | |                      | | (_)
+#   - alias: Power Failure
-#    /  \  _   _| |_ ___  _ __ ___   __ _| |_ _  ___  _ __  ___
+#     initial_state: true
-#   / /\ \| | | | __/ _ \| '_ ` _ \ / _` | __| |/ _ \| '_ \/ __|
+#     trigger:
-#  / ____ \ |_| | || (_) | | | | | | (_| | |_| | (_) | | | \__ \
+#       - platform: state
-# /_/    \_\__,_|\__\___/|_| |_| |_|\__,_|\__|_|\___/|_| |_|___/
+#         entity_id: sensor.ups_status
-#
+#         from: "ONLINE"
-###############################################################################
+#         to: "ONBATT"
+#     action:
+#       - service: script.notify_me
+#         data_template:
+#           message:
+#             Power failure at {{ as_timestamp(now()) | timestamp_custom('%I:%M:%S %p %B-%d,%Y', true) }}.
+#             Battery can last for {{ states('sensor.ups_time_left') }} minutes.
 
-automation:
+#   # # Power Restored Notification
-  - alias: UPS State Change
+#   # ###############################################################################
-    initial_state: true
+#   - alias: Power Restored
-    trigger:
+#     initial_state: true
-      - platform: state
+#     trigger:
-        entity_id: sensor.ups_status
+#       - platform: state
-    action:
+#         entity_id: sensor.ups_status
-      - service: script.notify_me
+#         from: "ONBATT"
-        data_template:
+#         to: "ONLINE"
-          message: "UPS Status changed from {{ trigger.from_state.state }}
+#     action:
-            to {{ trigger.to_state.state }}
+#       - service: script.notify_me
-            at {{ as_timestamp(now()) | timestamp_custom('%I:%M:%S %p, %B %d,%Y', true) }}."
+#         data_template:
-
+#           message:
-  # # Power Failure Notification
+#             Power restored at {{ as_timestamp(now()) | timestamp_custom('%I:%M:%S %p %B-%d,%Y', true) }}.
-  # ###############################################################################
+#             Ran on battery for {{ "%0.2f" % (states('sensor.ups_time_on_battery') | int / 60  |float) }} minutes.
-  - alias: Power Failure
-    initial_state: true
-    trigger:
-      - platform: state
-        entity_id: sensor.ups_status
-        from: "ONLINE"
-        to: "ONBATT"
-    action:
-      - service: script.notify_me
-        data_template:
-          message:
-            Power failure at {{ as_timestamp(now()) | timestamp_custom('%I:%M:%S %p %B-%d,%Y', true) }}.
-            Battery can last for {{ states('sensor.ups_time_left') }} minutes.
-
-  # # Power Restored Notification
-  # ###############################################################################
-  - alias: Power Restored
-    initial_state: true
-    trigger:
-      - platform: state
-        entity_id: sensor.ups_status
-        from: "ONBATT"
-        to: "ONLINE"
-    action:
-      - service: script.notify_me
-        data_template:
-          message:
-            Power restored at {{ as_timestamp(now()) | timestamp_custom('%I:%M:%S %p %B-%d,%Y', true) }}.
-            Ran on battery for {{ "%0.2f" % (states('sensor.ups_time_on_battery') | int / 60  |float) }} minutes.

packages/batteries.yaml

@@ -442,7 +442,6 @@ automation:
   #       - sensor.illumination_158d00016db6d2
   #       - sensor.illumination_158d0001a25041
   #       - sensor.illumination_158d0001a662fe
-  #       - zwave.aeotec_water_sensor
   #       - zwave.audio_detector
   #       - zwave.back_door_sensor
   #       - zwave.basement_door_sensor

packages/bed_sensors.yaml

@@ -1,8 +0,0 @@
-homeassistant:
-
-sensor:
-  - platform: mqtt
-    name: "Master Bed Sensor"
-    state_topic: "/master_bed/master_bed/WeightChanA"
-    value_template: "{{ value }}"
-    unit_of_measurement: load

packages/door_sensors.yaml

@@ -142,9 +142,9 @@ automation:
         - binary_sensor.single_car_garage_door_tilt_sensor_sensor
     condition:
       - condition: template
-        value_template: "{% if trigger.from_state %} True {% else %} False {% endif %}"
+        value_template: "{{ trigger.from_state.state not in ['unavailable', 'unknown'] }}"
       - condition: template
-        value_template: "{{ trigger.to_state.state != 'unknown' }}"
+        value_template: "{{ trigger.to_state.state not in ['unavailable', 'unknown'] }}"
       - condition: template
         value_template: "{{ states('input_boolean.garage_door_notifications') == 'on' }}"
     action:
@@ -164,7 +164,7 @@ automation:
             {% 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" %}
-                {% set doors = "Atention! Both Garage Doors are OPEN" %}
+                {% 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" %}
                 {% set doors = "Both Garage Doors are now CLOSED" %}

packages/emergency.yaml

@@ -66,28 +66,6 @@
 #         data_template:
 #           message: "Emergency mode is now deactivated!"
 
-# # Water Leak detected - initiate the emergency process
-# ###############################################################################
-#   - alias: Water Leak Detected
-#     initial_state: true
-#     trigger:
-#       - platform: state
-#         entity_id: sensor.aeotec_water_sensor_flood
-#         from: '0'
-#         to: '2'
-#     action:
-#       - service: input_boolean.turn_on
-#         entity_id: input_boolean.emergency_mode
-#       - service: script.emergency_all_lights_switches_on
-#       - service: script.notify_me
-#         data_template:
-#           message: "EMERGENCY! Water Leak Detected in the Basement!"
-#       - service: script.emergency_script
-#         data:
-#           volume_level: 25
-#           alarm_code: 2
-#           message: "ALERT! Water Leak Detected in the Basement!"
-
 # # # Carbon Monoxide Detected in the house
 # # ###############################################################################
 # #   - alias: CO Detected

packages/fun.yaml

@@ -1,36 +0,0 @@
-# # ##############################################################################
-# #   @author         :   Mahasri Kalavala
-# #   @date           :   04/15/2017
-# #   @package        :   Random Chuck Norris Facts
-# #   @description    :   Daily dose of Chuck Norris.
-# #                       It is intentionally set to query once a day.
-# #                       Know your limits, too much of Chuck Norris is not good!
-# #
-# #   These are facts, and not jokes. DO NOT JOKE ABOUT CHUCK NORRIS!
-# # ##############################################################################
-# homeassistant:
-#   customize:
-#     sensor.fact_of_the_day:
-#       hidden: true
-
-# sensor:
-#   - platform: rest
-#     name: fact_of_the_day
-#     resource: http://api.icndb.com/jokes/random?firstName=Chuck&lastName=Norris&limitTo=[nerdy]
-#     value_template: '{{ value_json.value.joke }}'
-#     scan_interval: 86400
-
-# automation:
-
-#   - alias: Chuck Norris Fact At Startup
-#     initial_state: true
-#     trigger:
-#       - platform: homeassistant
-#         event: start
-#     action:
-#       - delay:
-#           seconds: 15
-#       - service: persistent_notification.create
-#         data:
-#           title: 'Chuck Norris fact:'
-#           message: '{{ states('sensor.fact_of_the_day') }}'

packages/gearbest.yaml

@@ -1,34 +0,0 @@
-# sensor:
-#   - platform: gearbest
-#     currency: USD
-#     items:
-#       - url: https://www.gearbest.com/alarm-systems/pp_659226.html
-#         name: Xiaomi Aqara Human Body Sensor
-#       - url: https://www.gearbest.com/access-control/pp_626702.html
-#         name: Xiaomi Aqara Temperature Humidity Sensor
-#       - url: https://www.gearbest.com/living-appliances/pp_364494.html
-#         name: xiaomi cube
-
-# automation:
-#   - alias: Alert Low Price of Cube
-#     initial_state: true
-#     trigger:
-#       - platform: template
-#         value_template: '{{ states.sensor.xiaomi_cube.state | int < 10 }}'
-#       - platform: template
-#         value_template: '{{ states.sensor.xiaomi_aqara_human_body_sensor.state | int < 10 }}'
-#       - platform: template
-#         value_template: '{{ states.sensor.xiaomi_aqara_temperature_humidity_sensor.state | int < 10 }}'
-#     action:
-#       - service: script.notify_me
-#         data_template:
-#           message: >
-#            {% if states.sensor.xiaomi_aqara_human_body_sensor.state | int < 10 %}
-#              Xiaomi Aqara Motion Sensor is on sale, it is less than $10.... care to buy?
-#            {% endif %}
-#            {% if states.sensor.xiaomi_cube.state | int < 11 %}
-#              Xiaomi Cube is on sale, it is less than $11... buy one?
-#            {% endif %}
-#            {% if states.sensor.xiaomi_aqara_temperature_humidity_sensor.state | int < 7 %}
-#              Xiaomi Temp & Humidity Sensor is on sale for less than $7. Time to buy!
-#            {% endif %}

packages/homekit.yaml

@@ -1,25 +0,0 @@
-###############################################################################
-#                _                        _   _                 
-#     /\        | |                      | | (_)                
-#    /  \  _   _| |_ ___  _ __ ___   __ _| |_ _  ___  _ __  ___ 
-#   / /\ \| | | | __/ _ \| '_ ` _ \ / _` | __| |/ _ \| '_ \/ __|
-#  / ____ \ |_| | || (_) | | | | | | (_| | |_| | (_) | | | \__ \
-# /_/    \_\__,_|\__\___/|_| |_| |_|\__,_|\__|_|\___/|_| |_|___/
-#                                                                              
-###############################################################################
-# automation:
-
-#   - alias: 'Start HomeKit'
-#     trigger:
-#       - platform: event
-#         event_type: zwave.network_ready
-#     action:
-#       - service: homekit.start
-
-#   - alias: 'Start HomeKit on HA Restart'
-#     trigger:
-#       - platform: homeassistant
-#         event: start
-#     action:
-#       - delay: 00:05  # Waits 5 minutes
-#       - service: homekit.start

packages/ios.yaml

@@ -1,56 +0,0 @@
-# homeassistant:
-#   customize:
-#     group.family:
-#       order: 1
-#     group.ios:
-#       order: 98
-
-#     device_tracker.ipad:
-#       hidden: true
-#     device_tracker.suresh:
-#       hidden: true
-#     device_tracker.mallika:
-#       hidden: true
-#     device_tracker.srinika:
-#       hidden: true
-#     device_tracker.hasika:
-#       hidden: true
-
-# # Battery Levels
-#     sensor.suresh_battery_level:
-#       friendly_name: Suresh's Battery Level
-#       hidden: true
-#     sensor.mallika_battery_level:
-#       friendly_name: Mallika's Battery Level
-#       hidden: true
-#     sensor.srinika_battery_level:
-#       friendly_name: Srinika's Battery Level
-#       hidden: true
-#     sensor.hasika_battery_level:
-#       friendly_name: Hasika's Battery Level
-#       hidden: true
-#     sensor.ipad_battery_level:
-#       friendly_name: iPad's Battery State
-#       hidden: true      
-#     sensor.iphone__battery_level:
-#       friendly_name: iPhone
-#       hidden: true
-
-#     sensor.suresh_battery_state:
-#       friendly_name: Suresh's Battery State
-#       hidden: true
-#     sensor.mallika_battery_state:
-#       friendly_name: Mallika's Battery State
-#       hidden: true
-#     sensor.srinika_battery_state:
-#       friendly_name: Srinika's Battery State
-#       hidden: true
-#     sensor.hasika_battery_state:
-#       friendly_name: Hasika's Battery State
-#       hidden: true
-#     sensor.ipad_battery_state:
-#       friendly_name: iPad's Battery State
-#       hidden: true
-#     sensor.iphone__battery_state:
-#       friendly_name: iphone
-#       hidden: true

packages/lights.yaml

@@ -105,24 +105,6 @@ homeassistant:
     input_boolean.animate_upstairs_lights:
       icon: mdi:flash-outline
       friendly_name: Animate Master Bedroom Lights
-
-    # Set assumed_state to false to show up as switch instead of two lightning symbols
-    switch.rf_switch_one:
-      friendly_name: Basement Light
-      assumed_state: false
-    switch.rf_switch_two:
-      friendly_name: Switch Two
-      assumed_state: false
-    switch.rf_switch_three:
-      friendly_name: Switch Three
-      assumed_state: false
-    switch.rf_switch_four:
-      friendly_name: Front Room Light
-      assumed_state: false
-    switch.rf_switch_five:
-      friendly_name: TV Switch
-      assumed_state: false
-
 hue:
   bridges:
     - host: !secret philips_hue_ipaddress
@@ -151,43 +133,6 @@ tplink:
     - host: !secret tplink_kids_bed_accent_light
       #name: Kids Bed Accent Light
 
-switch:
-# RF Switches
-# - platform: mqtt
-#   name: RF Switch One
-#   command_topic: '/home/rfswitches/switch_one'
-#   payload_on: "on"
-#   payload_off: "off"
-#   retain: true
-
-# - platform: mqtt
-#   name: RF Switch Two
-#   command_topic: '/home/rfswitches/switch_two'
-#   payload_on: "on"
-#   payload_off: "off"
-#   retain: true
-
-# - platform: mqtt
-#   name: RF Switch Three
-#   command_topic: '/home/rfswitches/switch_three'
-#   payload_on: "on"
-#   payload_off: "off"
-#   retain: true
-
-# - platform: mqtt
-#   name: RF Switch Four
-#   command_topic: '/home/rfswitches/switch_four'
-#   payload_on: "on"
-#   payload_off: "off"
-#   retain: true
-
-# - platform: mqtt
-#   name: RF Switch Five
-#   command_topic: '/home/rfswitches/switch_five'
-#   payload_on: "on"
-#   payload_off: "off"
-#   retain: true
-
 wemo:
   discovery: false
   static:
@@ -235,21 +180,6 @@ script:
           brightness: 255
           rgb_color: [0, 255, 0]
 
-  # start_colorloop:
-  #   sequence:
-  #     - service: light.lifx_effect_colorloop
-  #       data:
-  #         entity_id: light.dinette
-  #         brightness: 255
-  #         period: 2
-  #         spread: 360
-  #         change: 35
-  # stop_colorloop:
-  #   sequence:
-  #     - service: light.lifx_effect_stop
-  #       data:
-  #         entity_id: light.dinette
-
 ###############################################################################
 #                _                        _   _
 #     /\        | |                      | | (_)

packages/motion_timers.yaml

@@ -97,6 +97,8 @@ automation:
         value_template: "{{ states('sun.sun') == 'below_horizon' }}"
       - service: homeassistant.turn_on
         entity_id: switch.zwave_smart_switch_switch
+      - service: switch.turn_on
+        entity_id: switch.front_room
 
   # Front Room:
   # Timer Elapsed - Turn OFF lights
@@ -112,8 +114,11 @@ automation:
       - condition: template
         value_template: "{{ states('input_boolean.working_in_office_room') == 'off' }}"
     action:
+      - service: switch.turn_off
+        entity_id: switch.front_room
       - service: homeassistant.turn_off
-        entity_id: switch.rf_switch_four
+        entity_id: switch.zwave_smart_switch_switch
+
   # Kitchen:
   # Motion Detected - Turn ON the light and extend timer
   ###############################################################################

packages/notify.yaml

@@ -137,12 +137,6 @@ script:
           {% else %}
             true
           {% endif %}
-      # - service: sonos.snapshot
-      #   data_template:
-      #     entity_id: media_player.living_room, media_player.upstairs
-      # - service: sonos.unjoin
-      #   data_template:
-      #     entity_id: media_player.living_room, media_player.upstairs
       - service: media_player.volume_set
         entity_id: media_player.living_room, media_player.upstairs
         data_template:
@@ -187,12 +181,6 @@ script:
             {% set msg = msg + " " + getEndGreeting() %}
             {% set msg = msg + " </speak>" %}
             {{ msg }}
-      # - delay: "{{ delay|default('00:00:00') }}"
-      # - wait_template: "{{ is_state('media_player.living_room', 'playing') }}"
-      #   timeout: "00:00:05"
-      # - service: sonos.restore
-      #   data_template:
-      #     entity_id: media_player.living_room, media_player.upstairs
 
   ###############################################################################
   # Greeting

packages/tts.yaml

@@ -13,19 +13,16 @@ input_boolean:
 input_number:
   tts_volume_level_morning:
     name: Morning TTS Volume
-    # initial: 0.3
     min: 0
     max: 1
     step: 0.1
   tts_volume_level_afternoon:
     name: Afternoon TTS Volume
-    # initial: 0.5
     min: 0
     max: 1
     step: 0.1
   tts_volume_level_evening:
     name: Evening TTS Volume
-    # initial: 0.3
     min: 0
     max: 1
     step: 0.1

packages/weather.yaml

@@ -116,21 +116,6 @@ weather:
   - platform: darksky
     api_key: !secret darksky_api_key
 
-# openuv:
-#   api_key: !secret openuv_apikey
-
-# iqvia:
-#   zip_code: !secret zip_code
-#   monitored_conditions:
-#     - allergy_average_forecasted
-#     - allergy_index_today
-#     - allergy_index_tomorrow
-#     - asthma_average_forecasted
-#     - asthma_index_today
-#     - asthma_index_tomorrow
-#     - disease_average_forecasted
-#     - disease_index_today
-
 sensor:
   - platform: darksky
     api_key: !secret darksky_api_key
@@ -344,12 +329,6 @@ automation:
             {%- elif curState == "sleet" %}
                input_boolean.sleet_alert
             {%- endif %}
-  # - alias: Update OpenUV every hour (24 of 50 calls per day)
-  #   trigger:
-  #     platform: time_pattern
-  #     minutes: "/60"
-  #   action:
-  #     service: openuv.update_data
 
 # Weather sensors - TBD, too lazy to create them
 #

packages/zwave_batteries.yaml

@@ -6,12 +6,11 @@
 ###############################################################################
 
 input_label:
-  aeotec_water_sensor:
   audio_detector:
   back_door_sensor:
   basement_door_sensor:
   downstairs_multi_sensor:
-  front_door_sensor:
+  zwave_front_door_sensor:
   front_room_multi_sensor:
   garage_door_sensor:
   guest_bedroom_multi_sensor:

packages/zwave_sensors.yaml

@@ -11,9 +11,6 @@
 homeassistant:
   customize:
     # ZWave Binary Sensors
-    binary_sensor.aeotec_water_sensor_sensor:
-      friendly_name: Aeotec Water Sensor
-      ## <<: *not_exposed
     binary_sensor.audio_detector_sensor:
       friendly_name: Audio Detector Sensor
       ## <<: *not_exposed
@@ -58,51 +55,6 @@ homeassistant:
       ## <<: *not_exposed
 
     # ZWave Sensors
-    sensor.aeotec_water_sensor_alarm_level:
-      friendly_name: Aeotec Water Sensor Alarm Level
-      # <<: *not_exposed
-    sensor.aeotec_water_sensor_alarm_level_2:
-      friendly_name: Aeotec Water Sensor Alarm Level
-      # <<: *not_exposed
-    sensor.aeotec_water_sensor_alarm_level_3:
-      friendly_name: Aeotec Water Sensor Alarm Level
-      # <<: *not_exposed
-    sensor.aeotec_water_sensor_alarm_type:
-      friendly_name: Aeotec Water Sensor Alarm Type
-      # <<: *not_exposed
-    sensor.aeotec_water_sensor_alarm_type_2:
-      friendly_name: Aeotec Water Sensor Alarm Type
-      # <<: *not_exposed
-    sensor.aeotec_water_sensor_alarm_type_3:
-      friendly_name: Aeotec Water Sensor Alarm Type
-      # <<: *not_exposed
-    sensor.aeotec_water_sensor_burglar:
-      friendly_name: Aeotec Water Sensor Burglar
-      # <<: *not_exposed
-    sensor.aeotec_water_sensor_flood:
-      friendly_name: Aeotec Water Sensor Flood
-      # <<: *not_exposed
-    sensor.aeotec_water_sensor_flood_2:
-      friendly_name: Aeotec Water Sensor Flood
-      # <<: *not_exposed
-    sensor.aeotec_water_sensor_flood_3:
-      friendly_name: Aeotec Water Sensor Flood
-      # <<: *not_exposed
-    sensor.aeotec_water_sensor_heat:
-      friendly_name: Aeotec Water Sensor Heat
-      # <<: *not_exposed
-    sensor.aeotec_water_sensor_sourcenodeid:
-      friendly_name: Aeotec Water Sensor SourceNodeId
-      # <<: *not_exposed
-    sensor.aeotec_water_sensor_sourcenodeid_2:
-      friendly_name: Aeotec Water Sensor SourceNodeId
-      # <<: *not_exposed
-    sensor.aeotec_water_sensor_sourcenodeid_3:
-      friendly_name: Aeotec Water Sensor SourceNodeId
-      # <<: *not_exposed
-    sensor.aeotec_water_sensor_temperature:
-      friendly_name: Aeotec Water Sensor Temperature
-      # <<: *not_exposed
     sensor.audio_detector_alarm_level:
       friendly_name: Audio Detector Alarm Level
       # <<: *not_exposed

zwcfg_0xd89c4f0c.xml

@@ -208,7 +208,7 @@
 			</CommandClass>
 			<CommandClass id="48" name="COMMAND_CLASS_SENSOR_BINARY" version="1" request_flags="4" innif="true">
 				<Instance index="1" />
-				<Value type="bool" genre="user" instance="1" index="0" label="Sensor" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="False" />
+				<Value type="bool" genre="user" instance="1" index="0" label="Sensor" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="True" />
 				<SensorMap index="0" type="46" />
 				<SensorMap index="0" type="62" />
 				<SensorMap index="0" type="193" />
@@ -217,8 +217,8 @@
 			<CommandClass id="49" name="COMMAND_CLASS_SENSOR_MULTILEVEL" version="5" innif="true">
 				<Instance index="1" />
 				<Value type="decimal" genre="user" instance="1" index="1" label="Temperature" units="F" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="64.0" />
-				<Value type="decimal" genre="user" instance="1" index="3" label="Luminance" units="lux" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="27" />
+				<Value type="decimal" genre="user" instance="1" index="3" label="Luminance" units="lux" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="0" />
-				<Value type="decimal" genre="user" instance="1" index="5" label="Relative Humidity" units="%" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="27" />
+				<Value type="decimal" genre="user" instance="1" index="5" label="Relative Humidity" units="%" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="29" />
 				<Value type="decimal" genre="user" instance="1" index="27" label="Ultraviolet" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="0" />
 			</CommandClass>
 			<CommandClass id="90" name="COMMAND_CLASS_DEVICE_RESET_LOCALLY" version="1" request_flags="4" after_mark="true" innif="true">
@@ -350,7 +350,7 @@
 			</CommandClass>
 			<CommandClass id="128" name="COMMAND_CLASS_BATTERY" version="1" request_flags="4" innif="true">
 				<Instance index="1" />
-				<Value type="byte" genre="user" instance="1" index="0" label="Battery Level" units="%" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="80" />
+				<Value type="byte" genre="user" instance="1" index="0" label="Battery Level" units="%" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="79" />
 			</CommandClass>
 			<CommandClass id="130" name="COMMAND_CLASS_HAIL" version="1" request_flags="4" after_mark="true" innif="true">
 				<Instance index="1" />
@@ -379,7 +379,7 @@
 			</CommandClass>
 		</CommandClasses>
 	</Node>
-	<Node id="4" name="Two Car Garage Door Tilt Sensor" location="" basic="4" generic="7" specific="1" roletype="6" devicetype="3072" nodetype="0" type="Notification Sensor" listening="false" frequentListening="false" beaming="true" routing="true" max_baud_rate="40000" version="4" query_stage="Complete">
+	<Node id="4" name="Two Car Garage Door Tilt Sensor" location="" basic="4" generic="7" specific="1" roletype="6" devicetype="3072" nodetype="0" type="Notification Sensor" listening="false" frequentListening="false" beaming="true" routing="true" max_baud_rate="40000" version="4" query_stage="CacheLoad">
 		<Manufacturer id="14a" name="Ecolink">
 			<Product type="4" id="3" name="Garage Door Tilt Sensor" />
 		</Manufacturer>
@@ -490,7 +490,7 @@
 			</CommandClass>
 		</CommandClasses>
 	</Node>
-	<Node id="5" name="Single Car Garage Door Tilt Sensor" location="" basic="4" generic="7" specific="1" roletype="6" devicetype="3072" nodetype="0" type="Notification Sensor" listening="false" frequentListening="false" beaming="true" routing="true" max_baud_rate="40000" version="4" query_stage="Complete">
+	<Node id="5" name="Single Car Garage Door Tilt Sensor" location="" basic="4" generic="7" specific="1" roletype="6" devicetype="3072" nodetype="0" type="Notification Sensor" listening="false" frequentListening="false" beaming="true" routing="true" max_baud_rate="40000" version="4" query_stage="CacheLoad">
 		<Manufacturer id="14a" name="Ecolink">
 			<Product type="4" id="3" name="Garage Door Tilt Sensor" />
 		</Manufacturer>
@@ -601,7 +601,7 @@
 			</CommandClass>
 		</CommandClasses>
 	</Node>
-	<Node id="6" name="Back Door Sensor" location="" basic="4" generic="7" specific="1" roletype="6" devicetype="3072" nodetype="0" type="Notification Sensor" listening="false" frequentListening="false" beaming="true" routing="true" max_baud_rate="40000" version="4" query_stage="Complete">
+	<Node id="6" name="Back Door Sensor" location="" basic="4" generic="7" specific="1" roletype="6" devicetype="3072" nodetype="0" type="Notification Sensor" listening="false" frequentListening="false" beaming="true" routing="true" max_baud_rate="40000" version="4" query_stage="CacheLoad">
 		<Manufacturer id="14a" name="Ecolink">
 			<Product type="4" id="2" name="Door Sensor" />
 		</Manufacturer>
@@ -710,7 +710,7 @@
 			</CommandClass>
 		</CommandClasses>
 	</Node>
-	<Node id="11" name="Front Room Multi Sensor" location="" basic="4" generic="33" specific="1" roletype="6" devicetype="3079" nodetype="0" type="Routing Multilevel Sensor" listening="false" frequentListening="false" beaming="true" routing="true" max_baud_rate="40000" version="4" query_stage="Complete">
+	<Node id="11" name="Front Room Multi Sensor" location="" basic="4" generic="33" specific="1" roletype="6" devicetype="3079" nodetype="0" type="Routing Multilevel Sensor" listening="false" frequentListening="false" beaming="true" routing="true" max_baud_rate="40000" version="4" query_stage="CacheLoad">
 		<Manufacturer id="86" name="Aeotec">
 			<Product type="102" id="64" name="ZW100 MultiSensor 6" />
 		</Manufacturer>
@@ -728,9 +728,9 @@
 			</CommandClass>
 			<CommandClass id="49" name="COMMAND_CLASS_SENSOR_MULTILEVEL" version="5" innif="true">
 				<Instance index="1" />
-				<Value type="decimal" genre="user" instance="1" index="1" label="Temperature" units="F" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="66.4" />
+				<Value type="decimal" genre="user" instance="1" index="1" label="Temperature" units="F" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="61.2" />
-				<Value type="decimal" genre="user" instance="1" index="3" label="Luminance" units="lux" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="0" />
+				<Value type="decimal" genre="user" instance="1" index="3" label="Luminance" units="lux" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="3" />
-				<Value type="decimal" genre="user" instance="1" index="5" label="Relative Humidity" units="%" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="35" />
+				<Value type="decimal" genre="user" instance="1" index="5" label="Relative Humidity" units="%" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="44" />
 				<Value type="decimal" genre="user" instance="1" index="27" label="Ultraviolet" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="0" />
 			</CommandClass>
 			<CommandClass id="90" name="COMMAND_CLASS_DEVICE_RESET_LOCALLY" version="1" request_flags="4" innif="true">
@@ -1006,11 +1006,11 @@
 			</CommandClass>
 			<CommandClass id="50" name="COMMAND_CLASS_METER" version="3" request_flags="2" innif="true">
 				<Instance index="1" />
-				<Value type="decimal" genre="user" instance="1" index="0" label="Energy" units="kWh" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="59.927" />
+				<Value type="decimal" genre="user" instance="1" index="0" label="Energy" units="kWh" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="60.213" />
-				<Value type="decimal" genre="user" instance="1" index="1" label="Previous Reading" units="kWh" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="59.927" />
+				<Value type="decimal" genre="user" instance="1" index="1" label="Previous Reading" units="kWh" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="60.213" />
-				<Value type="int" genre="user" instance="1" index="2" label="Interval" units="seconds" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="-2147483648" max="2147483647" value="9506" />
+				<Value type="int" genre="user" instance="1" index="2" label="Interval" units="seconds" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="-2147483648" max="2147483647" value="758" />
 				<Value type="decimal" genre="user" instance="1" index="8" label="Power" units="W" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="0.000" />
-				<Value type="decimal" genre="user" instance="1" index="16" label="Voltage" units="V" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="122.257" />
+				<Value type="decimal" genre="user" instance="1" index="16" label="Voltage" units="V" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="121.429" />
 				<Value type="decimal" genre="user" instance="1" index="20" label="Current" units="A" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="0.000" />
 				<Value type="bool" genre="user" instance="1" index="32" label="Exporting" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="False" />
 				<Value type="button" genre="system" instance="1" index="33" label="Reset" units="" read_only="false" write_only="true" verify_changes="false" poll_intensity="0" min="0" max="0" />
@@ -1181,7 +1181,7 @@
 			</CommandClass>
 			<CommandClass id="129" name="COMMAND_CLASS_CLOCK" version="1" request_flags="4" innif="true">
 				<Instance index="1" />
-				<Value type="list" genre="user" instance="1" index="0" label="Day" units="" read_only="false" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" vindex="3" size="1">
+				<Value type="list" genre="user" instance="1" index="0" label="Day" units="" read_only="false" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" vindex="6" size="1">
 					<Item label="Monday" value="1" />
 					<Item label="Tuesday" value="2" />
 					<Item label="Wednesday" value="3" />
@@ -1190,8 +1190,8 @@
 					<Item label="Saturday" value="6" />
 					<Item label="Sunday" value="7" />
 				</Value>
-				<Value type="byte" genre="user" instance="1" index="1" label="Hour" units="" read_only="false" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="6" />
+				<Value type="byte" genre="user" instance="1" index="1" label="Hour" units="" read_only="false" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="5" />
-				<Value type="byte" genre="user" instance="1" index="2" label="Minute" units="" read_only="false" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="2" />
+				<Value type="byte" genre="user" instance="1" index="2" label="Minute" units="" read_only="false" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="10" />
 			</CommandClass>
 			<CommandClass id="130" name="COMMAND_CLASS_HAIL" version="1" request_flags="4" after_mark="true" innif="true">
 				<Instance index="1" />
@@ -1213,7 +1213,7 @@
 			</CommandClass>
 		</CommandClasses>
 	</Node>
-	<Node id="16" name="Kitchen Motion Sensor" location="" basic="4" generic="7" specific="1" roletype="6" devicetype="3072" nodetype="0" type="Notification Sensor" listening="false" frequentListening="false" beaming="true" routing="true" max_baud_rate="40000" version="4" query_stage="Session">
+	<Node id="16" name="Kitchen Motion Sensor" location="" basic="4" generic="7" specific="1" roletype="6" devicetype="3072" nodetype="0" type="Notification Sensor" listening="false" frequentListening="false" beaming="true" routing="true" max_baud_rate="40000" version="4" query_stage="CacheLoad">
 		<Manufacturer id="14a" name="Ecolink">
 			<Product type="4" id="1" name="Motion Detector" />
 		</Manufacturer>
@@ -1328,7 +1328,7 @@
 			</CommandClass>
 		</CommandClasses>
 	</Node>
-	<Node id="17" name="Stairs Motion Sensor" location="" basic="4" generic="7" specific="1" roletype="6" devicetype="3072" nodetype="0" type="Notification Sensor" listening="false" frequentListening="false" beaming="true" routing="true" max_baud_rate="40000" version="4" query_stage="Complete">
+	<Node id="17" name="Stairs Motion Sensor" location="" basic="4" generic="7" specific="1" roletype="6" devicetype="3072" nodetype="0" type="Notification Sensor" listening="false" frequentListening="false" beaming="true" routing="true" max_baud_rate="40000" version="4" query_stage="CacheLoad">
 		<Manufacturer id="14a" name="Ecolink">
 			<Product type="4" id="1" name="Motion Detector" />
 		</Manufacturer>
@@ -1703,7 +1703,7 @@
 			</CommandClass>
 		</CommandClasses>
 	</Node>
-	<Node id="25" name="Basement Door Sensor" location="" basic="4" generic="7" specific="1" roletype="6" devicetype="3072" nodetype="0" type="Notification Sensor" listening="false" frequentListening="false" beaming="true" routing="true" max_baud_rate="40000" version="4" query_stage="Complete">
+	<Node id="25" name="Basement Door Sensor" location="" basic="4" generic="7" specific="1" roletype="6" devicetype="3072" nodetype="0" type="Notification Sensor" listening="false" frequentListening="false" beaming="true" routing="true" max_baud_rate="40000" version="4" query_stage="CacheLoad">
 		<Manufacturer id="14a" name="Ecolink">
 			<Product type="4" id="2" name="Unknown: type=0004, id=0002" />
 		</Manufacturer>
@@ -2023,7 +2023,7 @@
 			</CommandClass>
 		</CommandClasses>
 	</Node>
-	<Node id="28" name="Audio Detector" location="" basic="4" generic="7" specific="1" roletype="6" devicetype="3073" nodetype="0" type="Notification Sensor" listening="false" frequentListening="false" beaming="true" routing="true" max_baud_rate="40000" version="4" query_stage="Complete">
+	<Node id="28" name="Audio Detector" location="" basic="4" generic="7" specific="1" roletype="6" devicetype="3073" nodetype="0" type="Notification Sensor" listening="false" frequentListening="false" beaming="true" routing="true" max_baud_rate="40000" version="4" query_stage="CacheLoad">
 		<Manufacturer id="14a" name="Ecolink">
 			<Product type="5" id="f" name="FireFighter" />
 		</Manufacturer>
@@ -2132,7 +2132,7 @@
 			</CommandClass>
 		</CommandClasses>
 	</Node>
-	<Node id="29" name="Garage Door Sensor" location="" basic="4" generic="7" specific="1" roletype="6" devicetype="3072" nodetype="0" type="Notification Sensor" listening="false" frequentListening="false" beaming="true" routing="true" max_baud_rate="40000" version="4" query_stage="Complete">
+	<Node id="29" name="Garage Door Sensor" location="" basic="4" generic="7" specific="1" roletype="6" devicetype="3072" nodetype="0" type="Notification Sensor" listening="false" frequentListening="false" beaming="true" routing="true" max_baud_rate="40000" version="4" query_stage="CacheLoad">
 		<Manufacturer id="14a" name="Ecolink">
 			<Product type="4" id="2" name="Unknown: type=0004, id=0002" />
 		</Manufacturer>
@@ -2238,150 +2238,7 @@
 			</CommandClass>
 		</CommandClasses>
 	</Node>
-	<Node id="31" name="Aeotec Water Sensor" location="" basic="4" generic="7" specific="1" roletype="6" devicetype="3079" nodetype="0" type="Notification Sensor" listening="false" frequentListening="false" beaming="true" routing="true" max_baud_rate="40000" version="4" query_stage="CacheLoad">
+	<Node id="34" name="TV Multi Sensor" location="" basic="4" generic="33" specific="1" roletype="6" devicetype="3079" nodetype="0" type="Routing Multilevel Sensor" listening="false" frequentListening="false" beaming="true" routing="true" max_baud_rate="40000" version="4" query_stage="CacheLoad">
-		<Manufacturer id="86" name="Aeotec">
-			<Product type="102" id="7a" name="Unknown: type=0102, id=007a" />
-		</Manufacturer>
-		<CommandClasses>
-			<CommandClass id="32" name="COMMAND_CLASS_BASIC" version="1" request_flags="5">
-				<Instance index="1" />
-				<Value type="byte" genre="basic" instance="1" index="0" label="Basic" units="" read_only="false" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="0" />
-			</CommandClass>
-			<CommandClass id="48" name="COMMAND_CLASS_SENSOR_BINARY" version="1">
-				<Instance index="1" />
-				<Value type="bool" genre="user" instance="1" index="0" label="Sensor" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="False" />
-			</CommandClass>
-			<CommandClass id="49" name="COMMAND_CLASS_SENSOR_MULTILEVEL" version="5" request_flags="1" innif="true">
-				<Instance index="1" />
-				<Value type="decimal" genre="user" instance="1" index="1" label="Temperature" units="F" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="62.6" />
-			</CommandClass>
-			<CommandClass id="90" name="COMMAND_CLASS_DEVICE_RESET_LOCALLY" version="1" request_flags="5" innif="true">
-				<Instance index="1" />
-			</CommandClass>
-			<CommandClass id="94" name="COMMAND_CLASS_ZWAVEPLUS_INFO" version="1" request_flags="5" innif="true">
-				<Instance index="1" />
-				<Instance index="2" endpoint="1" />
-				<Instance index="3" endpoint="2" />
-				<Value type="byte" genre="system" instance="1" index="0" label="ZWave+ Version" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="1" />
-				<Value type="short" genre="system" instance="1" index="1" label="InstallerIcon" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="-32768" max="32767" value="3079" />
-				<Value type="short" genre="system" instance="1" index="2" label="UserIcon" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="-32768" max="32767" value="3079" />
-				<Value type="byte" genre="system" instance="2" index="0" label="ZWave+ Version" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="0" />
-				<Value type="short" genre="system" instance="2" index="1" label="InstallerIcon" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="-32768" max="32767" value="0" />
-				<Value type="short" genre="system" instance="2" index="2" label="UserIcon" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="-32768" max="32767" value="0" />
-				<Value type="byte" genre="system" instance="3" index="0" label="ZWave+ Version" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="0" />
-				<Value type="short" genre="system" instance="3" index="1" label="InstallerIcon" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="-32768" max="32767" value="0" />
-				<Value type="short" genre="system" instance="3" index="2" label="UserIcon" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="-32768" max="32767" value="0" />
-			</CommandClass>
-			<CommandClass id="96" name="COMMAND_CLASS_MULTI_INSTANCE/CHANNEL" version="4" request_flags="1" innif="true">
-				<Instance index="1" />
-			</CommandClass>
-			<CommandClass id="112" name="COMMAND_CLASS_CONFIGURATION" version="1" request_flags="5" innif="true">
-				<Instance index="1" />
-			</CommandClass>
-			<CommandClass id="113" name="COMMAND_CLASS_ALARM" version="7" request_flags="1" innif="true">
-				<Instance index="1" />
-				<Instance index="2" endpoint="1" />
-				<Instance index="3" endpoint="2" />
-				<Value type="byte" genre="user" instance="1" index="0" label="Alarm Type" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="0" />
-				<Value type="byte" genre="user" instance="1" index="1" label="Alarm Level" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="0" />
-				<Value type="byte" genre="user" instance="1" index="2" label="SourceNodeId" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="0" />
-				<Value type="byte" genre="user" instance="1" index="7" label="Heat" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="254" />
-				<Value type="byte" genre="user" instance="1" index="8" label="Flood" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="254" />
-				<Value type="byte" genre="user" instance="1" index="10" label="Burglar" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="254" />
-				<Value type="byte" genre="user" instance="2" index="0" label="Alarm Type" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="0" />
-				<Value type="byte" genre="user" instance="2" index="1" label="Alarm Level" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="0" />
-				<Value type="byte" genre="user" instance="2" index="2" label="SourceNodeId" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="0" />
-				<Value type="byte" genre="user" instance="2" index="8" label="Flood" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="254" />
-				<Value type="byte" genre="user" instance="3" index="0" label="Alarm Type" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="0" />
-				<Value type="byte" genre="user" instance="3" index="1" label="Alarm Level" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="0" />
-				<Value type="byte" genre="user" instance="3" index="2" label="SourceNodeId" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="0" />
-				<Value type="byte" genre="user" instance="3" index="8" label="Flood" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="254" />
-			</CommandClass>
-			<CommandClass id="114" name="COMMAND_CLASS_MANUFACTURER_SPECIFIC" version="1" request_flags="5" innif="true">
-				<Instance index="1" />
-			</CommandClass>
-			<CommandClass id="115" name="COMMAND_CLASS_POWERLEVEL" version="1" request_flags="5" innif="true">
-				<Instance index="1" />
-				<Value type="list" genre="system" instance="1" index="0" label="Powerlevel" units="dB" read_only="false" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" vindex="0" size="1">
-					<Item label="Normal" value="0" />
-					<Item label="-1dB" value="1" />
-					<Item label="-2dB" value="2" />
-					<Item label="-3dB" value="3" />
-					<Item label="-4dB" value="4" />
-					<Item label="-5dB" value="5" />
-					<Item label="-6dB" value="6" />
-					<Item label="-7dB" value="7" />
-					<Item label="-8dB" value="8" />
-					<Item label="-9dB" value="9" />
-				</Value>
-				<Value type="byte" genre="system" instance="1" index="1" label="Timeout" units="seconds" read_only="false" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="0" />
-				<Value type="button" genre="system" instance="1" index="2" label="Set Powerlevel" units="" read_only="false" write_only="true" verify_changes="false" poll_intensity="0" min="0" max="0" />
-				<Value type="byte" genre="system" instance="1" index="3" label="Test Node" units="" read_only="false" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="0" />
-				<Value type="list" genre="system" instance="1" index="4" label="Test Powerlevel" units="dB" read_only="false" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" vindex="0" size="1">
-					<Item label="Normal" value="0" />
-					<Item label="-1dB" value="1" />
-					<Item label="-2dB" value="2" />
-					<Item label="-3dB" value="3" />
-					<Item label="-4dB" value="4" />
-					<Item label="-5dB" value="5" />
-					<Item label="-6dB" value="6" />
-					<Item label="-7dB" value="7" />
-					<Item label="-8dB" value="8" />
-					<Item label="-9dB" value="9" />
-				</Value>
-				<Value type="short" genre="system" instance="1" index="5" label="Frame Count" units="" read_only="false" write_only="false" verify_changes="false" poll_intensity="0" min="-32768" max="32767" value="0" />
-				<Value type="button" genre="system" instance="1" index="6" label="Test" units="" read_only="false" write_only="true" verify_changes="false" poll_intensity="0" min="0" max="0" />
-				<Value type="button" genre="system" instance="1" index="7" label="Report" units="" read_only="false" write_only="true" verify_changes="false" poll_intensity="0" min="0" max="0" />
-				<Value type="list" genre="system" instance="1" index="8" label="Test Status" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" vindex="0" size="1">
-					<Item label="Failed" value="0" />
-					<Item label="Success" value="1" />
-					<Item label="In Progress" value="2" />
-				</Value>
-				<Value type="short" genre="system" instance="1" index="9" label="Acked Frames" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="-32768" max="32767" value="0" />
-			</CommandClass>
-			<CommandClass id="128" name="COMMAND_CLASS_BATTERY" version="1" request_flags="5" innif="true">
-				<Instance index="1" />
-				<Value type="byte" genre="user" instance="1" index="0" label="Battery Level" units="%" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="0" />
-			</CommandClass>
-			<CommandClass id="132" name="COMMAND_CLASS_WAKE_UP" version="2" request_flags="1" innif="true">
-				<Instance index="1" />
-				<Value type="int" genre="system" instance="1" index="0" label="Wake-up Interval" units="Seconds" read_only="false" write_only="false" verify_changes="false" poll_intensity="0" min="-2147483648" max="2147483647" value="3600" />
-				<Value type="int" genre="system" instance="1" index="1" label="Minimum Wake-up Interval" units="Seconds" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="-2147483648" max="2147483647" value="240" />
-				<Value type="int" genre="system" instance="1" index="2" label="Maximum Wake-up Interval" units="Seconds" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="-2147483648" max="2147483647" value="3600" />
-				<Value type="int" genre="system" instance="1" index="3" label="Default Wake-up Interval" units="Seconds" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="-2147483648" max="2147483647" value="3600" />
-				<Value type="int" genre="system" instance="1" index="4" label="Wake-up Interval Step" units="Seconds" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="-2147483648" max="2147483647" value="240" />
-			</CommandClass>
-			<CommandClass id="133" name="COMMAND_CLASS_ASSOCIATION" version="1" request_flags="5" innif="true">
-				<Instance index="1" />
-				<Associations num_groups="4">
-					<Group index="1" max_associations="5" label="Group 1" auto="true" multiInstance="true">
-						<Node id="1" />
-					</Group>
-					<Group index="2" max_associations="5" label="Group 2" auto="false" multiInstance="true" />
-					<Group index="3" max_associations="5" label="Group 3" auto="false" multiInstance="true" />
-					<Group index="4" max_associations="5" label="Group 4" auto="false" multiInstance="true" />
-				</Associations>
-			</CommandClass>
-			<CommandClass id="134" name="COMMAND_CLASS_VERSION" version="1" request_flags="5" innif="true">
-				<Instance index="1" />
-				<Value type="string" genre="system" instance="1" index="0" label="Library Version" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="3" />
-				<Value type="string" genre="system" instance="1" index="1" label="Protocol Version" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="4.38" />
-				<Value type="string" genre="system" instance="1" index="2" label="Application Version" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="1.03" />
-			</CommandClass>
-			<CommandClass id="142" name="COMMAND_CLASS_MULTI_CHANNEL_ASSOCIATION" version="1" request_flags="5" innif="true">
-				<Instance index="1" />
-				<Associations num_groups="4">
-					<Group index="1" max_associations="5" label="Group 1" auto="true" multiInstance="true">
-						<Node id="1" />
-					</Group>
-					<Group index="2" max_associations="5" label="Group 2" auto="false" multiInstance="true" />
-					<Group index="3" max_associations="5" label="Group 3" auto="false" multiInstance="true" />
-					<Group index="4" max_associations="5" label="Group 4" auto="false" multiInstance="true" />
-				</Associations>
-			</CommandClass>
-		</CommandClasses>
-	</Node>
-	<Node id="34" name="TV Multi Sensor" location="" basic="4" generic="33" specific="1" roletype="6" devicetype="3079" nodetype="0" type="Routing Multilevel Sensor" listening="false" frequentListening="false" beaming="true" routing="true" max_baud_rate="40000" version="4" query_stage="Complete">
 		<Manufacturer id="86" name="Aeotec">
 			<Product type="102" id="64" name="ZW100 MultiSensor 6" />
 		</Manufacturer>
@@ -2405,9 +2262,9 @@
 			</CommandClass>
 			<CommandClass id="49" name="COMMAND_CLASS_SENSOR_MULTILEVEL" version="5" innif="true">
 				<Instance index="1" />
-				<Value type="decimal" genre="user" instance="1" index="1" label="Temperature" units="F" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="70.5" />
+				<Value type="decimal" genre="user" instance="1" index="1" label="Temperature" units="F" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="70.7" />
 				<Value type="decimal" genre="user" instance="1" index="3" label="Luminance" units="lux" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="0" />
-				<Value type="decimal" genre="user" instance="1" index="5" label="Relative Humidity" units="%" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="27" />
+				<Value type="decimal" genre="user" instance="1" index="5" label="Relative Humidity" units="%" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="33" />
 				<Value type="decimal" genre="user" instance="1" index="27" label="Ultraviolet" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="0" />
 				<Value type="decimal" genre="user" instance="1" index="37" label="Radon Concentration" units="bq/m3" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="60" />
 			</CommandClass>
@@ -2653,20 +2510,7 @@
 			</CommandClass>
 		</CommandClasses>
 	</Node>
-	<Node id="36" name="" location="" basic="4" generic="33" specific="1" type="Routing Multilevel Sensor" listening="true" frequentListening="false" beaming="true" routing="true" max_baud_rate="40000" version="4" query_stage="CacheLoad">
+	<Node id="38" name="" location="" basic="4" generic="7" specific="1" type="Notification Sensor" listening="false" frequentListening="false" beaming="true" routing="true" max_baud_rate="40000" version="4" query_stage="Session">
-		<Manufacturer id="0" name="">
-			<Product type="0" id="0" name="" />
-		</Manufacturer>
-		<CommandClasses>
-			<CommandClass id="32" name="COMMAND_CLASS_BASIC" version="1" after_mark="true" mapping="49">
-				<Instance index="1" />
-			</CommandClass>
-			<CommandClass id="49" name="COMMAND_CLASS_SENSOR_MULTILEVEL" version="1">
-				<Instance index="1" />
-			</CommandClass>
-		</CommandClasses>
-	</Node>
-	<Node id="38" name="" location="" basic="4" generic="7" specific="1" type="Notification Sensor" listening="false" frequentListening="false" beaming="true" routing="true" max_baud_rate="40000" version="4" query_stage="CacheLoad">
 		<Manufacturer id="0" name="">
 			<Product type="0" id="0" name="" />
 		</Manufacturer>
@@ -2730,9 +2574,10 @@
 			</CommandClass>
 			<CommandClass id="48" name="COMMAND_CLASS_SENSOR_BINARY" version="1" request_flags="4" innif="true">
 				<Instance index="1" />
-				<Value type="bool" genre="user" instance="1" index="0" label="Sensor" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="True" />
+				<Value type="bool" genre="user" instance="1" index="0" label="Sensor" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="0" value="False" />
 				<SensorMap index="0" type="23" />
 				<SensorMap index="0" type="232" />
+				<SensorMap index="0" type="248" />
 			</CommandClass>
 			<CommandClass id="90" name="COMMAND_CLASS_DEVICE_RESET_LOCALLY" version="1" request_flags="4" after_mark="true" innif="true">
 				<Instance index="1" />
@@ -2781,7 +2626,7 @@
 				<Value type="byte" genre="user" instance="1" index="0" label="Alarm Type" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="0" />
 				<Value type="byte" genre="user" instance="1" index="1" label="Alarm Level" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="0" />
 				<Value type="byte" genre="user" instance="1" index="2" label="SourceNodeId" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="0" />
-				<Value type="byte" genre="user" instance="1" index="9" label="Access Control" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="22" />
+				<Value type="byte" genre="user" instance="1" index="9" label="Access Control" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="254" />
 				<Value type="byte" genre="user" instance="1" index="10" label="Burglar" units="" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="254" />
 			</CommandClass>
 			<CommandClass id="114" name="COMMAND_CLASS_MANUFACTURER_SPECIFIC" version="1" request_flags="4" innif="true">
@@ -2828,7 +2673,7 @@
 			</CommandClass>
 			<CommandClass id="128" name="COMMAND_CLASS_BATTERY" version="1" request_flags="4" innif="true">
 				<Instance index="1" />
-				<Value type="byte" genre="user" instance="1" index="0" label="Battery Level" units="%" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="0" />
+				<Value type="byte" genre="user" instance="1" index="0" label="Battery Level" units="%" read_only="true" write_only="false" verify_changes="false" poll_intensity="0" min="0" max="255" value="100" />
 			</CommandClass>
 			<CommandClass id="132" name="COMMAND_CLASS_WAKE_UP" version="2" request_flags="2" innif="true">
 				<Instance index="1" />