home_automation/Home-Assistant-Configs
2
0
Fork 0
Code Issues 40 Pull Requests Projects Activity

Make dining room lamp scenes work like the rest of the house, close #74

Browse Source
This commit is contained in:
Tony Stork
2023-02-21 16:37:48 -05:00
parent dc9a4a467c
commit 4ea2cc28d5
5 changed files with 101 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
node-red/projects/NerdFlows

Submodule node-red/projects/NerdFlows updated: 1fa57a314a...f0b66f6bec

70
packages/lighting_and_scenes.yaml
View File

@ -88,9 +88,9 @@ input_select:
name: Dining Room Lamp Scenes
options:
- Select
- Full
- Dining Room
- Wall
- Adaptive
- Bright
- Dimmed
- Nightlight
initial: Select
icon: mdi:floor-lamp-dual
@ -416,13 +416,9 @@ automation:
- input_select.tina_lamp_scenes
- input_select.mud_room_scenes
- input_select.downstairs_bathroom_scenes
- input_select.dining_room_lamp_scenes
data:
option: Adaptive
- service: input_select.select_option
target:
entity_id: input_select.dining_room_lamp_scenes
data:
option: Full
- if:
- condition: trigger
id: motion-off
@ -628,19 +624,19 @@ script:
target:
entity_id: input_select.dining_room_lamp_scenes
data:
option: Full
option: Adaptive
else:
- service: switch.turn_on
target:
entity_id: switch.adaptive_lighting_dining_room
entity_id: switch.adaptive_lighting_dining_room_lamp
- service: switch.turn_off
target:
entity_id: switch.adaptive_lighting_sleep_mode_dining_room
entity_id: switch.adaptive_lighting_sleep_mode_dining_room_lamp
- service: input_text.set_value
target:
entity_id: input_text.dining_room_lamp_selected_scene
data:
value: Full
value: Adaptive
- if:
- condition: or
conditions:
@ -871,6 +867,7 @@ script:
- input_select.living_room_scenes
- input_select.downstairs_bathroom_scenes
- input_select.mud_room_scenes
- input_select.dining_room_lamp_scenes
data:
option: Bright
- service: light.turn_on
@ -883,7 +880,6 @@ script:
- service: light.turn_on
target:
entity_id:
- light.dining_room_lamp
- light.tina_lamp
- light.tina_desk_strip
data:
@ -984,7 +980,7 @@ script:
- service: switch.turn_on
target:
entity_id:
- switch.adaptive_lighting_sleep_mode_dining_room
- switch.adaptive_lighting_sleep_mode_dining_room_lamp
- if:
- condition: state
entity_id: person.christina_stork
@ -1214,11 +1210,21 @@ scene:
entities:
input_select.downstairs_bathroom_scenes:
state: "Nightlight"
- name: Full in Dining Room Lamp
- name: Adaptive in Dining Room Lamp
icon: mdi:palette
entities:
input_select.dining_room_lamp_scenes:
state: "Full"
state: "Adaptive"
- name: Bright in Dining Room Lamp
icon: mdi:palette
entities:
input_select.dining_room_lamp_scenes:
state: "Bright"
- name: Dimmed in Dining Room Lamp
icon: mdi:palette
entities:
input_select.dining_room_lamp_scenes:
state: "Dimmed"
- name: Nightlight in Dining Room Lamp
icon: mdi:palette
entities:
@ -1513,34 +1519,4 @@ scene:
icon: mdi:palette
entities:
input_select.basement_studio_scenes:
state: "Stairwell"
- name: Night Mode on First Floor
icon: mdi:palette
entities:
light.living_room_lights:
state: "off"
light.downstairs_bathroom_lights:
state: "off"
switch.adaptive_lighting_dining_room:
state: "off"
input_select.tina_lamp_scenes:
state: "Nightlight"
input_select.dining_room_lamp_scenes:
state: "Nightlight"
input_select.mud_room_scenes:
state: "Nightlight"
- name: Night Mode on Second Floor
icon: mdi:palette
entities:
light.master_bedroom_lights:
state: "off"
light.master_bedroom_closet:
state: "off"
light.kallen_bedroom_lights:
state: "off"
light.emma_bedroom_light:
state: "off"
input_select.upstairs_hallway_scenes:
state: "Nightlight"
input_select.upstairs_bathroom_scenes:
state: "Nightlight"
state: "Stairwell"

23
packages/presence.yaml
View File

@ -520,7 +520,7 @@ script:
- switch.adaptive_lighting_basement_studio
- switch.adaptive_lighting_living_room
- switch.adaptive_lighting_downstairs_bathroom
- switch.adaptive_lighting_dining_room
- switch.adaptive_lighting_dining_room_lamp
- switch.adaptive_lighting_tina_lamp
- switch.adaptive_lighting_mud_room
- switch.adaptive_lighting_upstairs_hallway
@ -541,13 +541,9 @@ script:
- input_text.master_bedroom_selected_scene
- input_text.kallen_bedroom_selected_scene
- input_text.emma_bedroom_selected_scene
- input_text.dining_room_lamp_selected_scene
data:
value: Adaptive
- service: input_text.set_value
target:
entity_id: input_text.dining_room_lamp_selected_scene
data:
value: Full
- service: media_player.turn_off
target:
entity_id: media_player.living_room_tv
@ -598,16 +594,9 @@ script:
entity_id:
- input_select.living_room_scenes
- input_select.mud_room_scenes
- input_select.dining_room_scenes
data:
option: Adaptive
- service: input_boolean.turn_on
target:
entity_id: input_boolean.tina_desk_lights
- service: input_select.select_option
target:
entity_id: input_select.dining_room_lamp_scenes
data:
option: Full
- service: light.turn_off
target:
area_id:
@ -662,13 +651,9 @@ script:
entity_id:
- input_select.living_room_scenes
- input_select.mud_room_scenes
- input_select.dining_room_lamp_scenes
data:
option: Adaptive
- service: input_select.select_option
target:
entity_id: input_select.dining_room_lamp_scenes
data:
option: Full
- service: input_select.select_option
target:
entity_id: input_select.upstairs_bathroom_scenes

251
scenes.yaml
View File

@ -1,185 +1,3 @@
- id: '1644453456591'
name: Dining Room Lamp - Dining Room
entities:
light.dining_room_lamp_blue:
effect_list: []
supported_color_modes:
- brightness
color_mode: brightness
brightness: 255
friendly_name: Dining Room Lamp - Blue
supported_features: 5
state: 'on'
light.dining_room_lamp_green:
effect_list: []
supported_color_modes:
- brightness
color_mode: brightness
brightness: 255
friendly_name: Dining Room Lamp - Green
supported_features: 5
state: 'on'
light.dining_room_lamp_purple:
effect_list: []
supported_color_modes:
- brightness
color_mode: brightness
brightness: 255
friendly_name: Dining Room Lamp - Purple
supported_features: 5
state: 'on'
light.dining_room_lamp_red:
effect_list: []
supported_color_modes:
- brightness
friendly_name: Dining Room Lamp - Red
supported_features: 5
state: 'off'
light.dining_room_lamp_white:
effect_list: []
supported_color_modes:
- brightness
friendly_name: Dining Room Lamp - White
supported_features: 5
state: 'off'
- id: '1644453738500'
name: Dining Room Lamp - Nightlight
entities:
light.dining_room_lamp_blue:
effect_list: []
supported_color_modes:
- brightness
color_mode: brightness
brightness: 3
friendly_name: Dining Room Lamp - Blue
supported_features: 5
state: 'on'
light.dining_room_lamp_green:
effect_list: []
supported_color_modes:
- brightness
color_mode: brightness
brightness: 3
friendly_name: Dining Room Lamp - Green
supported_features: 5
state: 'on'
light.dining_room_lamp_purple:
effect_list: []
supported_color_modes:
- brightness
color_mode: brightness
brightness: 3
friendly_name: Dining Room Lamp - Purple
supported_features: 5
state: 'on'
light.dining_room_lamp_red:
effect_list: []
supported_color_modes:
- brightness
color_mode: brightness
brightness: 3
friendly_name: Dining Room Lamp - Red
supported_features: 5
state: 'on'
light.dining_room_lamp_white:
effect_list: []
supported_color_modes:
- brightness
color_mode: brightness
brightness: 3
friendly_name: Dining Room Lamp - White
supported_features: 5
state: 'on'
- id: '1644456456481'
name: Dining Room Lamp - Wall
entities:
light.dining_room_lamp_blue:
effect_list: []
supported_color_modes:
- brightness
friendly_name: Dining Room Lamp - Blue
supported_features: 5
state: 'off'
light.dining_room_lamp_green:
effect_list: []
supported_color_modes:
- brightness
friendly_name: Dining Room Lamp - Green
supported_features: 5
state: 'off'
light.dining_room_lamp_purple:
effect_list: []
supported_color_modes:
- brightness
color_mode: brightness
brightness: 255
friendly_name: Dining Room Lamp - Purple
supported_features: 5
state: 'on'
light.dining_room_lamp_red:
effect_list: []
supported_color_modes:
- brightness
color_mode: brightness
brightness: 255
friendly_name: Dining Room Lamp - Red
supported_features: 5
state: 'on'
light.dining_room_lamp_white:
effect_list: []
supported_color_modes:
- brightness
friendly_name: Dining Room Lamp - White
supported_features: 5
state: 'off'
- id: '1644456690376'
name: Dining Room Lamp - Full
entities:
light.dining_room_lamp_blue:
effect_list: []
supported_color_modes:
- brightness
color_mode: brightness
brightness: 255
friendly_name: Dining Room Lamp - Blue
supported_features: 5
state: 'on'
light.dining_room_lamp_green:
effect_list: []
supported_color_modes:
- brightness
color_mode: brightness
brightness: 255
friendly_name: Dining Room Lamp - Green
supported_features: 5
state: 'on'
light.dining_room_lamp_purple:
effect_list: []
supported_color_modes:
- brightness
color_mode: brightness
brightness: 255
friendly_name: Dining Room Lamp - Purple
supported_features: 5
state: 'on'
light.dining_room_lamp_red:
effect_list: []
supported_color_modes:
- brightness
color_mode: brightness
brightness: 255
friendly_name: Dining Room Lamp - Red
supported_features: 5
state: 'on'
light.dining_room_lamp_white:
effect_list: []
supported_color_modes:
- brightness
color_mode: brightness
brightness: 255
friendly_name: Dining Room Lamp - White
supported_features: 5
state: 'on'
- id: '1646251729325'
name: Basement Studio - Energize
entities:
@ -1599,3 +1417,72 @@
entity_only: false
light.kallen_bedroom_overhead:
entity_only: false
- id: '1677005075590'
name: Dining Room Lamp Bright
entities:
light.dining_room_lamp:
effect_list: []
supported_color_modes:
- brightness
entity_id:
- 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
icon: mdi:lightbulb-group
friendly_name: Dining Room Lamp
supported_features: 4
color_mode: brightness
brightness: 255
state: 'on'
icon: mdi:palette
metadata:
light.dining_room_lamp:
entity_only: true
- id: '1677005153043'
name: Dining Room Lamp Dimmed
entities:
light.dining_room_lamp:
effect_list: []
supported_color_modes:
- brightness
entity_id:
- 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
icon: mdi:lightbulb-group
friendly_name: Dining Room Lamp
supported_features: 4
color_mode: brightness
brightness: 83
state: 'on'
icon: mdi:palette
metadata:
light.dining_room_lamp:
entity_only: true
- id: '1677005203818'
name: Dining Room Lamp Nightlight
entities:
light.dining_room_lamp:
effect_list: []
supported_color_modes:
- brightness
entity_id:
- 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
icon: mdi:lightbulb-group
friendly_name: Dining Room Lamp
supported_features: 4
color_mode: brightness
brightness: 3
state: 'on'
icon: mdi:palette
metadata:
light.dining_room_lamp:
entity_only: true

12
scripts.yaml
View File

@ -183,7 +183,7 @@ max_brightness:
- switch.adaptive_lighting_mud_room
- switch.adaptive_lighting_emma_bedroom
- switch.adaptive_lighting_upstairs_hallway
- switch.adaptive_lighting_dining_room
- switch.adaptive_lighting_dining_room_lamp
- switch.adaptive_lighting_upstairs_bathroom
- switch.adaptive_lighting_downstairs_bathroom
- switch.adaptive_lighting_tina_lamp
@ -415,7 +415,7 @@ max_brightness_cleanup:
- switch.adaptive_lighting_mud_room
- switch.adaptive_lighting_emma_bedroom
- switch.adaptive_lighting_upstairs_hallway
- switch.adaptive_lighting_dining_room
- switch.adaptive_lighting_dining_room_lamp
- switch.adaptive_lighting_upstairs_bathroom
- switch.adaptive_lighting_downstairs_bathroom
- switch.adaptive_lighting_tina_lamp
@ -547,7 +547,7 @@ freeze_cleanup:
target:
entity_id:
- switch.adaptive_lighting_basement_studio
- switch.adaptive_lighting_dining_room
- switch.adaptive_lighting_dining_room_lamp
- switch.adaptive_lighting_downstairs_bathroom
- switch.adaptive_lighting_front_porch
- switch.adaptive_lighting_kallen_bedroom
@ -574,11 +574,7 @@ freeze_cleanup:
- input_text.tina_lamp_selected_scene
- input_text.upstairs_bathroom_selected_scene
- input_text.upstairs_hallway_selected_scene
- service: input_text.set_value
data:
value: Full
target:
entity_id: input_text.dining_room_lamp_selected_scene
- input_text.dining_room_lamp_selected_scene
- service: media_player.volume_set
data:
volume_level: 0.6