From 020bce889d04b4f55b7340031f5b7429b2f38f7b Mon Sep 17 00:00:00 2001
From: Erick Hitter <services@ethitter.com>
Date: Thu, 1 Sep 2016 16:37:33 -0700
Subject: [PATCH] Sync with upstream

b32581b
---
 customizations/scripts.yaml      | 18 ++++++++++++++++++
 customizations/sensors.yaml      |  3 +++
 customizations/switches.yaml     |  2 ++
 groups.yaml                      | 10 +++++++++-
 scripts.yaml                     | 24 ++++++++++++++++++++++++
 sensors/power-kitchen-light.yaml |  4 ++++
 shell_commands.yaml              |  6 ++++++
 switches.yaml                    |  7 +++++++
 8 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 sensors/power-kitchen-light.yaml

diff --git a/customizations/scripts.yaml b/customizations/scripts.yaml
index 434137a..6e081d0 100644
--- a/customizations/scripts.yaml
+++ b/customizations/scripts.yaml
@@ -1,3 +1,21 @@
 script.restart_august_daemon:
   friendly_name: Restart August daemon
   icon: mdi:autorenew
+script.force_lock_interior:
+  friendly_name: Lock Interior
+  icon: mdi:autorenew
+script.force_unlock_interior:
+  friendly_name: Unlock Interior
+  icon: mdi:autorenew
+script.force_disconnect_interior:
+  friendly_name: Disconnect Interior
+  icon: mdi:close-octagon
+script.force_lock_keyed:
+  friendly_name: Lock Keyed
+  icon: mdi:autorenew
+script.force_unlock_keyed:
+  friendly_name: Unlock Keyed
+  icon: mdi:autorenew
+script.force_disconnect_keyed:
+  friendly_name: Disconnect Keyed
+  icon: mdi:close-octagon
diff --git a/customizations/sensors.yaml b/customizations/sensors.yaml
index fb7b5e2..b66e0a0 100644
--- a/customizations/sensors.yaml
+++ b/customizations/sensors.yaml
@@ -4,6 +4,9 @@ sensor.speedtest_download:
   icon: mdi:download
 sensor.speedtest_upload:
   icon: mdi:upload
+sensor.kitchen_fluorescent_consumption:
+  friendly_name: Kitchen Fluorescent
+  icon: mdi:lightbulb-outline
 sensor.lava_lamp_consumption:
   friendly_name: Lava Lamp
   icon: mdi:radiator
diff --git a/customizations/switches.yaml b/customizations/switches.yaml
index fa98d18..ffbc727 100644
--- a/customizations/switches.yaml
+++ b/customizations/switches.yaml
@@ -1,3 +1,5 @@
+switch.kitchen:
+  icon: mdi:lightbulb
 switch.lava_lamp:
   icon: mdi:led-on
 switch.wireless_charger:
diff --git a/groups.yaml b/groups.yaml
index 1dab325..710d453 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -82,8 +82,9 @@ living_room:
     - scene.lr_relax
     - scene.lr_read
 dining_area:
-  name: Dining Area
+  name: Kitchen & Dining
   entities:
+    - switch.kitchen
     - light.ceiling_fan_1
     - light.ceiling_fan_2
     - scene.da_nightlight
@@ -161,6 +162,7 @@ smoke_gas:
 power_consumption:
   name: Power Consumption
   entities:
+    - sensor.kitchen_fluorescent_consumption
     - sensor.lava_lamp_consumption
 presence:
   name: Presence
@@ -214,6 +216,12 @@ scripts_misc:
   name: Actions
   entities:
     - script.restart_august_daemon
+    - script.force_lock_interior
+    - script.force_unlock_interior
+    - script.force_disconnect_interior
+    - script.force_lock_keyed
+    - script.force_unlock_keyed
+    - script.force_disconnect_keyed
 wunderground:
   name: Wunderground
   entities:
diff --git a/scripts.yaml b/scripts.yaml
index c95f1f3..bc806fc 100644
--- a/scripts.yaml
+++ b/scripts.yaml
@@ -101,3 +101,27 @@ dining_area_lights_timeout:
 restart_august_daemon:
   sequence:
     - service: shell_command.restart_august_daemon
+# Force lock keyed
+force_lock_keyed:
+  sequence:
+    - service: shell_command.force_lock_keyed
+# Force unlock keyed
+force_unlock_keyed:
+  sequence:
+    - service: shell_command.force_unlock_keyed
+# Force disconnect keyed
+force_disconnect_keyed:
+  sequence:
+    - service: shell_command.force_disconnect_keyed
+# Force lock interior
+force_lock_interior:
+  sequence:
+    - service: shell_command.force_lock_interior
+# Force unlock interior
+force_unlock_interior:
+  sequence:
+    - service: shell_command.force_unlock_interior
+# Force disconnect interior
+force_disconnect_interior:
+  sequence:
+    - service: shell_command.force_disconnect_interior
diff --git a/sensors/power-kitchen-light.yaml b/sensors/power-kitchen-light.yaml
new file mode 100644
index 0000000..58dc6ed
--- /dev/null
+++ b/sensors/power-kitchen-light.yaml
@@ -0,0 +1,4 @@
+platform: mqtt
+state_topic: "smartthings/Kitchen/power"
+name: "Kitchen Fluorescent Consumption"
+unit_of_measurement: "W"
diff --git a/shell_commands.yaml b/shell_commands.yaml
index 305275b..3217bb9 100644
--- a/shell_commands.yaml
+++ b/shell_commands.yaml
@@ -1 +1,7 @@
 restart_august_daemon: /usr/bin/pm2 restart npm
+force_lock_keyed: curl http://localhost:3176/api/lock/keyed
+force_lock_interior: curl http://localhost:3176/api/lock/interior
+force_unlock_keyed: curl http://localhost:3176/api/unlock/keyed
+force_unlock_interior: curl http://localhost:3176/api/unlock/interior
+force_disconnect_keyed: curl http://localhost:3176/api/disconnect/keyed
+force_disconnect_interior: curl http://localhost:3176/api/disconnect/interior
diff --git a/switches.yaml b/switches.yaml
index 33bdd76..bb2f6ce 100644
--- a/switches.yaml
+++ b/switches.yaml
@@ -1,3 +1,10 @@
+- platform: mqtt
+  name: "Kitchen"
+  state_topic: "smartthings/Kitchen/switch"
+  command_topic: "smartthings/Kitchen/switch"
+  payload_on: "on"
+  payload_off: "off"
+  retain: true
 - platform: mqtt
   name: "Lava Lamp"
   state_topic: "smartthings/Lava Lamp/switch"
-- 
GitLab