Commit 310f9401 authored by Erick Hitter's avatar Erick Hitter

Merge branch 'update/lamp' into 'master'

Sync with upstream

See merge request !5
parents 18a42825 4f1734c8
Pipeline #1378 failed with stage
in 1 minute and 54 seconds
...@@ -27,7 +27,7 @@ action: ...@@ -27,7 +27,7 @@ action:
- scene.da_bright - scene.da_bright
- scene.lr_bright - scene.lr_bright
- scene.office_bright - scene.office_bright
- scene.ericks_desk_lamp_relax - scene.erick_s_desk_lamp_relax
- scene.master_bedroom_bright - scene.master_bedroom_bright
- scene.master_bath_bright - scene.master_bath_bright
- scene.balcony_bright - scene.balcony_bright
......
...@@ -28,17 +28,17 @@ action: ...@@ -28,17 +28,17 @@ action:
data_template: data_template:
entity_id: > entity_id: >
{% if is_state( "input_select.scene_ericks_desk_lamp", "Nightlight" ) %} {% if is_state( "input_select.scene_ericks_desk_lamp", "Nightlight" ) %}
scene.ericks_desk_lamp_nightlight scene.erick_s_desk_lamp_nightlight
{%-elif is_state( "input_select.scene_ericks_desk_lamp", "Dimmed" ) %} {%-elif is_state( "input_select.scene_ericks_desk_lamp", "Dimmed" ) %}
scene.ericks_desk_lamp_dimmed scene.erick_s_desk_lamp_dimmed
{%-elif is_state( "input_select.scene_ericks_desk_lamp", "Relax" ) %} {%-elif is_state( "input_select.scene_ericks_desk_lamp", "Relax" ) %}
scene.ericks_desk_lamp_relax scene.erick_s_desk_lamp_relax
{%-elif is_state( "input_select.scene_ericks_desk_lamp", "Read" ) %} {%-elif is_state( "input_select.scene_ericks_desk_lamp", "Read" ) %}
scene.ericks_desk_lamp_read scene.erick_s_desk_lamp_read
{%-elif is_state( "input_select.scene_ericks_desk_lamp", "Bright" ) %} {%-elif is_state( "input_select.scene_ericks_desk_lamp", "Bright" ) %}
scene.ericks_desk_lamp_concentrate scene.erick_s_desk_lamp_concentrate
{%-elif is_state( "input_select.scene_ericks_desk_lamp", "Off" ) %} {%-elif is_state( "input_select.scene_ericks_desk_lamp", "Off" ) %}
scene.ericks_desk_lamp_off scene.erick_s_desk_lamp_off
{% endif %} {% endif %}
- service: input_select.select_option - service: input_select.select_option
data: data:
......
...@@ -88,13 +88,13 @@ scene.office_concentrate: ...@@ -88,13 +88,13 @@ scene.office_concentrate:
scene.office_off: scene.office_off:
friendly_name: 'Off' friendly_name: 'Off'
icon: mdi:flashlight-off icon: mdi:flashlight-off
scene.ericks_desk_lamp_nightlight: scene.erick_s_desk_lamp_nightlight:
friendly_name: 'Desk Lamp Dim' friendly_name: 'Desk Lamp Dim'
icon: mdi:brightness-3 icon: mdi:brightness-3
scene.ericks_desk_lamp_relax: scene.erick_s_desk_lamp_relax:
friendly_name: 'Desk Lamp Bright' friendly_name: 'Desk Lamp Bright'
icon: mdi:brightness-1 icon: mdi:brightness-1
scene.ericks_desk_lamp_off: scene.erick_s_desk_lamp_off:
friendly_name: 'Desk Lamp Off' friendly_name: 'Desk Lamp Off'
icon: mdi:flashlight-off icon: mdi:flashlight-off
scene.balcony_nightlight: scene.balcony_nightlight:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment