diff --git a/config/groups.yaml b/config/groups.yaml index 8170d52..cf10fcc 100755 --- a/config/groups.yaml +++ b/config/groups.yaml @@ -19,12 +19,10 @@ House Conditions: - sensor.accurite_garage_humidity occupancy: - - binary_sensor.kitchen_occupancy - - binary_sensor.living_room_occupancy - - binary_sensor.master_bedroom_occupancy - - binary_sensor.skylar_room_occupancy + - binary_sensor.kitchen_motion_occupancy + - binary_sensor.lumi_lumi_sensor_motion_aq2_occupancy + - binary_sensor.master_bedroom_motion_occupancy - binary_sensor.croft_occupancy - - binary_sensor.theater_occupancy audio_devices: - media_player.kitchen_display @@ -34,7 +32,7 @@ audio_devices: Outside Lights: - switch.driveway_light - switch.front_porch_light - - light.cree_side_door_light + - light.cree_side_door_lightlevel_on_off External Doors: - binary_sensor.side_door @@ -63,23 +61,26 @@ livingroom lamps: - light.front_door_lamp_level_light_color_on_off incense: - - switch.incense - - switch.artemis - switch.forest_incense_on_off + - switch.innr1_on_off + - switch.incense all fans: - switch.croft_fan - switch.livingroom_fan Skylars Bedroom: - - switch.forest # skylars tower + - light.skylars_lamp_level_light_color_on_off # skylars lamp - switch.rainbow_light_on_off # rainbow light - light.wled_loftbed Master Bedroom: - - light.jeff_lamp - - switch.kat_lamp_on_off - + - light.jeff_lamp_level_light_color_on_off + - light.tower_spotlight_level_on_off + - light.kat_lamp + - light.kitchen_sink_level_light_color_on_off + - light.desk_accent_level_light_color_on_off + - switch.tplink_a2 kitchen: - light.kitchen_cabinets diff --git a/config/lights.yaml b/config/lights.yaml index 8ab6d02..c2c474f 100644 --- a/config/lights.yaml +++ b/config/lights.yaml @@ -8,7 +8,7 @@ brightness_scale: 99 brightness_state_topic: "zwave2mqtt/side_door_bulb/38/1/0" on_command_type: "brightness" - payload_off: 0 + payload_off: '0' # Kitchen @@ -19,17 +19,17 @@ brightness_scale: 99 brightness_state_topic: "zwave2mqtt/kitchen_cabinets/38/1/0" on_command_type: "brightness" - payload_off: 0 + payload_off: '0' retain: true - platform: mqtt - name: "Jeff Lamp" + 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 + payload_off: '0' retain: true @@ -42,5 +42,5 @@ brightness_scale: 99 brightness_state_topic: "zwave2mqtt/theater/38/1/0" on_command_type: "brightness" - payload_off: 0 + payload_off: '0' retain: true diff --git a/config/packages/daily.yaml b/config/packages/daily.yaml index 7c35f96..52752ea 100755 --- a/config/packages/daily.yaml +++ b/config/packages/daily.yaml @@ -295,8 +295,7 @@ automation: action: - service: scene.turn_on entity_id: scene.skylar_room_day - - service: scene.turn_on - entity_id: scene.master_bedroom_off + - id: 86fd5de9-3136-4d86-aef9-268f097eae35 @@ -413,4 +412,4 @@ script: - condition: state entity_id: group.garage_doors state: 'on' - - service: script.driveway_all_on \ No newline at end of file + - service: script.driveway_on \ No newline at end of file diff --git a/config/packages/lighting.yaml b/config/packages/lighting.yaml index d27adc9..a82b957 100755 --- a/config/packages/lighting.yaml +++ b/config/packages/lighting.yaml @@ -8,19 +8,44 @@ automation: + # Kitchen lights needed when dark and there is motion + - id: e1cb3d56-0423-11eb-adc1-0242ac120002 + alias: Living Room Lights Needed + initial_state: true + trigger: + - entity_id: binary_sensor.kitchen_motion_2 + from: 'off' + platform: state + to: 'on' + - entity_id: binary_sensor.kitchen_motion + from: 'off' + platform: state + to: 'on' + condition: + - below: 70 + condition: numeric_state + entity_id: sensor.kitchen_illuminance + - condition: time + after: '05:30:00' + before: '22:30:00' + action: + - service: scene.turn_on + data: + entity_id: scene.normal_kitchen_lighting + # Living lights needed when dark and there is motion - id: e1c9379a-0423-11eb-adc1-0242ac120002 alias: Living Room Lights Needed initial_state: true trigger: - - entity_id: binary_sensor.0x00158d0002751bb4_occupancy + - entity_id: binary_sensor.lumi_lumi_sensor_motion_aq2_ias_zone from: 'off' platform: state to: 'on' condition: - below: 50 condition: numeric_state - entity_id: sensor.0x00158d0002751bb4_illuminance + entity_id: sensor.lumi_lumi_sensor_motion_aq2_illuminance - condition: time after: '05:30:00' before: '22:30:00' @@ -35,23 +60,17 @@ automation: alias: Inside Lights Not Needed initial_state: true trigger: - - entity_id: sensor.0x00158d0002751bb4_illuminance + - entity_id: sensor.lumi_lumi_sensor_motion_aq2_illuminance above: 99 platform: numeric_state condition: - condition: state - entity_id: light.kitchen_cabinets - state: "on" - - condition: state - entity_id: light.0xb0ce18140003608a_light + entity_id: light.living_room_tower_lamp_level_light_color_on_off state: "on" action: - service: scene.turn_on data: entity_id: scene.livingroom_lighting_off - - service: scene.turn_on - data: - entity_id: scene.kitchen_lighting_off - service: script.twitter_notify data: message: >- @@ -112,7 +131,7 @@ script: entity_id: switch.driveway_light service: switch.turn_on - data: - entity_id: light.side_door_light + entity_id: light.cree_side_door_lightlevel_on_off service: light.turn_on driveway_off: @@ -128,7 +147,7 @@ script: - service: switch.turn_off entity_id: switch.driveway_light - service: light.turn_off - entity_id: light.side_door_light + entity_id: light.cree_side_door_lightlevel_on_off # Turn on Living Room Lights if sun is down or cloud coverage is above 70% livingroom_lamps_on: diff --git a/config/scenes.yaml b/config/scenes.yaml index 2b2c046..96a1ecd 100755 --- a/config/scenes.yaml +++ b/config/scenes.yaml @@ -202,7 +202,7 @@ rgb_color: - 65 - 105 - - 255 + - 255g id: b76a807484234e2382443165742f2db6 - name: tower lamp red entities: @@ -224,47 +224,72 @@ - 128 - 0 id: c70ecd369eae4513b69a875ad54a53e0 + - name: master bedroom on entities: - light.jeff_lamp: + light.jeff_lamp_level_light_color_on_off: state: 'on' brightness: 255 - switch.kat_lamp_on_off: + color_temp: 369 + light.kat_lamp: state: 'on' + brightness: 255 light.tower_spotlight_level_on_off: + state: 'off' + light.kitchen_sink_level_light_color_on_off: state: 'on' - brightness: 77 + brightness: 255 + color_temp: 369 + light.desk_accent_level_light_color_on_off: + state: 'off' id: d250bb4c5c1644b0a7064a9f36ffec32 + - name: master bedroom off entities: - light.jeff_lamp: + light.jeff_lamp_level_light_color_on_off: state: 'off' - switch.kat_lamp_on_off: + light.kat_lamp: state: 'off' light.tower_spotlight_level_on_off: state: 'off' + light.kitchen_sink_level_light_color_on_off: + state: 'off' + light.desk_accent_level_light_color_on_off: + state: 'off' id: 06e4b59c35f14054ab7e741445b7fd21 + - name: master bedroom dim entities: - light.tower_spotlight_level_on_off: + light.desk_accent_level_light_color_on_off: + state: 'off' + light.kat_lamp: + state: 'off' + light.jeff_lamp_level_light_color_on_off: + state: 'off' + light.kitchen_sink_level_light_color_on_off: state: 'on' - brightness: 38 - switch.kat_lamp_on_off: - state: 'off' - light.jeff_lamp: - state: 'off' + rgb_color: + - 255 + - 255 + - 255 + color_temp: 369 + brightness: 102 id: 85953e56acc94c8b8614347de8aab96a + - name: santa protocol entities: - switch.christmas_tree: + switch.kasa2: state: 'on' switch.rail_lights: state: 'on' id: 76d0eb7f2e194ecab470de1f38203ce6 + - name: skylar room prebed entities: - switch.forest: + light.skylars_lamp_level_light_color_on_off: state: 'on' + color_temp: 369 + brightness: 255 light.wled_loftbed: state: 'on' brightness: 255 @@ -275,6 +300,7 @@ switch.rainbow_light_on_off: state: 'on' id: cc8606f7345f48d59b3c32e900122d75 + - name: skylar room sleep entities: input_boolean.audible_notifications: @@ -290,42 +316,75 @@ state: 'on' switch.wled_loftbed_nightlight: state: 'on' - switch.forest: + light.skylars_lamp_level_light_color_on_off: state: 'off' input_boolean.skylar_awake: state: 'off' id: f4e8d2f594c446ee9f0e41cf46dc1c72 + - name: skylar room morning entities: - switch.forest: + slight.skylars_lamp_level_light_color_on_off: state: 'on' + color_temp: 369 + brightness: 38 id: dca10298716d46ad86cb894bfac295a5 + - name: skylar room day entities: - switch.forest: + slight.skylars_lamp_level_light_color_on_off: state: 'off' switch.rainbow_light_on_off: state: 'off' + light.wled_loftbed: + state: 'off' id: b25b0c6dcec049929b2bde5d08f3ce53 -- name: jeff desk on + +- name: studio on entities: - light.tower_accent_level_light_color_on_off: + light.jeff_lamp_level_light_color_on_off: state: 'on' brightness: 255 - light.desk_accent_level_light_color_on_off: - state: 'on' - brightness: 77 light.tower_spotlight_level_on_off: state: 'on' - brightness: 77 + brightness: 38 + light.kat_lamp: + state: 'on' + brightness: 255 + light.kitchen_sink_level_light_color_on_off: + state: 'on' + brightness: 255 + rgb_color: + - 10 + - 0 + - 255 + light.desk_accent_level_light_color_on_off: + state: 'on' + brightness: 255 id: 1538d090abe0494d9fa6c225adc83593 -- name: jeff desk off + +- name: studio off entities: - light.0xb0ce18140003b334_light: + light.tower_spotlight_level_on_off: state: 'off' - light.0xb0ce1814035bb3f0_light: + light.desk_accent_level_light_color_on_off: + state: 'off' + switch.tplink_a2: state: 'off' id: 82791dafcf674b9cbbad6565b3b49b86 + +- name: film time + id: film_time + entities: + switch.tplink_a2: + state: 'on' + +- name: film time over + id: film_time_over + entities: + switch.tplink_a2: + state: 'off' + - name: lr_cool_white entities: group.rgb_lr: @@ -353,17 +412,7 @@ - 40 - 0 id: 8018cda7184d43148370ef32fc474228 -- name: normal audio - entities: - media_player.tsr_6750_a3ed2f: - state: 'on' - source: HDMI1 - id: fd8de445a54447b6ac4750333790c8d3 -- name: quiet audio - entities: - media_player.tsr_6750_a3ed2f: - state: 'off' - id: 9d88c3bce2374ceebbbfa716be1b3efb + - name: theater dark entities: group.theater_lights: