From 744f394ca1fdacb2853f88928459b33645ef2650 Mon Sep 17 00:00:00 2001
From: Erick Hitter <services@ethitter.com>
Date: Thu, 1 Sep 2016 21:22:52 -0700
Subject: [PATCH] Sync with upstream
c304b8c
---
automations/kitchen-light-timeout.yaml | 14 ++++++++++++++
customizations/device-tracker.yaml | 4 +++-
customizations/lights.yaml | 12 ++++++++++++
customizations/scenes.yaml | 3 +++
customizations/switches.yaml | 2 +-
groups.yaml | 4 +++-
scripts.yaml | 22 ++++++++++++++++++++++
secrets.yaml | 3 ++-
8 files changed, 60 insertions(+), 4 deletions(-)
create mode 100644 automations/kitchen-light-timeout.yaml
create mode 100644 customizations/lights.yaml
diff --git a/automations/kitchen-light-timeout.yaml b/automations/kitchen-light-timeout.yaml
new file mode 100644
index 0000000..d4fd07d
--- /dev/null
+++ b/automations/kitchen-light-timeout.yaml
@@ -0,0 +1,14 @@
+alias: Turn off kitchen light after no motion
+trigger:
+ - platform: state
+ entity_id: binary_sensor.kitchen
+ to: 'on'
+condition:
+ condition: or
+ conditions:
+ - condition: state
+ entity_id: switch.kitchen
+ state: 'on'
+action:
+ service: homeassistant.turn_on
+ entity_id: script.kitchen_light_set_timeout
diff --git a/customizations/device-tracker.yaml b/customizations/device-tracker.yaml
index 6910d67..96be49e 100644
--- a/customizations/device-tracker.yaml
+++ b/customizations/device-tracker.yaml
@@ -1,5 +1,7 @@
device_tracker.cl_samsung_s5:
- friendly_name: Chris
+ friendly_name: Chris (S4)
+device_tracker.cl_iphone_5:
+ friendly_name: Chris (iPhone)
device_tracker.eh_nexus_6:
friendly_name: Erick
device_tracker.green_keys:
diff --git a/customizations/lights.yaml b/customizations/lights.yaml
new file mode 100644
index 0000000..9a132cd
--- /dev/null
+++ b/customizations/lights.yaml
@@ -0,0 +1,12 @@
+light.ericks_desk_lamp:
+ icon: mdi:lightbulb-outline
+light.ceiling_fan_1:
+ friendly_name: Ceiling Fan Front
+light.ceiling_fan_2:
+ friendly_name: Ceiling Fan Rear
+light.master_bath_1:
+ friendly_name: Vanity Left
+light.master_bath_2:
+ friendly_name: Vanity Center
+light.master_bath_3:
+ friendly_name: Vanity Right
diff --git a/customizations/scenes.yaml b/customizations/scenes.yaml
index ec47f33..b91cf16 100644
--- a/customizations/scenes.yaml
+++ b/customizations/scenes.yaml
@@ -79,6 +79,9 @@ scene.ericks_desk_lamp_nightlight:
scene.ericks_desk_lamp_relax:
friendly_name: 'Desk Lamp Bright'
icon: mdi:brightness-1
+scene.balcony_nightlight:
+ friendly_name: 'Nightlight'
+ icon: mdi:brightness-4
scene.balcony_dimmed:
friendly_name: 'Dimmed'
icon: mdi:brightness-7
diff --git a/customizations/switches.yaml b/customizations/switches.yaml
index ffbc727..39fb7bd 100644
--- a/customizations/switches.yaml
+++ b/customizations/switches.yaml
@@ -1,5 +1,5 @@
switch.kitchen:
- icon: mdi:lightbulb
+ icon: mdi:lightbulb-outline
switch.lava_lamp:
icon: mdi:led-on
switch.wireless_charger:
diff --git a/groups.yaml b/groups.yaml
index 710d453..c4f45d0 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -107,6 +107,7 @@ balcony:
name: Balcony
entities:
- light.balcony
+ - scene.balcony_nightlight
- scene.balcony_dimmed
- scene.balcony_relax
- scene.balcony_read
@@ -167,8 +168,9 @@ power_consumption:
presence:
name: Presence
entities:
- - device_tracker.cl_samsung_s5
- device_tracker.eh_nexus_6
+ - device_tracker.cl_samsung_s5
+ - device_tracker.cl_iphone_5
- device_tracker.green_keys
sensor_pi:
name: Raspberry Pi
diff --git a/scripts.yaml b/scripts.yaml
index bc806fc..b6e8cc0 100644
--- a/scripts.yaml
+++ b/scripts.yaml
@@ -125,3 +125,25 @@ force_unlock_interior:
force_disconnect_interior:
sequence:
- service: shell_command.force_disconnect_interior
+
+# Kitchen light timeout
+kitchen_light_set_timeout:
+ alias: "Set timeout for kitchen light"
+ sequence:
+ # Cancel ev. old timers
+ - service: script.turn_off
+ data:
+ entity_id: script.kitchen_light_timeout
+ # Set new timer
+ - service: script.turn_on
+ data:
+ entity_id: script.kitchen_light_timeout
+
+kitchen_light_timeout:
+ alias: "Turn off kitchen light after 15 minutes of inactivity"
+ sequence:
+ - delay:
+ minutes: 15
+ - service: switch.turn_off
+ data:
+ entity_id: switch.kitchen
diff --git a/secrets.yaml b/secrets.yaml
index 52d3282..2f623ad 100644
--- a/secrets.yaml
+++ b/secrets.yaml
@@ -3,10 +3,11 @@ latitude:
longitude:
jabber_sender:
jabber_recipient:
-jabber_password: ""
+jabber_password:
asus_user:
asus_key:
gravatar_erick:
gravatar_chris:
+gravatar_chris_2:
wunderground_key:
wunderground_pws_id:
--
GitLab