From a4118991900fafb39944a50d22cfbc008882a784 Mon Sep 17 00:00:00 2001 From: Jeffrey Stone Date: Tue, 9 Jun 2020 07:48:35 -0400 Subject: [PATCH] Migrated to HassOS 4.9 and my zwave/zigbee usb dongles work again This was a pain. Still not sure what happened. But the upgrade to HassOS 4.8 killed both zwave2mqtt and zigbee2mqtt is seems. After the upgrade neitehr addon would talk to the hardware. I migrated back to smartthings...major pain..and then after 4.10 was released was able to get the addons added abck and talking to the hardware again. All lights and switches are back talking locally. Also, it takes about 18 hours to migrate back to smartthings, and about 18 hours to migrate back to local control. Let's hope that doesn't happen again. --- config/binary_sensors/doors.yaml | 84 ++++----- config/binary_sensors/motion.yaml | 24 +-- config/groups.yaml | 54 +++--- config/lights.yaml | 54 +++--- config/packages/security.yaml | 274 +++++++++++++++--------------- config/packages/zigbee2mqtt.yaml | 116 ++++++------- config/scenes.yaml | 77 ++++----- config/sensors/batteries.yaml | 71 +++++++- config/switches.yaml | 108 ++++++------ 9 files changed, 465 insertions(+), 397 deletions(-) diff --git a/config/binary_sensors/doors.yaml b/config/binary_sensors/doors.yaml index cf33c38..d0befd2 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_sensor/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_sensor/48/1/0" -# payload_on: "true" -# payload_off: "false" -# device_class: door -# - platform: mqtt -# name: "Laundry Room Door" -# state_topic: "zwave2mqtt/laundry_door_sensor/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_sensor/48/1/0" -# payload_on: "true" -# payload_off: "false" -# device_class: door -# - platform: mqtt -# name: "Washer Door" -# state_topic: "zwave2mqtt/washer_door_sensor/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 ce1e702..6da8601 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/groups.yaml b/config/groups.yaml index 2611798..9e5a423 100755 --- a/config/groups.yaml +++ b/config/groups.yaml @@ -11,30 +11,35 @@ House Conditions: - sensor.accurite_garage_humidity Outside Lights: - - switch.driveway_light_2 + - switch.driveway_light - switch.front_porch_light - - light.side_door_light_2 + - light.side_door_light External Doors: - - binary_sensor.side_door_contact - - binary_sensor.front_door_contact - - binary_sensor.back_door_contact - - binary_sensor.laundry_door_contact - - binary_sensor.garage_door_contact + - binary_sensor.side_door + - binary_sensor.front_door + - binary_sensor.back_door + - binary_sensor.laundry_door + - binary_sensor.garage_door Garage Doors: - - binary_sensor.side_door_contact - - binary_sensor.garage_door_contact + - binary_sensor.side_door + - binary_sensor.garage_door Internal Doors: - - binary_sensor.attic_door_contact - - + - binary_sensor.attic_door rgb lr: - - light.livingroom_tower - - light.livingroom_lamp_1 - - light.livingroom_lamp_2 + - light.0xb0ce18140003608a_light + - light.0xb0ce181400051072_light + - light.0xb0ce181400051b4c_light + +livingroom tower: + - light.0xb0ce18140003608a_light + +livingroom lamps: + - light.0xb0ce181400051072_light + - light.0xb0ce181400051b4c_light incense: - switch.incense @@ -46,12 +51,23 @@ all fans: - switch.livingroom_fan Skylars Bedroom: - - light.skylars_lamp - - switch.rainbow_light - - light.skylars_spotlight - - light.skylars_tower + - light.0xb0ce18140003b334_light # skylars tower + - switch.0xf0d1b80000052281_switch # rainbow light + - light.0xb0ce1814035bb3f0_light # skylars spotlight + - light.wled_loftbed Master Bedroom: - light.jeff_lamp +kitchen: + - light.kitchen_cabinets + - switch.ha_speaker + +livingroom: + - light.0xb0ce18140003608a_light + - light.0xb0ce181400051072_light + - light.0xb0ce181400051b4c_light + - switch.fireplace_lights + - switch.rail_lights + diff --git a/config/lights.yaml b/config/lights.yaml index 7a2e902..ff0d524 100644 --- a/config/lights.yaml +++ b/config/lights.yaml @@ -1,7 +1,7 @@ # Living Room # Sengled LED Lights # - platform: mqtt -# name: "Livingroom Lamp" +# name: "Livingroom Tower" # schema: json # command_topic: "homeassistant/0xb0ce18140003608a" # brightness_state_topic: "smartthings/Tower Lamp/level" @@ -36,34 +36,34 @@ # retain: true # Outside -# - platform: mqtt -# name: "Side Door Light" -# command_topic: "zwave2mqtt/side_door_light/38/1/0/set" -# brightness_command_topic: "zwave2mqtt/side_door_light/38/1/0/set" -# brightness_scale: 99 -# brightness_state_topic: "zwave2mqtt/side_door_light/38/1/0" -# on_command_type: "brightness" -# payload_off: 0 +- platform: mqtt + name: "Side Door Light" + command_topic: "zwave2mqtt/side_door_light/38/1/0/set" + brightness_command_topic: "zwave2mqtt/side_door_light/38/1/0/set" + brightness_scale: 99 + brightness_state_topic: "zwave2mqtt/side_door_light/38/1/0" + on_command_type: "brightness" + payload_off: 0 # 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: "Kitchen Cabinet Lights" -# command_topic: "zwave2mqtt/kitchen_strip/38/1/0/set" -# brightness_command_topic: "zwave2mqtt/kitchen_strip/38/1/0/set" -# brightness_scale: 99 -# brightness_state_topic: "zwave2mqtt/kitchen_strip/38/1/0" -# on_command_type: "brightness" -# payload_off: 0 -# retain: true +- platform: mqtt + name: "Jeff 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 diff --git a/config/packages/security.yaml b/config/packages/security.yaml index 94ac51e..d1c9dba 100755 --- a/config/packages/security.yaml +++ b/config/packages/security.yaml @@ -136,10 +136,10 @@ automation: trigger: - platform: state entity_id: - - binary_sensor.front_door_contact - - binary_sensor.laundry_door_contact - - binary_sensor.attic_door_contact - - binary_sensor.back_door_contact + - binary_sensor.front_door + - binary_sensor.laundry_door + - binary_sensor.attic_door + - binary_sensor.back_door from: 'off' condition: condition: and @@ -167,10 +167,10 @@ automation: trigger: - platform: state entity_id: - - binary_sensor.front_door_contact - - binary_sensor.laundry_door_contact - - binary_sensor.attic_door_contact - - binary_sensor.back_door_contact + - binary_sensor.front_door + - binary_sensor.laundry_door + - binary_sensor.attic_door + - binary_sensor.back_door from: 'off' to: 'on' for: '00:01:00' @@ -255,11 +255,11 @@ automation: trigger: - platform: state entity_id: - - binary_sensor.front_door_contact - - binary_sensor.laundry_door_contact - - binary_sensor.back_door_contact - - binary_sensor.side_door_contact - - binary_sensor.garage_door_contact + - binary_sensor.front_door + - binary_sensor.laundry_door + - binary_sensor.back_door + - binary_sensor.side_door + - binary_sensor.garage_door from: 'off' condition: - condition: state @@ -419,118 +419,118 @@ automation: - service: media_player.media_stop entity_id: media_player.ha_speaker - - id: Kitchen_Alarm_Smoke - alias: Kitchen Alarm Smoke - initial_state: true - trigger: - - platform: state - entity_id: sensor.kitchen_smoke_smoke_detector - to: 'smoke' - action: - - service: input_boolean.turn_on - entity_id: input_boolean.fire_alarm - - service: script.text_alert - data_template: - title: Security Alert - Smoke - message: Smoke Detected in Kitchen!! - - service: script.jarvis_alert - data_template: - message: Smoke Detected in Kitchen! - - delay: - seconds: 5 - - service: script.fire_alarm - - delay: - seconds: 15 - - service: notify.alexa_media_everywhere - data: - message: Smoke Detected in Kitchen - data: - type: announce + # - id: Kitchen_Alarm_Smoke + # alias: Kitchen Alarm Smoke + # initial_state: true + # trigger: + # - platform: state + # entity_id: sensor.kitchen_smoke_smoke_detector + # to: 'smoke' + # action: + # - service: input_boolean.turn_on + # entity_id: input_boolean.fire_alarm + # - service: script.text_alert + # data_template: + # title: Security Alert - Smoke + # message: Smoke Detected in Kitchen!! + # - service: script.jarvis_alert + # data_template: + # message: Smoke Detected in Kitchen! + # - delay: + # seconds: 5 + # - service: script.fire_alarm + # - delay: + # seconds: 15 + # - service: notify.alexa_media_everywhere + # data: + # message: Smoke Detected in Kitchen + # data: + # type: announce - - id: Kitchen_Alarm_Co - alias: Kitchen Alarm CO - initial_state: true - trigger: - - platform: state - entity_id: sensor.kitchen_smoke_carbon_monoxide_detector - to: 'co2' - action: - - service: input_boolean.turn_on - entity_id: input_boolean.fire_alarm - - service: script.text_alert - data_template: - title: Security Alert - CO - message: CO Detected in Kitchen!! - - service: script.jarvis_alert - data_template: - message: Carbon Dioxide Detected in Kitchen! - - delay: - seconds: 5 - - service: script.fire_alarm - - delay: - seconds: 15 - - service: notify.alexa_media_everywhere - data: - message: Carbon Dioxide Detected in Garage - data: - type: announce + # - id: Kitchen_Alarm_Co + # alias: Kitchen Alarm CO + # initial_state: true + # trigger: + # - platform: state + # entity_id: sensor.kitchen_smoke_carbon_monoxide_detector + # to: 'co2' + # action: + # - service: input_boolean.turn_on + # entity_id: input_boolean.fire_alarm + # - service: script.text_alert + # data_template: + # title: Security Alert - CO + # message: CO Detected in Kitchen!! + # - service: script.jarvis_alert + # data_template: + # message: Carbon Dioxide Detected in Kitchen! + # - delay: + # seconds: 5 + # - service: script.fire_alarm + # - delay: + # seconds: 15 + # - service: notify.alexa_media_everywhere + # data: + # message: Carbon Dioxide Detected in Garage + # data: + # type: announce - - id: Garage_Alarm_Smoke - alias: Garage Alarm Smoke - initial_state: true - trigger: - - platform: state - entity_id: sensor.garage_smoke_smoke_detector - to: 'smoke' - action: - - service: input_boolean.turn_on - entity_id: input_boolean.fire_alarm - - service: script.text_alert - data_template: - title: Security Alert - Smoke - message: Smoke Detected in Garage!! - - service: script.jarvis_alert - data_template: - message: Smoke Detected in Garage! - - delay: - seconds: 5 - - service: script.fire_alarm - - delay: - seconds: 15 - - service: notify.alexa_media_everywhere - data: - message: Smoke Detected in Garage - data: - type: announce + # - id: Garage_Alarm_Smoke + # alias: Garage Alarm Smoke + # initial_state: true + # trigger: + # - platform: state + # entity_id: sensor.garage_smoke_smoke_detector + # to: 'smoke' + # action: + # - service: input_boolean.turn_on + # entity_id: input_boolean.fire_alarm + # - service: script.text_alert + # data_template: + # title: Security Alert - Smoke + # message: Smoke Detected in Garage!! + # - service: script.jarvis_alert + # data_template: + # message: Smoke Detected in Garage! + # - delay: + # seconds: 5 + # - service: script.fire_alarm + # - delay: + # seconds: 15 + # - service: notify.alexa_media_everywhere + # data: + # message: Smoke Detected in Garage + # data: + # type: announce - - id: Garage_Alarm_Co - alias: Garage Alarm CO - initial_state: true - trigger: - - platform: state - entity_id: sensor.garage_smoke_carbon_monoxide_detector - to: 'co2' - action: - - service: input_boolean.turn_on - entity_id: input_boolean.fire_alarm - - service: script.text_alert - data_template: - title: Security Alert - CO - message: CO Detected in Garage!! - - service: script.jarvis_alert - data_template: - message: Carbon dioxide Detected in Garage! - - delay: - seconds: 5 - - service: script.fire_alarm - - delay: - seconds: 15 - - service: notify.alexa_media_everywhere - data: - message: Carbon Dioxide Detected in Garage - data: - type: announce + # - id: Garage_Alarm_Co + # alias: Garage Alarm CO + # initial_state: true + # trigger: + # - platform: state + # entity_id: sensor.garage_smoke_carbon_monoxide_detector + # to: 'co2' + # action: + # - service: input_boolean.turn_on + # entity_id: input_boolean.fire_alarm + # - service: script.text_alert + # data_template: + # title: Security Alert - CO + # message: CO Detected in Garage!! + # - service: script.jarvis_alert + # data_template: + # message: Carbon dioxide Detected in Garage! + # - delay: + # seconds: 5 + # - service: script.fire_alarm + # - delay: + # seconds: 15 + # - service: notify.alexa_media_everywhere + # data: + # message: Carbon Dioxide Detected in Garage + # data: + # type: announce - id: water_leak_detected alias: Welcome Home @@ -584,22 +584,22 @@ script: title: "Lockdown Issue!" message: "Doors are open and it appears everyone has left!" - fire_alarm: - sequence: - - condition: state - entity_id: input_boolean.fire_alarm - state: "on" - - service: media_player.turn_on - entity_id: media_player.ha_speaker - - service: media_player.volume_set - data_template: - entity_id: media_player.ha_speaker - volume_level: .75 - - service: media_player.play_media - entity_id: media_player.ha_speaker - data: - media_content_id: http://192.168.7.40/audio/fire_alarm.mp3 - media_content_type: "music" + # fire_alarm: + # sequence: + # - condition: state + # entity_id: input_boolean.fire_alarm + # state: "on" + # - service: media_player.turn_on + # entity_id: media_player.ha_speaker + # - service: media_player.volume_set + # data_template: + # entity_id: media_player.ha_speaker + # volume_level: .75 + # - service: media_player.play_media + # entity_id: media_player.ha_speaker + # data: + # media_content_id: http://192.168.7.40/audio/fire_alarm.mp3 + # media_content_type: "music" security_check_garage: sequence: diff --git a/config/packages/zigbee2mqtt.yaml b/config/packages/zigbee2mqtt.yaml index 7ec3118..8b6c5f5 100755 --- a/config/packages/zigbee2mqtt.yaml +++ b/config/packages/zigbee2mqtt.yaml @@ -1,62 +1,62 @@ -# input_boolean: -# zigbee_permit_join: -# name: Allow devices to join -# initial: off -# icon: mdi:cellphone-wireless +input_boolean: + zigbee_permit_join: + name: Allow devices to join + initial: off + icon: mdi:cellphone-wireless -# timer: -# zigbee_permit_join: -# name: Time remaining -# duration: 600 # Updated this to the number of seconds you wish +timer: + zigbee_permit_join: + name: Time remaining + duration: 600 # Updated this to the number of seconds you wish -# sensor: -# - platform: mqtt -# name: Bridge state -# state_topic: "homeassistant/bridge/state" -# icon: mdi:router-wireless +sensor: + - platform: mqtt + name: Bridge state + state_topic: "homeassistant/bridge/state" + icon: mdi:router-wireless -# automation: -# - id: enable_zigbee_join -# alias: Enable Zigbee joining -# trigger: -# platform: state -# entity_id: input_boolean.zigbee_permit_join -# to: 'on' -# action: -# - service: mqtt.publish -# data: -# topic: homeassistant/bridge/config/permit_join -# payload: 'true' -# - service: timer.start -# data: -# entity_id: timer.zigbee_permit_join -# - id: disable_zigbee_join -# alias: Disable Zigbee joining -# trigger: -# - entity_id: input_boolean.zigbee_permit_join -# platform: state -# to: 'off' -# action: -# - data: -# payload: 'false' -# topic: homeassistant/bridge/config/permit_join -# service: mqtt.publish -# - data: -# entity_id: timer.zigbee_permit_join -# service: timer.cancel -# - id: disable_zigbee_join_timer -# alias: Disable Zigbee joining by timer -# trigger: -# - platform: event -# event_type: timer.finished -# event_data: -# entity_id: timer.zigbee_permit_join -# action: -# - service: mqtt.publish -# data: -# topic: homeassistant/bridge/config/permit_join -# payload: 'false' -# - service: input_boolean.turn_off -# data: -# entity_id: input_boolean.zigbee_permit_join \ No newline at end of file +automation: + - id: enable_zigbee_join + alias: Enable Zigbee joining + trigger: + platform: state + entity_id: input_boolean.zigbee_permit_join + to: 'on' + action: + - service: mqtt.publish + data: + topic: homeassistant/bridge/config/permit_join + payload: 'true' + - service: timer.start + data: + entity_id: timer.zigbee_permit_join + - id: disable_zigbee_join + alias: Disable Zigbee joining + trigger: + - entity_id: input_boolean.zigbee_permit_join + platform: state + to: 'off' + action: + - data: + payload: 'false' + topic: homeassistant/bridge/config/permit_join + service: mqtt.publish + - data: + entity_id: timer.zigbee_permit_join + service: timer.cancel + - id: disable_zigbee_join_timer + alias: Disable Zigbee joining by timer + trigger: + - platform: event + event_type: timer.finished + event_data: + entity_id: timer.zigbee_permit_join + action: + - service: mqtt.publish + data: + topic: homeassistant/bridge/config/permit_join + payload: 'false' + - service: input_boolean.turn_off + data: + entity_id: input_boolean.zigbee_permit_join \ No newline at end of file diff --git a/config/scenes.yaml b/config/scenes.yaml index e4eafa1..93c26ec 100755 --- a/config/scenes.yaml +++ b/config/scenes.yaml @@ -51,11 +51,9 @@ state: on brightness: 40 color_temp: 369 - light.livingroom_lamp_2: + group.livingroom_lamps: state: off - light.livingroom_lamp_1: - state: off - switch.fireplace_lights_2: + switch.fireplace_lights: state: off - name: illuminations livingroom lighting two @@ -95,15 +93,13 @@ - name: night time livingroom lighting entities: - light.livingroom_tower: + group.livingroom_tower: state: on brightness: 10 color_temp: 369 - light.livingroom_lamp_2: + group.livingroom_lamps: state: off - light.livingroom_lamp_1: - state: off - switch.fireplace_lights_2: + switch.fireplace_lights: state: off - name: diminished kitchen lighting @@ -134,13 +130,9 @@ state: off switch.fireplace_lights: state: off - light.skylar_tower: + group.skylars_bedroom: state: off - light.jeff_lamp: - state: off - light.skylar_spotlight: - state: off - switch.rainbow_light: + group.master_bedroom: state: off switch.rail_lights: state: off @@ -148,9 +140,7 @@ - name: haunted preshow entities: - light.kitchen_cabinets: - state: off - switch.ha_speaker: + group.kitchen: state: off switch.fireplace_lights: state: off @@ -162,14 +152,11 @@ - name: haunted lights out entities: - light.kitchen_cabinets: + group.kitchen: state: off - switch.ha_speaker: - state: off - group.rgb_lr: - state: off - switch.fireplace_lights: + group.livingroom: state: off + - name: wishes preshow entities: @@ -188,37 +175,33 @@ entities: switch.christmas_tree: state: on - light.0xb0ce181400051b4c_light_2: + light.0xb0ce181400051b4c_light: state: on brightness: 20 light.0xb0ce18140003608a_light: state: on brightness: 20 - light.0xb0ce181400051072_light_2: + light.0xb0ce181400051072_light: state: on brightness: 20 - name: table lamp blue entities: - light.0xb0ce181400051b4c_light_2: + group.livingroom_lamps: state: on brightness_pct: 100 rgb_color: [65,105,255] - name: tower lamp red entities: - light.livingroom_tower: + group.livingroom_tower: state: on brightness_pct: 100 rgb_color: [255,40,0] - name: front lamp green entities: - light.livingroom_lamp_1: - state: on - brightness_pct: 100 - rgb_color: [0,128,0] - light.livingroom_lamp_2: + group.livingroom_lamps: state: on brightness_pct: 100 rgb_color: [0,128,0] @@ -226,61 +209,61 @@ - name: jeff light on entities: - light.jeff_bedside_lamp: + light.jeff_lamp: state: on brightness: 255 - name: jeff light off entities: - light.jeff_bedside_lamp: + light.jeff_lamp: state: off - name: jeff wake up entities: - light.jeff_bedside_lamp: + light.jeff_lamp: state: on brightness: 10 - name: jeff bedtime entities: - light.jeff_bedside_lamp: + light.jeff_lamp: state: on brightness: 40 - name: jeff night light entities: - light.jeff_bedside_lamp: + light.jeff_lamp: state: on brightness: 10 - name: skylar tower on entities: - light.skylar_tower: + light.0xb0ce18140003b334_light: state: on brightness: 255 - name: skylar tower 75 entities: - light.skylar_tower: + light.0xb0ce18140003b334_light: state: on brightness: 192 - name: skylar tower 50 entities: - light.skylar_tower: + light.0xb0ce18140003b334_light: state: on brightness: 130 - name: skylar tower 25 entities: - light.skylar_tower: + light.0xb0ce18140003b334_light: state: on brightness: 63 - name: skylar tower off entities: - light.skylar_tower: + light.0xb0ce18140003b334_light: state: off - name: santa protocol @@ -292,26 +275,26 @@ - name: skylar room prebed entities: - light.skylar_tower: + light.0xb0ce18140003b334_light: state: on brightness: 192 light.wled_loftbed: state: on brightness: 255 rgb_color: [63, 255, 0] - switch.rainbow_light: + switch.0xf0d1b80000052281_switch: state: on - name: skylar room sleep entities: - light.skylar_tower: + light.0xb0ce18140003b334_light: state: off light.wled_loftbed: state: on brightness_pct: 100 rgb_color: [63, 255, 0] - switch.rainbow_light: + switch.0xf0d1b80000052281_switch: state: on switch.wled_loftbed_nightlight: state: on diff --git a/config/sensors/batteries.yaml b/config/sensors/batteries.yaml index 8b13789..38c2ce4 100755 --- a/config/sensors/batteries.yaml +++ b/config/sensors/batteries.yaml @@ -1 +1,70 @@ - +- platform: mqtt + name: "Battery Front Door Sensor" + 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: "Battery Laundry Door Sensor" + state_topic: "zwave2mqtt/laundry_door/128/1/0" + unit_of_measurement: "%" + device_class: battery + value_template: "{{ value }}" + json_attributes_topic: "zwave2mqtt/laundry_door/128/1/0" +- platform: mqtt + name: "Battery Kitchen Smoke Detector" + state_topic: "zwave2mqtt/kitchen_smoke/128/1/0" + unit_of_measurement: "%" + device_class: battery + value_template: "{{ value }}" + json_attributes_topic: "zwave2mqtt/kitchen_smoke/128/1/0" +- platform: mqtt + name: "Battery Garage Smoke Detector" + state_topic: "zwave2mqtt/garage_smoke/128/1/0" + unit_of_measurement: "%" + device_class: battery + value_template: "{{ value }}" + json_attributes_topic: "zwave2mqtt/garage_smoke/128/1/0" +- platform: mqtt + name: "Battery Attic Door Sensor" + 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: "Battery Washer Door Sensor" + 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: "Battery Back Door Sensor" + 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: "Battery Side Door Sensor" + 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: "Battery Garage Door Sensor" + 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: "Battery Garage Motion Sensor" + state_topic: "zwave2mqtt/garage_motion/128/1/0" + unit_of_measurement: "%" + device_class: battery + value_template: "{{ value }}" + json_attributes_topic: "zwave2mqtt/garage_motion/128/1/0" \ No newline at end of file diff --git a/config/switches.yaml b/config/switches.yaml index 3936763..8d35e8d 100644 --- a/config/switches.yaml +++ b/config/switches.yaml @@ -1,25 +1,25 @@ # 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/living_room_fan/37/1/0" -# command_topic: "zwave2mqtt/living_room_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 @@ -80,19 +80,19 @@ # 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" -# state_topic: "zwave2mqtt/front_porch/37/1/0" -# command_topic: "zwave2mqtt/front_porch/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 @@ -107,35 +107,35 @@ # Upstairs -# - platform: mqtt -# name: "Upstairs Fan" -# state_topic: "zwave2mqtt/upstairs_fan/37/1/0" -# command_topic: "zwave2mqtt/upstairs_fan/37/1/0/set" -# payload_on: "true" -# payload_off: "false" +- 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: "Theater 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: "Theater 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: "Upstairs" -# state_topic: "zwave2mqtt/upstairs_light/37/1/0" -# command_topic: "zwave2mqtt/upstairs_light/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" +- 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" # alarm