From 328fe4cfac44862553a42c193bf08789dc2cd446 Mon Sep 17 00:00:00 2001
From: Jeffrey Stone <thejeffreystone@gmail.com>
Date: Mon, 18 Jan 2021 20:51:37 -0500
Subject: [PATCH] Migrating from Zwave2mqtt to OpenZwave due to issue with
 hardware....

---
 config/binary_sensors/doors.yaml  |  84 +++++-----
 config/binary_sensors/motion.yaml |  24 +--
 config/configuration.yaml         |   4 +-
 config/lights.yaml                |  76 ++++-----
 config/switches.yaml              | 270 +++++++++++++++---------------
 5 files changed, 229 insertions(+), 229 deletions(-)

diff --git a/config/binary_sensors/doors.yaml b/config/binary_sensors/doors.yaml
index d0befd2..afce9aa 100755
--- a/config/binary_sensors/doors.yaml
+++ b/config/binary_sensors/doors.yaml
@@ -1,42 +1,42 @@
-- platform: mqtt
-  name: "Back Door"
-  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/garage_door/48/1/0"
-  payload_on: "true"
-  payload_off: "false"
-  device_class: garage_door
-- platform: mqtt
-  name: "Front Door"
-  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/laundry_door/48/1/0"
-  payload_on: "true"
-  payload_off: "false"
-  device_class: door
-- platform: mqtt
-  name: "Attic Door" # Dome Door Sensor
-  state_topic: "zwave2mqtt/attic_door/48/1/0"
-  payload_on: "true"
-  payload_off: "false"
-  device_class: door
-- platform: mqtt
-  name: "Side Door" # Dome Door Sensor
-  state_topic: "zwave2mqtt/side_door/48/1/0"
-  payload_on: "true"
-  payload_off: "false"
-  device_class: door
-- platform: mqtt
-  name: "Washer Door"
-  state_topic: "zwave2mqtt/washer_door/48/1/0"
-  payload_on: "true"
-  payload_off: "false"
-  device_class: door
\ No newline at end of file
+# - platform: mqtt
+#   name: "Back Door"
+#   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/garage_door/48/1/0"
+#   payload_on: "true"
+#   payload_off: "false"
+#   device_class: garage_door
+# - platform: mqtt
+#   name: "Front Door"
+#   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/laundry_door/48/1/0"
+#   payload_on: "true"
+#   payload_off: "false"
+#   device_class: door
+# - platform: mqtt
+#   name: "Attic Door" # Dome Door Sensor
+#   state_topic: "zwave2mqtt/attic_door/48/1/0"
+#   payload_on: "true"
+#   payload_off: "false"
+#   device_class: door
+# - platform: mqtt
+#   name: "Side Door" # Dome Door Sensor
+#   state_topic: "zwave2mqtt/side_door/48/1/0"
+#   payload_on: "true"
+#   payload_off: "false"
+#   device_class: door
+# - platform: mqtt
+#   name: "Washer Door"
+#   state_topic: "zwave2mqtt/washer_door/48/1/0"
+#   payload_on: "true"
+#   payload_off: "false"
+#   device_class: door
\ No newline at end of file
diff --git a/config/binary_sensors/motion.yaml b/config/binary_sensors/motion.yaml
index 6da8601..ce1e702 100755
--- a/config/binary_sensors/motion.yaml
+++ b/config/binary_sensors/motion.yaml
@@ -1,16 +1,16 @@
-- platform: mqtt
-  name: "Garage Motion" # Dome Motion Sensor
-  state_topic: "zwave2mqtt/garage_motion/48/1/0"
-  payload_on: "true"
-  payload_off: "false"
-  device_class: motion
+# - platform: mqtt
+#   name: "Garage Motion" # Dome Motion Sensor
+#   state_topic: "zwave2mqtt/garage_motion/48/1/0"
+#   payload_on: "true"
+#   payload_off: "false"
+#   device_class: motion
 
-- platform: mqtt
-  name: "Kitchen Motion" # Kaipule Motion Sensor
-  state_topic: "zwave2mqtt/kitchen_motion/48/1/0"
-  payload_on: "true"
-  payload_off: "false"
-  device_class: motion
+# - platform: mqtt
+#   name: "Kitchen Motion" # Kaipule Motion Sensor
+#   state_topic: "zwave2mqtt/kitchen_motion/48/1/0"
+#   payload_on: "true"
+#   payload_off: "false"
+#   device_class: motion
 
 # - platform: command_line 
 #   name: vlc player
diff --git a/config/configuration.yaml b/config/configuration.yaml
index 2bcd608..88f2854 100644
--- a/config/configuration.yaml
+++ b/config/configuration.yaml
@@ -283,8 +283,8 @@ alert: !include_dir_merge_named alerts/
 automation: !include automations.yaml
 script: !include scripts.yaml
 sensor: !include_dir_merge_list sensors
-binary_sensor: !include_dir_merge_list binary_sensors
-light: !include lights.yaml
+# binary_sensor: !include_dir_merge_list binary_sensors
+# light: !include lights.yaml
 switch: !include switches.yaml
 scene: !include scenes.yaml
 input_select: !include input_select.yaml
diff --git a/config/lights.yaml b/config/lights.yaml
index c2c474f..edce21a 100644
--- a/config/lights.yaml
+++ b/config/lights.yaml
@@ -1,46 +1,46 @@
 
 
-# Outside
-- platform: mqtt
-  name: "Side Door Light"
-  command_topic: "zwave2mqtt/side_door_bulb/38/1/0/set"    
-  brightness_command_topic: "zwave2mqtt/side_door_bulb/38/1/0/set"
-  brightness_scale: 99
-  brightness_state_topic: "zwave2mqtt/side_door_bulb/38/1/0"
-  on_command_type: "brightness"
-  payload_off: '0'
+# # Outside
+# - platform: mqtt
+#   name: "Side Door Light"
+#   command_topic: "zwave2mqtt/side_door_bulb/38/1/0/set"    
+#   brightness_command_topic: "zwave2mqtt/side_door_bulb/38/1/0/set"
+#   brightness_scale: 99
+#   brightness_state_topic: "zwave2mqtt/side_door_bulb/38/1/0"
+#   on_command_type: "brightness"
+#   payload_off: '0'
 
-# Kitchen
+# # Kitchen
 
-- platform: mqtt
-  name: "Kitchen Cabinets"
-  command_topic: "zwave2mqtt/kitchen_cabinets/38/1/0/set"    
-  brightness_command_topic: "zwave2mqtt/kitchen_cabinets/38/1/0/set"
-  brightness_scale: 99
-  brightness_state_topic: "zwave2mqtt/kitchen_cabinets/38/1/0"
-  on_command_type: "brightness"
-  payload_off: '0'
-  retain: true
+# - platform: mqtt
+#   name: "Kitchen Cabinets"
+#   command_topic: "zwave2mqtt/kitchen_cabinets/38/1/0/set"    
+#   brightness_command_topic: "zwave2mqtt/kitchen_cabinets/38/1/0/set"
+#   brightness_scale: 99
+#   brightness_state_topic: "zwave2mqtt/kitchen_cabinets/38/1/0"
+#   on_command_type: "brightness"
+#   payload_off: '0'
+#   retain: true
 
-- platform: mqtt
-  name: "Kat Lamp"
-  command_topic: "zwave2mqtt/jeff_bedside_lamp/38/1/0/set"    
-  brightness_command_topic: "zwave2mqtt/jeff_bedside_lamp/38/1/0/set"
-  brightness_scale: 99
-  brightness_state_topic: "zwave2mqtt/jeff_bedside_lamp/38/1/0"
-  on_command_type: "brightness"
-  payload_off: '0'
-  retain: true
+# - platform: mqtt
+#   name: "Kat Lamp"
+#   command_topic: "zwave2mqtt/jeff_bedside_lamp/38/1/0/set"    
+#   brightness_command_topic: "zwave2mqtt/jeff_bedside_lamp/38/1/0/set"
+#   brightness_scale: 99
+#   brightness_state_topic: "zwave2mqtt/jeff_bedside_lamp/38/1/0"
+#   on_command_type: "brightness"
+#   payload_off: '0'
+#   retain: true
 
 
-# Theater
+# # Theater
 
-- platform: mqtt
-  name: Theater Light
-  command_topic: "zwave2mqtt/theater/38/1/0/set"    
-  brightness_command_topic: "zwave2mqtt/theater/38/1/0/set"
-  brightness_scale: 99
-  brightness_state_topic: "zwave2mqtt/theater/38/1/0"
-  on_command_type: "brightness"
-  payload_off: '0'
-  retain: true
+# - platform: mqtt
+#   name: Theater Light
+#   command_topic: "zwave2mqtt/theater/38/1/0/set"    
+#   brightness_command_topic: "zwave2mqtt/theater/38/1/0/set"
+#   brightness_scale: 99
+#   brightness_state_topic: "zwave2mqtt/theater/38/1/0"
+#   on_command_type: "brightness"
+# #   payload_off: '0'
+#   retain: true
diff --git a/config/switches.yaml b/config/switches.yaml
index bfb1a63..410b102 100644
--- a/config/switches.yaml
+++ b/config/switches.yaml
@@ -1,98 +1,98 @@
-# Living Room
+# # Living Room
 
-- platform: mqtt
-  name: "Incense"
-  state_topic: "zwave2mqtt/incense/37/1/0"
-  command_topic: "zwave2mqtt/incense/37/1/0/set"
-  payload_on: "true"
-  payload_off: "false"
+# - platform: mqtt
+#   name: "Incense"
+#   state_topic: "zwave2mqtt/incense/37/1/0"
+#   command_topic: "zwave2mqtt/incense/37/1/0/set"
+#   payload_on: "true"
+#   payload_off: "false"
 
-- platform: mqtt
-  name: "Living Room Fan"
-  state_topic: "zwave2mqtt/livingroom_fan/37/1/0"
-  command_topic: "zwave2mqtt/livingroom_fan/37/1/0/set"
-  payload_on: "true"
-  payload_off: "false"
+# - platform: mqtt
+#   name: "Living Room Fan"
+#   state_topic: "zwave2mqtt/livingroom_fan/37/1/0"
+#   command_topic: "zwave2mqtt/livingroom_fan/37/1/0/set"
+#   payload_on: "true"
+#   payload_off: "false"
   
-- platform: mqtt
-  name: "Fireplace Lights"
-  state_topic: "zwave2mqtt/fireplace_lights/37/1/0"
-  command_topic: "zwave2mqtt/fireplace_lights/37/1/0/set"
-  payload_on: "true"
-  payload_off: "false"
+# - platform: mqtt
+#   name: "Fireplace Lights"
+#   state_topic: "zwave2mqtt/fireplace_lights/37/1/0"
+#   command_topic: "zwave2mqtt/fireplace_lights/37/1/0/set"
+#   payload_on: "true"
+#   payload_off: "false"
 
-# Notifications
+# # Notifications
 
-- platform: mqtt
-  name: "Text Notify Kat"
-  command_topic: "kat/notify/text"
-  state_topic: "kat/notify/text"
-  qos: 1
-  payload_on: "on"
-  payload_off: "off"
-  retain: true
+# - platform: mqtt
+#   name: "Text Notify Kat"
+#   command_topic: "kat/notify/text"
+#   state_topic: "kat/notify/text"
+#   qos: 1
+#   payload_on: "on"
+#   payload_off: "off"
+#   retain: true
 
-- platform: mqtt
-  name: "Audibly Notify Kat"
-  command_topic: "kat/notify/audio"
-  state_topic: "kat/notify/audio"
-  qos: 1
-  payload_on: "on"
-  payload_off: "off"
-  retain: true
+# - platform: mqtt
+#   name: "Audibly Notify Kat"
+#   command_topic: "kat/notify/audio"
+#   state_topic: "kat/notify/audio"
+#   qos: 1
+#   payload_on: "on"
+#   payload_off: "off"
+#   retain: true
 
-- platform: mqtt
-  name: "Text Notify Jeff"
-  command_topic: "jeff/notify/text"
-  state_topic: "jeff/notify/text"
-  qos: 1
-  payload_on: "on"
-  payload_off: "off"
-  retain: true
+# - platform: mqtt
+#   name: "Text Notify Jeff"
+#   command_topic: "jeff/notify/text"
+#   state_topic: "jeff/notify/text"
+#   qos: 1
+#   payload_on: "on"
+#   payload_off: "off"
+#   retain: true
 
-- platform: mqtt
-  name: "Audibly Notify Jeff"
-  command_topic: "jeff/notify/audio"
-  state_topic: "jeff/notify/audio"
-  qos: 1
-  payload_on: "on"
-  payload_off: "off"
-  retain: true
+# - platform: mqtt
+#   name: "Audibly Notify Jeff"
+#   command_topic: "jeff/notify/audio"
+#   state_topic: "jeff/notify/audio"
+#   qos: 1
+#   payload_on: "on"
+#   payload_off: "off"
+#   retain: true
 
-- platform: mqtt
-  name: "Text Notify House"
-  command_topic: "house/notify/text"
-  state_topic: "house/notify/text"
-  qos: 1
-  payload_on: "on"
-  payload_off: "off"
-  retain: true
+# - platform: mqtt
+#   name: "Text Notify House"
+#   command_topic: "house/notify/text"
+#   state_topic: "house/notify/text"
+#   qos: 1
+#   payload_on: "on"
+#   payload_off: "off"
+#   retain: true
 
-- platform: mqtt
-  name: "Audibly Notify House"
-  command_topic: "house/notify/audio"
-  state_topic: "house/notify/audio"
-  qos: 1
-  payload_on: "on"
-  payload_off: "off"
-  retain: true
+# - platform: mqtt
+#   name: "Audibly Notify House"
+#   command_topic: "house/notify/audio"
+#   state_topic: "house/notify/audio"
+#   qos: 1
+#   payload_on: "on"
+#   payload_off: "off"
+#   retain: true
 
 
-# Outside
+# # Outside
 
-- platform: mqtt
-  name: "Driveway Light"
-  state_topic: "zwave2mqtt/driveway_light/37/1/0"
-  command_topic: "zwave2mqtt/driveway_light/37/1/0/set"
-  payload_on: "true"
-  payload_off: "false"
+# - platform: mqtt
+#   name: "Driveway Light"
+#   state_topic: "zwave2mqtt/driveway_light/37/1/0"
+#   command_topic: "zwave2mqtt/driveway_light/37/1/0/set"
+#   payload_on: "true"
+#   payload_off: "false"
 
-- platform: mqtt
-  name: "Front Porch Light"
-  state_topic: "zwave2mqtt/front_porch_light/37/1/0"
-  command_topic: "zwave2mqtt/front_porch_light/37/1/0/set"
-  payload_on: "true"
-  payload_off: "false"
+# - platform: mqtt
+#   name: "Front Porch Light"
+#   state_topic: "zwave2mqtt/front_porch_light/37/1/0"
+#   command_topic: "zwave2mqtt/front_porch_light/37/1/0/set"
+#   payload_on: "true"
+#   payload_off: "false"
 
 # Sonoff
 
@@ -105,66 +105,66 @@
   payload_off: "OFF"
   retain: true
 
-# Upstairs
-
-- platform: mqtt
-  name: "Croft Fan"
-  state_topic: "zwave2mqtt/croft_fan/37/1/0"
-  command_topic: "zwave2mqtt/croft_fan/37/1/0/set"
-  payload_on: "true"
-  payload_off: "false"
-
-- platform: mqtt
-  name: "Zwave Dual Power"
-  state_topic: "zwave2mqtt/theater_power/37/1/0"
-  command_topic: "zwave2mqtt/theater_power/37/1/0/set"
-  payload_on: "true"
-  payload_off: "false"
-
-- platform: mqtt
-  name: "Croft Light"
-  state_topic: "zwave2mqtt/croft_light/37/1/0"
-  command_topic: "zwave2mqtt/croft_light/37/1/0/set"
-  payload_on: "true"
-  payload_off: "false"
-
-# Appliance
-
-- platform: mqtt
-  name: "Washer"
-  state_topic: "zwave2mqtt/washer/37/1/0"
-  command_topic: "zwave2mqtt/washer/37/1/0/set"
-  payload_on: "true"
-  payload_off: "false"
-
-
-# Theater:
-
-- platform: mqtt
-  name: "Theater Fan"
-  state_topic: "zwave2mqtt/theater/37/2/0"
-  command_topic: "zwave2mqtt/theater/37/2/0/set"
-  payload_on: "true"
-  payload_off: "false"
-
-
-# alarm
+# # Upstairs
 
 # - platform: mqtt
-#   name: "Alarm"
-#   state_topic: "zwave2mqtt/nodeID_21/37/1/0"
-#   command_topic: "zwave2mqtt/nodeID_21/37/1/0/set"
+#   name: "Croft Fan"
+#   state_topic: "zwave2mqtt/croft_fan/37/1/0"
+#   command_topic: "zwave2mqtt/croft_fan/37/1/0/set"
 #   payload_on: "true"
 #   payload_off: "false"
 
-# Master Bedroom
+# - platform: mqtt
+#   name: "Skylars Desk"
+#   state_topic: "zwave2mqtt/theater_power/37/1/0"
+#   command_topic: "zwave2mqtt/theater_power/37/1/0/set"
+#   payload_on: "true"
+#   payload_off: "false"
 
-- platform: mqtt
-  name: "Master Bath Fan"
-  state_topic: "zwave2mqtt/master_bath_fan/37/1/0"
-  command_topic: "zwave2mqtt/master_bath_fan/37/1/0/set"
-  payload_on: "true"
-  payload_off: "false"
+# - platform: mqtt
+#   name: "Croft Light"
+#   state_topic: "zwave2mqtt/croft_light/37/1/0"
+#   command_topic: "zwave2mqtt/croft_light/37/1/0/set"
+#   payload_on: "true"
+#   payload_off: "false"
+
+# # Appliance
+
+# - platform: mqtt
+#   name: "Washer"
+#   state_topic: "zwave2mqtt/washer/37/1/0"
+#   command_topic: "zwave2mqtt/washer/37/1/0/set"
+#   payload_on: "true"
+#   payload_off: "false"
+
+
+# # Theater:
+
+# - platform: mqtt
+#   name: "Theater Fan"
+#   state_topic: "zwave2mqtt/theater/37/2/0"
+#   command_topic: "zwave2mqtt/theater/37/2/0/set"
+#   payload_on: "true"
+#   payload_off: "false"
+
+
+# # alarm
+
+# # - platform: mqtt
+# #   name: "Alarm"
+# #   state_topic: "zwave2mqtt/nodeID_21/37/1/0"
+# #   command_topic: "zwave2mqtt/nodeID_21/37/1/0/set"
+# #   payload_on: "true"
+# #   payload_off: "false"
+
+# # Master Bedroom
+
+# - platform: mqtt
+#   name: "Master Bath Fan"
+#   state_topic: "zwave2mqtt/master_bath_fan/37/1/0"
+#   command_topic: "zwave2mqtt/master_bath_fan/37/1/0/set"
+#   payload_on: "true"
+#   payload_off: "false"