From 1fd1260f4f9ee5acef655a8e3e3cd3223edc4827 Mon Sep 17 00:00:00 2001
From: Jeffrey Stone <thejeffreystone@gmail.com>
Date: Sat, 9 Nov 2019 19:11:52 -0500
Subject: [PATCH] Updating door and sensor batteries after zwave2mqtt

---
 config/binary_sensors/doors.yaml | 18 ++++++-------
 config/sensors/batteries.yaml    | 44 +++++++++++++++++++++++++++-----
 2 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/config/binary_sensors/doors.yaml b/config/binary_sensors/doors.yaml
index 238bb6a..fdbdd0f 100755
--- a/config/binary_sensors/doors.yaml
+++ b/config/binary_sensors/doors.yaml
@@ -1,30 +1,30 @@
 - platform: mqtt
   name: "Back Door"
-  state_topic: "zwave2mqtt/nodeID_28/48/1/0"
-  payload_on: "open"
-  payload_off: "closed"
+  state_topic: "zwave2mqtt/back_door/48/1/0"
+  payload_on: "true"
+  payload_off: "false"
   device_class: door
 - platform: mqtt
   name: "Garage Door"
-  state_topic: "zwave2mqtt/nodeID_16/48/1/0"
+  state_topic: "zwave2mqtt/garage_door/48/1/0"
   payload_on: "true"
   payload_off: "false"
   device_class: garage_door
 - platform: mqtt
   name: "Front Door"
-  state_topic: "zwave2mqtt/nodeID_27/48/1/0"
-  payload_on: "open"
-  payload_off: "closed"
+  state_topic: "zwave2mqtt/front_door/48/1/0"
+  payload_on: "true"
+  payload_off: "false"
   device_class: door
 - platform: mqtt
   name: "Laundry Room Door"
-  state_topic: "zwave2mqtt/nodeID_26/48/1/0"
+  state_topic: "zwave2mqtt/laundry_room/48/1/0"
   payload_on: "true"
   payload_off: "false"
   device_class: door
 - platform: mqtt
   name: "Attic Door" # Dome Door Sensor
-  state_topic: "zwave2mqtt/nodeID_18/48/1/0"
+  state_topic: "zwave2mqtt/attic_door/48/1/0"
   payload_on: "true"
   payload_off: "false"
   device_class: door
diff --git a/config/sensors/batteries.yaml b/config/sensors/batteries.yaml
index d5cea1b..edadeab 100755
--- a/config/sensors/batteries.yaml
+++ b/config/sensors/batteries.yaml
@@ -20,31 +20,63 @@
       icon_template: '{%- if is_state("sensor.kat_iphone_batt", "unknown") %}mdi:battery-unknown{%- elif is_state_attr("device_tracker.katherinestonesiphone", "battery_status", "Charging") %}mdi:battery-charging{%- elif  states.device_tracker.katherinestonesiphone.attributes.battery <= 5 %}mdi:battery-outline{%- elif states.device_tracker.katherinestonesiphone.attributes.battery >= 95 %}mdi:battery{% else %}mdi:battery-{{(states.device_tracker.katherinestonesiphone.attributes.battery|float / 10)|round*10}}{%- endif %}'
 - platform: mqtt
   name: "Front Door Battery"
-  state_topic: "zwave2mqtt/nodeID_27/128/1/0"
+  state_topic: "zwave2mqtt/front_door/128/1/0"
+  unit_of_measurement: "%"
+  device_class: battery
+  value_template: "{{ value }}"
+  json_attributes_topic: "zwave2mqtt/front_door/128/1/0"
 - platform: mqtt
   name: "Laundry Door Battery"
-  state_topic: "zwave2mqtt/nodeID_26/128/1/0"
+  state_topic: "zwave2mqtt/laundry_room/128/1/0"
+  unit_of_measurement: "%"
+  device_class: battery
+  value_template: "{{ value }}"
+  json_attributes_topic: "zwave2mqtt/laundry_room/128/1/0"
 - platform: mqtt
   name: "Kitchen Smoke Battery"
   state_topic: "zwave2mqtt/nodeID_19/128/1/0"
+  unit_of_measurement: "%"
+  device_class: battery
+  value_template: "{{ value }}"
+  json_attributes_topic: "zwave2mqtt/nodeID_19/128/1/0"
 - platform: mqtt
   name: "Attic Door Battery"
-  state_topic: "zwave2mqtt/nodeID_18/128/1/0"
+  state_topic: "zwave2mqtt/attic_door/128/1/0"
+  unit_of_measurement: "%"
+  device_class: battery
+  value_template: "{{ value }}"
+  json_attributes_topic: "zwave2mqtt/attic_door/128/1/0"
 - platform: mqtt
   name: "Washer Door Battery"
   state_topic: "zwave2mqtt/washer_door/128/1/0"
+  unit_of_measurement: "%"
+  device_class: battery
+  value_template: "{{ value }}"
+  json_attributes_topic: "zwave2mqtt/washer_door/128/1/0"
 - platform: mqtt
   name: "Back Door Battery"
-  state_topic: "zwave2mqtt/nodeID_28/128/1/0"
+  state_topic: "zwave2mqtt/back_door/128/1/0"
+  unit_of_measurement: "%"
+  device_class: battery
+  value_template: "{{ value }}"
+  json_attributes_topic: "zwave2mqtt/back_door/128/1/0"
 - platform: mqtt
   name: "Side Door Battery"
   state_topic: "zwave2mqtt/side_door/128/1/0"
+  unit_of_measurement: "%"
+  device_class: battery
+  value_template: "{{ value }}"
+  json_attributes_topic: "zwave2mqtt/side_door/128/1/0"
 - platform: mqtt
   name: "Garage Door Battery"
-  state_topic: "zwave2mqtt/nodeID_16/128/1/0"
+  state_topic: "zwave2mqtt/garage_door/128/1/0"
+  unit_of_measurement: "%"
+  device_class: battery
+  value_template: "{{ value }}"
+  json_attributes_topic: "zwave2mqtt/garage_door/128/1/0"
 - platform: mqtt 
   name: "Garage Motion Battery"
   state_topic: "zwave2mqtt/garage_motion/128/1/0"
 - platform: mqtt
   name: "Dome Alarm"
-  state_topic: "zwave2mqtt/nodeID_21/128/1/0"
\ No newline at end of file
+  state_topic: "zwave2mqtt/dome_alarm/128/1/0"
\ No newline at end of file