Grabbed Merkury bulbs for dining room lamp, rewrote things accordingly

This commit is contained in:
2022-02-08 18:35:06 -05:00
parent b6da2f4dea
commit efdc701b49
3 changed files with 54 additions and 29 deletions

View File

@ -58,6 +58,14 @@ light:
- light.basement_stairwell - light.basement_stairwell
- light.basement_tall_lamp - light.basement_tall_lamp
- light.basement_short_lamp - light.basement_short_lamp
- platform: group
name: Dining Room Lamp
entities:
- light.dining_room_lamp_blue
- light.dining_room_lamp_green
- light.dining_room_lamp_purple
- light.dining_room_lamp_red
- light.dining_room_lamp_white
frontend: frontend:
themes: !include_dir_merge_named themes themes: !include_dir_merge_named themes

View File

@ -19,7 +19,7 @@ Presence Simulation:
First Floor Light Group: First Floor Light Group:
- light.living_room_lights - light.living_room_lights
- light.mud_room_overhead - light.mud_room_overhead
- switch.dining_room_lamp - light.dining_room_lamp
Second Floor Light Group: Second Floor Light Group:
- light.kallen_bedroom_light - light.kallen_bedroom_light

View File

@ -3,10 +3,10 @@ start_netflix:
sequence: sequence:
- service: switch.turn_on - service: switch.turn_on
target: target:
entity_id: switch.adaptive_lighting_sleep_mode_living_room entity_id:
- service: switch.turn_off - switch.adaptive_lighting_sleep_mode_living_room
target: - switch.adaptive_lighting_sleep_mode_dining_room
entity_id: switch.dining_room_lamp data: {}
- service: media_player.select_source - service: media_player.select_source
target: target:
entity_id: media_player.living_room_firetv entity_id: media_player.living_room_firetv
@ -24,20 +24,21 @@ stop_netflix:
source: '!com.netflix.ninja' source: '!com.netflix.ninja'
- service: switch.turn_off - service: switch.turn_off
target: target:
entity_id: switch.adaptive_lighting_sleep_mode_living_room entity_id:
- switch.adaptive_lighting_sleep_mode_living_room
- switch.adaptive_lighting_sleep_mode_dining_room
data: {}
mode: single mode: single
icon: mdi:netflix icon: mdi:netflix
give_me_darkness: give_me_darkness:
alias: Give Me Darkness alias: Give Me Darkness
sequence: sequence:
- service: switch.turn_off
target:
entity_id: switch.dining_room_lamp
- service: switch.turn_on - service: switch.turn_on
target: target:
entity_id: entity_id:
- switch.adaptive_lighting_sleep_mode_upstairs_hallway - switch.adaptive_lighting_sleep_mode_upstairs_hallway
- switch.adaptive_lighting_sleep_mode_mud_room - switch.adaptive_lighting_sleep_mode_mud_room
data: {}
- service: light.turn_off - service: light.turn_off
target: target:
device_id: device_id:
@ -46,6 +47,8 @@ give_me_darkness:
area_id: area_id:
- kallen_bedroom - kallen_bedroom
- master_bedroom - master_bedroom
entity_id: light.dining_room_lamp
data: {}
mode: single mode: single
icon: mdi:weather-night icon: mdi:weather-night
start_youtube: start_youtube:
@ -53,10 +56,10 @@ start_youtube:
sequence: sequence:
- service: switch.turn_on - service: switch.turn_on
target: target:
entity_id: switch.adaptive_lighting_sleep_mode_living_room entity_id:
- service: switch.turn_off - switch.adaptive_lighting_sleep_mode_living_room
target: - switch.adaptive_lighting_sleep_mode_dining_room
entity_id: switch.dining_room_lamp data: {}
- service: media_player.select_source - service: media_player.select_source
target: target:
entity_id: media_player.living_room_firetv entity_id: media_player.living_room_firetv
@ -74,7 +77,10 @@ stop_youtube:
source: '!com.amazon.firetv.youtube' source: '!com.amazon.firetv.youtube'
- service: switch.turn_off - service: switch.turn_off
target: target:
entity_id: switch.adaptive_lighting_sleep_mode_living_room entity_id:
- switch.adaptive_lighting_sleep_mode_living_room
- switch.adaptive_lighting_sleep_mode_dining_room
data: {}
mode: single mode: single
icon: mdi:youtube icon: mdi:youtube
start_twitch: start_twitch:
@ -82,10 +88,10 @@ start_twitch:
sequence: sequence:
- service: switch.turn_on - service: switch.turn_on
target: target:
entity_id: switch.adaptive_lighting_sleep_mode_living_room entity_id:
- service: switch.turn_off - switch.adaptive_lighting_sleep_mode_living_room
target: - switch.adaptive_lighting_sleep_mode_dining_room
entity_id: switch.dining_room_lamp data: {}
- service: media_player.select_source - service: media_player.select_source
target: target:
entity_id: media_player.living_room_firetv entity_id: media_player.living_room_firetv
@ -103,7 +109,10 @@ stop_twitch:
source: '!tv.twitch.android.viewer' source: '!tv.twitch.android.viewer'
- service: switch.turn_off - service: switch.turn_off
target: target:
entity_id: switch.adaptive_lighting_sleep_mode_living_room entity_id:
- switch.adaptive_lighting_sleep_mode_living_room
- switch.adaptive_lighting_sleep_mode_dining_room
data: {}
mode: single mode: single
icon: mdi:twitch icon: mdi:twitch
start_spotify: start_spotify:
@ -143,12 +152,12 @@ goodnight:
- mud_room - mud_room
- nursery - nursery
- living_room - living_room
- dining_room
data: {} data: {}
- service: switch.turn_off - service: switch.turn_off
target: target:
area_id: area_id:
- basement_studio - basement_studio
entity_id: switch.dining_room_lamp
data: {} data: {}
- service: switch.turn_on - service: switch.turn_on
target: target:
@ -187,12 +196,12 @@ family_is_away:
- mud_room - mud_room
- nursery - nursery
- upstairs_hallway - upstairs_hallway
- service: switch.turn_off - dining_room
target: data: {}
entity_id: switch.dining_room_lamp
- service: alarm_control_panel.alarm_arm_away - service: alarm_control_panel.alarm_arm_away
target: target:
entity_id: alarm_control_panel.alexa_guard_9ee3b entity_id: alarm_control_panel.alexa_guard_9ee3b
data: {}
mode: single mode: single
icon: mdi:shield-lock icon: mdi:shield-lock
family_is_home: family_is_home:
@ -201,14 +210,17 @@ family_is_home:
- service: switch.turn_off - service: switch.turn_off
target: target:
entity_id: switch.presence_simulation entity_id: switch.presence_simulation
data: {}
- service: alarm_control_panel.alarm_disarm - service: alarm_control_panel.alarm_disarm
target: target:
entity_id: alarm_control_panel.alexa_guard_9ee3b entity_id: alarm_control_panel.alexa_guard_9ee3b
data: {}
- service: switch.turn_off - service: switch.turn_off
target: target:
entity_id: entity_id:
- switch.basement_echo_dot_do_not_disturb_switch - switch.basement_echo_dot_do_not_disturb_switch
- switch.living_room_echo_dot_do_not_disturb_switch - switch.living_room_echo_dot_do_not_disturb_switch
data: {}
- condition: sun - condition: sun
after: sunset after: sunset
after_offset: -00:30 after_offset: -00:30
@ -221,15 +233,14 @@ family_is_home:
- master_bedroom - master_bedroom
- upstairs_hallway - upstairs_hallway
- basement_studio - basement_studio
- service: switch.turn_on data: {}
target:
entity_id: switch.dining_room_lamp
- service: light.turn_on - service: light.turn_on
data: {} data: {}
target: target:
entity_id: entity_id:
- light.living_room_lights - light.living_room_lights
- light.mud_room_overhead - light.mud_room_overhead
- light.dining_room_lamp
mode: single mode: single
icon: mdi:home-account icon: mdi:home-account
reading_timer_cancel: reading_timer_cancel:
@ -254,6 +265,8 @@ global_off:
- mud_room - mud_room
- nursery - nursery
- upstairs_hallway - upstairs_hallway
- dining_room
data: {}
- service: switch.turn_off - service: switch.turn_off
target: target:
area_id: area_id:
@ -262,6 +275,7 @@ global_off:
- kallen_bedroom - kallen_bedroom
- living_room - living_room
- master_bedroom - master_bedroom
data: {}
mode: single mode: single
icon: mdi:earth-off icon: mdi:earth-off
global_on: global_on:
@ -278,6 +292,8 @@ global_on:
- mud_room - mud_room
- nursery - nursery
- upstairs_hallway - upstairs_hallway
- dining_room
data: {}
- service: switch.turn_on - service: switch.turn_on
target: target:
area_id: area_id:
@ -286,6 +302,7 @@ global_on:
- kallen_bedroom - kallen_bedroom
- living_room - living_room
- master_bedroom - master_bedroom
data: {}
mode: single mode: single
icon: mdi:earth icon: mdi:earth
max_brightness: max_brightness:
@ -300,6 +317,8 @@ max_brightness:
- switch.adaptive_lighting_mud_room - switch.adaptive_lighting_mud_room
- switch.adaptive_lighting_nursery - switch.adaptive_lighting_nursery
- switch.adaptive_lighting_upstairs_hallway - switch.adaptive_lighting_upstairs_hallway
- switch.adaptive_lighting_dining_room
data: {}
- delay: - delay:
hours: 0 hours: 0
minutes: 0 minutes: 0
@ -315,11 +334,9 @@ max_brightness:
- mud_room - mud_room
- nursery - nursery
- upstairs_hallway - upstairs_hallway
- dining_room
data: data:
brightness_pct: 100 brightness_pct: 100
- service: switch.turn_on
target:
entity_id: switch.dining_room_lamp
- service: light.turn_on - service: light.turn_on
target: target:
area_id: basement_studio area_id: basement_studio