Sync with upstream

b74e459

automations/alarm-status-indicator-off.yaml

+alias: Alarm status indicator off
+trigger:
+  - platform: state
+    entity_id: alarm_control_panel.shm
+    to: "disarmed"
+action:
+  service: switch.turn_off
+  entity_id: switch.alarm_status

automations/alarm-status-indicator-on.yaml

+alias: Alarm status indicator on
+trigger:
+  - platform: state
+    entity_id: alarm_control_panel.shm
+    to: "armed_home"
+  - platform: state
+    entity_id: alarm_control_panel.shm
+    to: "armed_away"
+action:
+  service: switch.turn_on
+  entity_id: switch.alarm_status

automations/brightness-dining-area-set.yaml

+alias: Brightness Dining Area
+trigger:
+  platform: state
+  entity_id: input_slider.brightness_da
+action:
+  service: light.turn_on
+  data:
+    entity_id:
+      - light.ceiling_fan_1
+      - light.ceiling_fan_2
+  data_template:
+    brightness: '{{ states( "input_slider.brightness_da" )|round( 0 ) }}'

automations/brightness-dining-area-sync.yaml

+alias: Brightness Dining Area Sync
+trigger:
+  - platform: state
+    entity_id: light.ceiling_fan_1
+    to: "on"
+  - platform: state
+    entity_id: light.ceiling_fan_2
+    to: "on"
+action:
+  service: input_slider.select_value
+  data:
+    entity_id: input_slider.brightness_da
+  data_template:
+    value: '{{ trigger.to_state.attributes.brightness|float }}'

automations/brightness-living-room-set.yaml

+alias: Brightness Living Room
+trigger:
+  platform: state
+  entity_id: input_slider.brightness_lr
+action:
+  service: light.turn_on
+  data:
+    entity_id:
+      - light.endtable
+      - light.corner_table
+  data_template:
+    brightness: '{{ states( "input_slider.brightness_lr" )|round( 0 ) }}'

automations/brightness-living-room-sync.yaml

+alias: Brightness Living Room Sync
+trigger:
+  - platform: state
+    entity_id: light.endtable
+    to: "on"
+  - platform: state
+    entity_id: light.corner_table
+    to: "on"
+action:
+  service: input_slider.select_value
+  data:
+    entity_id: input_slider.brightness_lr
+  data_template:
+    value: '{{ trigger.to_state.attributes.brightness|float }}'

automations/brightness-master-bath-set.yaml

+alias: Brightness Master Bath
+trigger:
+  platform: state
+  entity_id: input_slider.brightness_master_bath
+action:
+  service: light.turn_on
+  data:
+    entity_id:
+      - light.master_bath_1
+      - light.master_bath_2
+      - light.master_bath_3
+  data_template:
+    brightness: '{{ states( "input_slider.brightness_master_bath" )|round( 0 ) }}'

automations/brightness-master-bath-sync.yaml

+alias: Brightness Master Bath Sync
+trigger:
+  - platform: state
+    entity_id: light.master_bath_1
+    to: "on"
+  - platform: state
+    entity_id: light.master_bath_2
+    to: "on"
+  - platform: state
+    entity_id: light.master_bath_3
+    to: "on"
+action:
+  service: input_slider.select_value
+  data:
+    entity_id: input_slider.brightness_master_bath
+  data_template:
+    value: '{{ trigger.to_state.attributes.brightness|float }}'

automations/kitchen-nightlight-off-sunrise.yaml

+alias: Turn kitchen nightlight off at sunrise
+trigger:
+  - platform: state
+    entity_id: sun.sun
+    to: 'above_horizon'
+action:
+  service: switch.turn_off
+  entity_id: switch.kitchen_nightlight

automations/kitchen-nightlight-off.yaml

+alias: Turn kitchen nightlight off
+trigger:
+  - platform: state
+    entity_id: switch.kitchen
+  - platform: state
+    entity_id: light.ceiling_fan_1
+  - platform: state
+    entity_id: light.ceiling_fan_2
+condition:
+  condition: or
+  conditions:
+    - condition: state
+      entity_id: light.ceiling_fan_1
+      state: 'on'
+    - condition: state
+      entity_id: light.ceiling_fan_2
+      state: 'on'
+    - condition: state
+      entity_id: switch.kitchen
+      state: 'on'
+action:
+  service: switch.turn_off
+  entity_id: switch.kitchen_nightlight

automations/kitchen-nightlight-on.yaml

+alias: Turn kitchen nightlight on
+trigger:
+  - platform: state
+    entity_id: switch.kitchen
+  - platform: state
+    entity_id: light.ceiling_fan_1
+  - platform: state
+    entity_id: light.ceiling_fan_2
+  - platform: state
+    entity_id: binary_sensor.kitchen
+  - platform: state
+    entity_id: binary_sensor.lr_motion_sensor_over_utility_closet
+condition:
+  condition: and
+  conditions:
+    - condition: state
+      entity_id: sun.sun
+      state: 'below_horizon'
+    - condition: time
+      after: '00:15:00'
+    - condition: time
+      before: '09:00:00'
+    - condition: state
+      entity_id: light.ceiling_fan_1
+      state: 'off'
+    - condition: state
+      entity_id: light.ceiling_fan_2
+      state: 'off'
+    - condition: state
+      entity_id: switch.kitchen
+      state: 'off'
+action:
+  service: switch.turn_on
+  entity_id: switch.kitchen_nightlight

automations/scenes-master-bath.yaml

@@ -6,7 +6,9 @@ action:
   - service: scene.turn_on
     data_template:
       entity_id: >
-        {% if is_state( "input_select.scene_master_bath", "Nightlight" ) %}
+        {% if is_state( "input_select.scene_master_bath", "Nightlight (single)" ) %}
+          scene.master_bath_dash_on
+        {%-elif is_state( "input_select.scene_master_bath", "Nightlight" ) %}
           scene.master_bath_nightlight
         {%-elif is_state( "input_select.scene_master_bath", "Dimmed" ) %}
           scene.master_bath_dimmed

configuration.yaml

@@ -71,6 +71,8 @@ device_tracker: !include device-tracker.yaml
 
 alarm_control_panel: !include alarm-control-panel.yaml
 
+wemo: !include wemo.yaml
+
 # Display
 group: !include groups.yaml
 

customizations/input-sliders.yaml

+input_slider.brightness_da:
+  friendly_name: DA Brightness
+  icon: mdi:brightness-6
+input_slider.brightness_lr:
+  icon: mdi:brightness-6
+input_slider.brightness_master_bath:
+  icon: mdi:brightness-6

customizations/scenes.yaml

@@ -115,3 +115,6 @@ scene.balcony_concentrate:
 scene.balcony_off:
   friendly_name: 'Off'
   icon: mdi:flashlight-off
+scene.all_lights_off:
+  friendly_name: Lights Out
+  icon: mdi:power-plug-off

customizations/scripts.yaml

@@ -19,3 +19,9 @@ script.force_unlock_keyed:
 script.force_disconnect_keyed:
   friendly_name: Disconnect Keyed
   icon: mdi:close-octagon
+script.restart_dash_button_shm:
+  friendly_name: Restart Dash Button SHM controller
+  icon: mdi:autorenew
+script.restart_dash_button_hac:
+  friendly_name: Restart Dash Button Home Assistant controller
+  icon: mdi:autorenew
\ No newline at end of file

customizations/switches.yaml

@@ -10,3 +10,8 @@ switch.august_interior:
 switch.august_keyed:
   friendly_name: Keyed Bolt
   icon: mdi:key
+switch.kitchen_nightlight:
+  icon: mdi:theme-light-dark
+switch.alarm_status:
+  friendly_name: Alarm Status indicator
+  icon: mdi:security-home

groups.yaml

@@ -34,6 +34,7 @@ status_view:
   icon: mdi:chip
   entities:
     - group.sensor_pi
+    - group.time_date
     - group.sensor_battery_levels
 weather_view:
   name: Weather
@@ -47,6 +48,7 @@ misc_view:
   icon: mdi:power
   entities:
     - group.scripts_misc
+    - group.misc_misc
     - media_player.nexus_player
 locks:
   name: Locks
@@ -64,12 +66,14 @@ master_bathroom:
     - light.master_bath_1
     - light.master_bath_2
     - light.master_bath_3
+    - input_slider.brightness_master_bath
     - input_select.scene_master_bath
 living_room:
   name: Living Room
   entities:
     - light.endtable
     - light.corner_table
+    - input_slider.brightness_lr
     - input_select.scene_lr
 dining_area:
   name: Kitchen & Dining
@@ -77,6 +81,7 @@ dining_area:
     - switch.kitchen
     - light.ceiling_fan_1
     - light.ceiling_fan_2
+    - input_slider.brightness_da
     - input_select.scene_da
 office:
   name: Office
@@ -176,6 +181,15 @@ sensor_pi:
     # - sensor.packets_sent_eth1
     - sensor.ipv4_address_eth1
     - sensor.ipv6_address_eth1
+time_date:
+  name: Time & Date
+  entities:
+    - sensor.time
+    - sensor.date
+    - sensor.date_time
+    - sensor.time_date
+    - sensor.time_utc
+    - sensor.beat
 sensor_battery_levels:
   name: Sensor Battery Levels
   entities:
@@ -194,7 +208,7 @@ sensor_battery_levels:
     - sensor.office_cabinet_battery_level
     - sensor.green_keys_battery_level
 scripts_misc:
-  name: Actions
+  name: Lock Actions
   entities:
     - script.restart_august_daemon
     - script.force_lock_interior
@@ -203,6 +217,14 @@ scripts_misc:
     - script.force_lock_keyed
     - script.force_unlock_keyed
     - script.force_disconnect_keyed
+misc_misc:
+  name: Other
+  entities:
+    - switch.alarm_status
+    - switch.kitchen_nightlight
+    - scene.all_lights_off
+    - script.restart_dash_button_shm
+    - script.restart_dash_button_hac
 wunderground:
   name: Wunderground
   entities:

input-selects.yaml

@@ -11,7 +11,7 @@ scene_balcony:
     - Read
     - Bright
 scene_da:
-  name: Scene
+  name: Dining Area Scene
   icon: mdi:brightness-auto
   initial: "-"
   options:
@@ -48,6 +48,7 @@ scene_master_bath:
   options:
     - "-"
     - "Off"
+    - "Nightlight (single)"
     - Nightlight
     - Dimmed
     - Relax

input-sliders.yaml

-office_brightness:
+brightness_da:
   name: Brightness
+  initial: 0
+  min: 1
+  max: 255
+  step: 1
+brightness_lr:
+  name: Brightness
+  initial: 0
+  min: 1
+  max: 255
+  step: 1
+brightness_master_bath:
+  name: Brightness
+  initial: 0
   min: 1
   max: 255
   step: 1

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