Sync with upstream

b74e459

scenes/all-lights-off.yaml

+name: All Lights Off
+entities:
+  light.master_bath_1:
+    state: off
+  light.master_bath_2:
+    state: off
+  light.master_bath_3:
+    state: off
+  light.nightstand:
+    state: off
+  light.endtable:
+    state: off
+  light.corner_table:
+    state: off
+  switch.kitchen:
+    state: off
+  light.ceiling_fan_1:
+    state: off
+  light.ceiling_fan_2:
+    state: off
+  light.office:
+    state: off
+  light.ericks_desk_lamp:
+    state: off
+  switch.lava_lamp:
+    state: off

scenes/master-bath-dash-off.yaml

+name: Master Bath Dash Off
+entities:
+  light.master_bath_1:
+    state: off
+  light.master_bath_2:
+    state: off
+  light.master_bath_3:
+    state: off

scenes/master-bath-dash-on.yaml

+name: Master Bath Dash On
+entities:
+  light.master_bath_1:
+    state: off
+  light.master_bath_2:
+    state: on
+    brightness: 1
+    color_temp: 450
+  light.master_bath_3:
+    state: off

scripts.yaml

@@ -140,10 +140,20 @@ kitchen_light_set_timeout:
         entity_id: script.kitchen_light_timeout
 
 kitchen_light_timeout:
-  alias: "Turn off kitchen light after 5 minutes of inactivity"
+  alias: "Turn off kitchen light after 15 minutes of inactivity"
   sequence:
     - delay:
-        minutes: 5
+        minutes: 15
     - service: switch.turn_off
       data:
         entity_id: switch.kitchen
+
+# Restart Dash Button SHM controller
+restart_dash_button_shm:
+  sequence:
+    - service: shell_command.restart_dash_button_shm
+
+# Restart Dash Button Home Assistant controller
+restart_dash_button_hac:
+  sequence:
+    - service: shell_command.restart_dash_button_hac

secrets.yaml

@@ -13,3 +13,4 @@ wunderground_key:
 wunderground_pws_id:
 logentries_token:
 mysql_recorder:
+wemo_ip:

sensors/time-date.yaml

+platform: time_date
+display_options:
+  - 'time'
+  - 'date'
+  - 'date_time'
+  - 'time_date'
+  - 'time_utc'
+  - 'beat'

shell_commands.yaml

-restart_august_daemon: /usr/bin/pm2 restart npm
+restart_august_daemon: /usr/bin/pm2 restart augustctl
 force_lock_keyed: curl http://localhost:3000/api/lock/keyed
 force_lock_interior: curl http://localhost:3000/api/lock/interior
 force_unlock_keyed: curl http://localhost:3000/api/unlock/keyed
 force_unlock_interior: curl http://localhost:3000/api/unlock/interior
 force_disconnect_keyed: curl http://localhost:3000/api/disconnect/keyed
 force_disconnect_interior: curl http://localhost:3000/api/disconnect/interior
+restart_dash_button_shm: /usr/bin/pm2 restart dash-button-shm
+restart_dash_button_hac: /usr/bin/pm2 restart dash-button-hac

switches.yaml

@@ -19,17 +19,24 @@
   payload_on: "on"
   payload_off: "off"
   retain: true
+- platform: mqtt
+  name: "Alarm Status"
+  state_topic: "smartthings/Alarm Status/switch"
+  command_topic: "smartthings/Alarm Status/switch"
+  payload_on: "on"
+  payload_off: "off"
+  retain: true
 - platform: command_line
   switches:
     august_interior:
-      oncmd: 'curl "http://localhost:3000/api/lock/interior"'
-      offcmd: 'curl "http://localhost:3000/api/unlock/interior"'
-      statecmd: 'curl --silent "http://localhost:3000/api/status/interior" | jq ".status"'
+      command_on: 'curl "http://localhost:3000/api/lock/interior"'
+      command_off: 'curl "http://localhost:3000/api/unlock/interior"'
+      command_state: 'curl --silent "http://localhost:3000/api/status/interior" | jq ".status"'
       value_template: '{{ value == "0" }}'
 - platform: command_line
   switches:
     august_keyed:
-      oncmd: 'curl "http://localhost:3000/api/lock/keyed"'
-      offcmd: 'curl "http://localhost:3000/api/unlock/keyed"'
-      statecmd: 'curl --silent "http://localhost:3000/api/status/keyed" | jq ".status"'
+      command_on: 'curl "http://localhost:3000/api/lock/keyed"'
+      command_off: 'curl "http://localhost:3000/api/unlock/keyed"'
+      command_state: 'curl --silent "http://localhost:3000/api/status/keyed" | jq ".status"'
       value_template: '{{ value == "0" }}'

wemo.yaml

+static:
+  - !secret wemo_ip