Change entities for merging dining room into living room

This commit is contained in:
2024-06-09 20:05:29 -04:00
parent 0cdf008b67
commit d380ee34af
10 changed files with 37 additions and 326 deletions

View File

@ -270,7 +270,6 @@ script:
- light.tina_desk_strip
- light.tina_lamp_side
- light.tina_lamp_top
- light.dining_room_lamp
- light.mud_room_overhead
- light.basement_led_strip_1
- light.basement_tall_lamp
@ -298,7 +297,6 @@ script:
service: light.turn_off
target:
entity_id:
- light.dining_room_lamp
- light.mud_room_overhead
- alias: "Set color lights to purple"
service: light.turn_on

View File

@ -19,13 +19,13 @@ template:
- name: Kallen Fan - Separate Schedule
unique_id: 3f243861-6a1f-412f-b9e3-933b54793b08
state: "{{ states('input_datetime.kallen_fan') != states('input_datetime.kallen_bedtime') }}"
- name: Living Room Hot
- name: Living Room Front Hot
unique_id: 8fd9db5e-7883-42f3-8918-e78d52c680c6
state: "{{ states('sensor.living_room_temperature') | float >= 80 }}"
state: "{{ states('sensor.living_room_front_temperature') | float >= 80 }}"
device_class: heat
- name: Living Room Cold
- name: Living Room Front Cold
unique_id: 48494ec8-a63f-4244-b619-ff78c44f28e8
state: "{{ states('sensor.living_room_temperature') | float <= 60 }}"
state: "{{ states('sensor.living_room_front_temperature') | float <= 60 }}"
device_class: cold
- name: Downstairs Bathroom Hot
unique_id: b68adefa-e30e-4454-be21-2743af0f1674
@ -67,13 +67,13 @@ template:
unique_id: 985f4f8c-2297-4d32-ace7-818534c5e4b5
state: "{{ states('sensor.basement_studio_temperature') | float <= 60 }}"
device_class: cold
- name: Dining Room Hot
unique_id: 2d1a67a5-ea39-470c-9a3c-b449e0d90bdb
state: "{{ states('sensor.dining_room_temperature') | float >= 80 }}"
- name: Living Room Back Hot
unique_id: 9a2be430-9322-492b-a0c1-bb0f034979f5
state: "{{ states('sensor.living_room_back_temperature') | float >= 80 }}"
device_class: heat
- name: Dining Room Cold
unique_id: ce183fac-642a-402c-8f43-de82da75f0b0
state: "{{ states('sensor.dining_room_temperature') | float <= 60 }}"
- name: Living Room Back Cold
unique_id: 524c2ad1-1f44-42c0-b06b-28a40d439832
state: "{{ states('sensor.living_room_back_temperature') | float <= 60 }}"
device_class: cold
- name: Mud Room Hot
unique_id: 920fa45e-8c6e-4518-9aea-5141e15a4350

View File

@ -98,13 +98,6 @@ input_number:
step: 1
unit_of_measurement: minutes
icon: mdi:timer
dining_room_lights_off_delay:
name: Dining Room Lights Off Delay
min: 0
max: 30
step: 1
unit_of_measurement: minutes
icon: mdi:timer
mud_room_lights_off_delay:
name: Mud Room Lights Off Delay
min: 0
@ -182,13 +175,6 @@ input_number:
step: 5
unit_of_measurement: lx
icon: mdi:sun-wireless
dining_room_lux_threshold:
name: Dining Room Lux Threshold
min: 0
max: 100
step: 5
unit_of_measurement: lx
icon: mdi:sun-wireless
mud_room_lux_threshold:
name: Mud Room Lux Threshold
min: 0
@ -303,13 +289,6 @@ input_number:
step: 5
unit_of_measurement: '%'
icon: mdi:brightness-percent
nighttime_brightness_dining_room_lamp:
name: Nighttime Brightness Dining Room Lamp
min: 0
max: 100
step: 5
unit_of_measurement: '%'
icon: mdi:brightness-percent
nighttime_brightness_tina_lamp:
name: Nighttime Brightness Tina Lamp
min: 0
@ -391,16 +370,6 @@ input_select:
- Nightlight
initial: Select
icon: hue:room-other
dining_room_lamp_scenes:
name: Dining Room Lamp Scenes
options:
- Select
- Adaptive
- Bright
- Dimmed
- Nightlight
initial: Select
icon: mdi:floor-lamp-dual
upstairs_hallway_scenes:
name: Upstairs Hallway Scenes
options:
@ -539,8 +508,6 @@ input_text:
name: Living Room Selected Scene
mud_room_selected_scene:
name: Mud Room Selected Scene
dining_room_lamp_selected_scene:
name: Dining Room Lamp Selected Scene
upstairs_hallway_selected_scene:
name: Upstairs Hallway Selected Scene
kallen_bedroom_selected_scene:
@ -950,26 +917,6 @@ scene:
entities:
input_select.downstairs_bathroom_scenes:
state: "Nightlight"
- name: Adaptive in Dining Room Lamp
icon: mdi:palette
entities:
input_select.dining_room_lamp_scenes:
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:
input_select.dining_room_lamp_scenes:
state: "Nightlight"
- name: Adaptive in Tina Lamp
icon: mdi:palette
entities:

View File

@ -186,14 +186,7 @@ template:
unique_id: 25623e3d-d74f-471e-8c2d-abce16646282
device_class: occupancy
state: >
{{ is_state('binary_sensor.living_room_motion','on') }}
delay_off: "00:15:00"
- name: Dining Room Occupied
unique_id: 6ac3017a-98f8-4e84-bcd7-6a9b2ab5b0e2
device_class: occupancy
state: >
{{ is_state('binary_sensor.dining_room_motion','on') or
is_state('binary_sensor.tina_desk_occupied','on') }}
{{ is_state('binary_sensor.living_room_front_motion','on') or is_state('binary_sensor.living_room_back_motion','on')}}
delay_off: "00:15:00"
- name: "Downstairs Bathroom Occupied"
unique_id: fad33281-1c1a-4362-93e6-398334358027
@ -408,7 +401,6 @@ automation:
# snapshot_entities:
# - light.living_room_overhead
# - light.living_room_led_strip
# - light.dining_room_lamp
# - light.tina_lamp_top
# - light.tina_lamp_side
# - light.tina_desk_strip
@ -425,10 +417,6 @@ automation:
# entity_id:
# - switch.adaptive_lighting_tina_lamp
# - switch.adaptive_lighting_living_room
# - alias: "Turn dining room lamp off"
# service: light.turn_off
# target:
# entity_id: light.dining_room_lamp
# - alias: "Turn Lights On"
# service: light.turn_on
# target:
@ -738,7 +726,6 @@ script:
- mud_room
- emma_bedroom
- upstairs_hallway
- dining_room
- downstairs_bathroom
- upstairs_bathroom
- tina_desk
@ -780,7 +767,6 @@ script:
- switch.adaptive_lighting_basement_studio
- switch.adaptive_lighting_living_room
- switch.adaptive_lighting_downstairs_bathroom
- switch.adaptive_lighting_dining_room_lamp
- switch.adaptive_lighting_tina_lamp
- switch.adaptive_lighting_mud_room
- switch.adaptive_lighting_upstairs_hallway
@ -801,7 +787,6 @@ 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: media_player.turn_off
@ -842,7 +827,6 @@ script:
target:
area_id:
- living_room
- dining_room
- tina_desk
- mud_room
- furnace_room
@ -878,7 +862,6 @@ script:
area_id:
- front_porch
- living_room
- dining_room
- mud_room
- service: input_boolean.turn_on
target:
@ -893,7 +876,6 @@ script:
entity_id:
- input_select.living_room_scenes
- input_select.mud_room_scenes
- input_select.dining_room_lamp_scenes
data:
option: Adaptive
mode: single
@ -940,7 +922,6 @@ script:
target:
area_id:
- living_room
- dining_room
- mud_room
- service: input_boolean.turn_on
target:
@ -955,7 +936,6 @@ script:
entity_id:
- input_select.living_room_scenes
- input_select.mud_room_scenes
- input_select.dining_room_lamp_scenes
data:
option: Adaptive
- service: script.turn_on

View File

@ -1618,7 +1618,6 @@ script:
# - light.tina_lamp_side
# - light.tina_lamp_top
# - light.tina_desk_strip
# - light.dining_room_lamp
# - switch.adaptive_lighting_living_room
# - switch.adaptive_lighting_tina_lamp
# - service: switch.turn_off
@ -1635,9 +1634,6 @@ script:
# - light.tina_desk_strip
# data:
# color_name: red
# - service: light.turn_off
# target:
# entity_id: light.dining_room_lamp
# - service: script.living_room_lights_alert
# data:
# type: red