From 4f1734c87ff3ea62911c08065891b2cea9169c26 Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Mon, 27 May 2019 12:47:07 -0700
Subject: [PATCH] Sync with upstream
1bd621b1
---
automations/maybe-an-earthquake.yaml | 2 +-
automations/scenes-ericks-desk-lamp.yaml | 12 ++++++------
customizations/scenes.yaml | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/automations/maybe-an-earthquake.yaml b/automations/maybe-an-earthquake.yaml
index 79fe710..0970c45 100644
--- a/automations/maybe-an-earthquake.yaml
+++ b/automations/maybe-an-earthquake.yaml
@@ -27,7 +27,7 @@ action:
- scene.da_bright
- scene.lr_bright
- scene.office_bright
- - scene.ericks_desk_lamp_relax
+ - scene.erick_s_desk_lamp_relax
- scene.master_bedroom_bright
- scene.master_bath_bright
- scene.balcony_bright
diff --git a/automations/scenes-ericks-desk-lamp.yaml b/automations/scenes-ericks-desk-lamp.yaml
index fcc4687..9c82867 100644
--- a/automations/scenes-ericks-desk-lamp.yaml
+++ b/automations/scenes-ericks-desk-lamp.yaml
@@ -28,17 +28,17 @@ action:
data_template:
entity_id: >
{% 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" ) %}
- scene.ericks_desk_lamp_dimmed
+ scene.erick_s_desk_lamp_dimmed
{%-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" ) %}
- scene.ericks_desk_lamp_read
+ scene.erick_s_desk_lamp_read
{%-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" ) %}
- scene.ericks_desk_lamp_off
+ scene.erick_s_desk_lamp_off
{% endif %}
- service: input_select.select_option
data:
diff --git a/customizations/scenes.yaml b/customizations/scenes.yaml
index c6a9471..43c505c 100644
--- a/customizations/scenes.yaml
+++ b/customizations/scenes.yaml
@@ -88,13 +88,13 @@ scene.office_concentrate:
scene.office_off:
friendly_name: 'Off'
icon: mdi:flashlight-off
-scene.ericks_desk_lamp_nightlight:
+scene.erick_s_desk_lamp_nightlight:
friendly_name: 'Desk Lamp Dim'
icon: mdi:brightness-3
-scene.ericks_desk_lamp_relax:
+scene.erick_s_desk_lamp_relax:
friendly_name: 'Desk Lamp Bright'
icon: mdi:brightness-1
-scene.ericks_desk_lamp_off:
+scene.erick_s_desk_lamp_off:
friendly_name: 'Desk Lamp Off'
icon: mdi:flashlight-off
scene.balcony_nightlight:
--
GitLab