From f35b0a074c2d4ee24b13be567a56a9ecfa266f8c Mon Sep 17 00:00:00 2001 From: Jeffrey Stone Date: Sun, 24 Jan 2021 22:19:46 -0500 Subject: [PATCH] ZHA is unusable using sonoff bridge right now, moved back to zigbee2mqtt --- config/groups.yaml | 30 ++--- config/packages/lighting.yaml | 26 ++--- config/packages/zigbee2mqtt.yaml | 8 +- config/scenes.yaml | 194 ++++++++++++++++++++----------- 4 files changed, 161 insertions(+), 97 deletions(-) diff --git a/config/groups.yaml b/config/groups.yaml index cf10fcc..f93e20c 100755 --- a/config/groups.yaml +++ b/config/groups.yaml @@ -32,7 +32,7 @@ audio_devices: Outside Lights: - switch.driveway_light - switch.front_porch_light - - light.cree_side_door_lightlevel_on_off + - light.side_door_light_level External Doors: - binary_sensor.side_door @@ -49,20 +49,20 @@ Internal Doors: - binary_sensor.attic_door rgb lr: - - light.front_door_lamp_level_light_color_on_off + - light.front_door_lamp - light.living_room_lamp - - light.living_room_tower_lamp_level_light_color_on_off + - light.living_room_tower_lamp livingroom tower: - - light.living_room_tower_lamp_level_light_color_on_off + - light.living_room_tower_lamp livingroom lamps: - light.living_room_lamp - - light.front_door_lamp_level_light_color_on_off + - light.front_door_lamp incense: - - switch.forest_incense_on_off - - switch.innr1_on_off + - switch.forest_incense + - switch.artemis - switch.incense all fans: @@ -70,16 +70,16 @@ all fans: - switch.livingroom_fan Skylars Bedroom: - - light.skylars_lamp_level_light_color_on_off # skylars lamp - - switch.rainbow_light_on_off # rainbow light + - light.skylars_dresser_lamp + - switch.rainbow_lamp # rainbow light - light.wled_loftbed Master Bedroom: - - light.jeff_lamp_level_light_color_on_off - - light.tower_spotlight_level_on_off + - light.jeff_lamp + - light.jeff_dresser_lamp - light.kat_lamp - - light.kitchen_sink_level_light_color_on_off - - light.desk_accent_level_light_color_on_off + - light.master_bedroom_tower_lamp + - light.desk_accent - switch.tplink_a2 kitchen: @@ -87,9 +87,9 @@ kitchen: - switch.ha_speaker livingroom: - - light.front_door_lamp_level_light_color_on_off + - light.front_door_lamp - light.living_room_lamp - - light.living_room_tower_lamp_level_light_color_on_off + - light.living_room_tower_lamp - switch.fireplace_lights - switch.rail_lights diff --git a/config/packages/lighting.yaml b/config/packages/lighting.yaml index 088036d..ebfa0e5 100755 --- a/config/packages/lighting.yaml +++ b/config/packages/lighting.yaml @@ -22,14 +22,14 @@ automation: alias: Master Bedroom Lights Needed initial_state: true trigger: - - entity_id: binary_sensor.master_bedroom_motion + - entity_id: binary_sensor.master_bedroom_motion_occupancy from: 'off' platform: state to: 'on' condition: - below: 13 condition: numeric_state - entity_id: sensor.master_bedroom_illuminance + entity_id: sensor.master_bedroom_motion_illuminance_lux - condition: time after: '07:30:00' before: '22:00:00' @@ -72,18 +72,18 @@ automation: alias: Kitchen Lights Needed initial_state: true trigger: - - entity_id: binary_sensor.kitchen_motion_2 + - entity_id: binary_sensor.kitchen_motion_occupancy from: 'off' platform: state to: 'on' - - entity_id: binary_sensor.kitchen_motion + - entity_id: binary_sensor.back_door_motion from: 'off' platform: state to: 'on' condition: - below: 70 condition: numeric_state - entity_id: sensor.kitchen_illuminance + entity_id: sensor.kitchen_motion_illuminance_lux action: - choose: - conditions: @@ -106,14 +106,14 @@ automation: alias: Living Room Lights Needed initial_state: true trigger: - - entity_id: binary_sensor.lumi_lumi_sensor_motion_aq2_ias_zone + - entity_id: binary_sensor.living_room_motion_occupancy from: 'off' platform: state to: 'on' condition: - below: 50 condition: numeric_state - entity_id: sensor.lumi_lumi_sensor_motion_aq2_illuminance + entity_id: sensor.living_room_motion_illuminance_lux - condition: time after: '05:30:00' before: '22:30:00' @@ -128,12 +128,12 @@ automation: alias: Inside Lights Not Needed initial_state: true trigger: - - entity_id: sensor.lumi_lumi_sensor_motion_aq2_illuminance + - entity_id: sensor.living_room_motion_illuminance_lux above: 99 platform: numeric_state condition: - condition: state - entity_id: light.living_room_tower_lamp_level_light_color_on_off + entity_id: light.living_room_tower_lamp state: "on" action: - service: scene.turn_on @@ -154,7 +154,7 @@ script: inside_all_off: sequence: - data: - entity_id: light.tower_lamp_4 + entity_id: light.living_room_tower_lamp service: light.turn_off - data: entity_id: light.living_room_lamp @@ -199,7 +199,7 @@ script: entity_id: switch.driveway_light service: switch.turn_on - data: - entity_id: light.cree_side_door_lightlevel_on_off + entity_id: light.side_door_light_level service: light.turn_on driveway_off: @@ -215,7 +215,7 @@ script: - service: switch.turn_off entity_id: switch.driveway_light - service: light.turn_off - entity_id: light.cree_side_door_lightlevel_on_off + entity_id: light.side_door_light_level # Turn on Living Room Lights if sun is down or cloud coverage is above 70% livingroom_lamps_on: @@ -356,7 +356,7 @@ script: master_bedroom_lights_w_level: sequence: - service: light.turn_on - entity_id: light.jeff_lamp_level_light_color_on_off, light.tower_spotlight_level_on_off, light.kat_lamp + entity_id: light.jeff_lamp, light.master_bedroom_tower_lamp, light.kat_lamp data: brightness: > {{ level | int }} diff --git a/config/packages/zigbee2mqtt.yaml b/config/packages/zigbee2mqtt.yaml index 8b6c5f5..a694137 100755 --- a/config/packages/zigbee2mqtt.yaml +++ b/config/packages/zigbee2mqtt.yaml @@ -13,7 +13,7 @@ timer: sensor: - platform: mqtt name: Bridge state - state_topic: "homeassistant/bridge/state" + state_topic: "zigbee2mqtt/bridge/state" icon: mdi:router-wireless automation: @@ -26,7 +26,7 @@ automation: action: - service: mqtt.publish data: - topic: homeassistant/bridge/config/permit_join + topic: zigbee2mqtt/bridge/config/permit_join payload: 'true' - service: timer.start data: @@ -40,7 +40,7 @@ automation: action: - data: payload: 'false' - topic: homeassistant/bridge/config/permit_join + topic: zigbee2mqtt/bridge/config/permit_join service: mqtt.publish - data: entity_id: timer.zigbee_permit_join @@ -55,7 +55,7 @@ automation: action: - service: mqtt.publish data: - topic: homeassistant/bridge/config/permit_join + topic: zigbee2mqtt/bridge/config/permit_join payload: 'false' - service: input_boolean.turn_off data: diff --git a/config/scenes.yaml b/config/scenes.yaml index b3b0f1e..a2a4dec 100755 --- a/config/scenes.yaml +++ b/config/scenes.yaml @@ -1,3 +1,102 @@ +- name: studio normal + entities: + light.jeff_lamp: + state: 'on' + brightness: 255 + rgb_color: + - 255 + - 213 + - 133 + light.jeff_dresser_lamp: + state: 'on' + brightness: 255 + light.kat_lamp: + state: 'on' + brightness: 255 + light.master_bedroom_tower_lamp: + state: 'on' + brightness: 255 + rgb_color: + - 7 + - 130 + - 255 + light.desk_accent: + state: 'on' + brightness: 255 + rgb_color: + - 7 + - 130 + - 255 + switch.tplink_a2: + state: 'on' + +- name: studio blue + entities: + light.jeff_lamp: + state: 'on' + brightness: 255 + rgb_color: + - 7 + - 130 + - 255 + light.jeff_dresser_lamp: + state: 'on' + brightness: 255 + light.kat_lamp: + state: 'on' + brightness: 255 + light.master_bedroom_tower_lamp: + state: 'on' + brightness: 255 + rgb_color: + - 7 + - 130 + - 255 + light.desk_accent: + state: 'on' + brightness: 255 + rgb_color: + - 7 + - 130 + - 255 + switch.tplink_a2: + state: 'on' + +- name: studio yellow + entities: + light.jeff_lamp: + state: 'on' + brightness: 255 + rgb_color: + - 255 + - 213 + - 133 + light.jeff_dresser_lamp: + state: 'on' + brightness: 255 + light.kat_lamp: + state: 'on' + brightness: 255 + light.master_bedroom_tower_lamp: + state: 'on' + brightness: 255 + rgb_color: + - 255 + - 213 + - 133 + light.desk_accent: + state: 'on' + brightness: 255 + rgb_color: + - 255 + - 213 + - 133 + switch.tplink_a2: + state: 'on' + + + + - name: all lights on entities: light.kitchen_cabinets: @@ -46,7 +145,7 @@ id: 8ae2129ba4484194ae25880851a10e70 - name: dimished livingroom lighting entities: - light.livingroom_tower: + light.living_room_tower_lamp_level_light_color_on_off: state: 'on' brightness: 40 color_temp: 369 @@ -227,47 +326,47 @@ - name: master bedroom on entities: - light.jeff_lamp_level_light_color_on_off: + light.jeff_lamp: state: 'on' brightness: 255 color_temp: 369 light.kat_lamp: state: 'on' brightness: 255 - light.tower_spotlight_level_on_off: + light.jeff_dresser_lamp: state: 'on' brightness: 255 - light.kitchen_sink_level_light_color_on_off: + light.master_bedroom_tower_lamp: state: 'on' brightness: 255 color_temp: 369 - light.desk_accent_level_light_color_on_off: + light.desk_accent: state: 'off' id: d250bb4c5c1644b0a7064a9f36ffec32 - name: master bedroom off entities: - light.jeff_lamp_level_light_color_on_off: + light.jeff_lamp: state: 'off' light.kat_lamp: state: 'off' - light.tower_spotlight_level_on_off: + light.jeff_dresser_lamp: state: 'off' - light.kitchen_sink_level_light_color_on_off: + light.master_bedroom_tower_lamp: state: 'off' - light.desk_accent_level_light_color_on_off: + light.desk_accent: state: 'off' id: 06e4b59c35f14054ab7e741445b7fd21 - name: master bedroom dim entities: - light.desk_accent_level_light_color_on_off: + light.desk_accent: state: 'off' light.kat_lamp: state: 'off' - light.jeff_lamp_level_light_color_on_off: + light.jeff_lamp: state: 'off' - light.kitchen_sink_level_light_color_on_off: + light.master_bedroom_tower_lamp: state: 'on' rgb_color: - 255 @@ -275,7 +374,7 @@ - 255 color_temp: 369 brightness: 102 - light.tower_spotlight_level_on_off: + light.heff_dresser_lamp: state: 'off' id: 85953e56acc94c8b8614347de8aab96a @@ -289,7 +388,7 @@ - name: skylar room prebed entities: - light.skylars_lamp_level_light_color_on_off: + light.skylar_dresser_lamp: state: 'on' color_temp: 369 brightness: 255 @@ -300,7 +399,7 @@ - 63 - 255 - 0 - switch.rainbow_light_on_off: + switch.rainbow_lamp: state: 'on' id: cc8606f7345f48d59b3c32e900122d75 @@ -315,11 +414,11 @@ - 63 - 255 - 0 - switch.rainbow_light_on_off: + switch.rainbow_lamp: state: 'on' switch.wled_loftbed_nightlight: state: 'on' - light.skylars_lamp_level_light_color_on_off: + light.skylar_dresser_lamp: state: 'off' input_boolean.skylar_awake: state: 'off' @@ -327,7 +426,7 @@ - name: skylar room morning entities: - slight.skylars_lamp_level_light_color_on_off: + light.skylar_dresser_lamp: state: 'on' color_temp: 369 brightness: 38 @@ -335,9 +434,9 @@ - name: skylar room day entities: - slight.skylars_lamp_level_light_color_on_off: + light.skylar_dresser_lamp: state: 'off' - switch.rainbow_light_on_off: + switch.rainbow_lamp: state: 'off' light.wled_loftbed: state: 'off' @@ -345,61 +444,43 @@ - name: studio on entities: - light.jeff_lamp_level_light_color_on_off: + light.jeff_lamp: state: 'on' brightness: 5 - light.tower_spotlight_level_on_off: + light.jeff_dresser_lamp: state: 'on' brightness: 255 light.kat_lamp: state: 'on' brightness: 255 - light.kitchen_sink_level_light_color_on_off: + light.master_bedroom_tower_lamp: state: 'on' brightness: 255 rgb_color: - 7 - 130 - 255 - light.desk_accent_level_light_color_on_off: + light.desk_accent: state: 'on' brightness: 255 rgb_color: - 7 - 130 - 255 - id: 1538d090abe0494d9fa6c225adc83593 + switch.tplink_a2: + state: 'on' + - name: studio off entities: - light.tower_spotlight_level_on_off: + light.jeff_dresser_lamp: state: 'off' - light.desk_accent_level_light_color_on_off: + light.desk_accent: state: 'off' switch.tplink_a2: state: 'off' id: 82791dafcf674b9cbbad6565b3b49b86 -- name: work time - entities: - light.jeff_lamp_level_light_color_on_off: - state: 'on' - brightness: 255 - color_temp: 369 - light.kat_lamp: - state: 'off' - light.tower_spotlight_level_on_off: - state: 'on' - brightness: 255 - light.kitchen_sink_level_light_color_on_off: - state: 'on' - brightness: 255 - color_temp: 369 - light.desk_accent_level_light_color_on_off: - state: 'on' - brightness: 255 - color_temp: 369 - id: e1cb3a90-0423-11eb-adc1-0242ac120002 - name: film time id: film_time @@ -619,21 +700,4 @@ icon: mdi:led-strip-variant supported_features: 55 state: 'off' -- id: '1607288511176' - name: side door off - entities: - light.side_door_light: - friendly_name: Side Door Light Off - assumed_state: true - supported_features: 1 - state: 'off' - brightness: 0 -- id: '160728851117618' - name: side door on - entities: - light.side_door_light: - friendly_name: Side Door Light On - assumed_state: true - supported_features: 1 - state: 'on' - brightness: 255 \ No newline at end of file +