From 0234305a65977cfee2815b42c9726045ead571fb Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Sun, 12 Nov 2017 20:50:35 -0800
Subject: [PATCH] Sync with upstream

7abd3cbe
---
 automations/balcony-late-night-dim.yaml       |  2 +-
 automations/brightness-dining-area-set.yaml   |  4 +--
 automations/brightness-dining-area-sync.yaml  | 16 +++++++----
 automations/brightness-living-room-set.yaml   |  4 +--
 automations/brightness-living-room-sync.yaml  | 16 +++++++----
 automations/brightness-master-bath-set.yaml   |  4 +--
 automations/brightness-master-bath-sync.yaml  | 20 +++++++++----
 .../dining-area-window-opened-outside.yaml    | 23 +++++++++++++++
 automations/scenes-balcony.yaml               | 21 ++++++++++++++
 automations/scenes-dining-area.yaml           | 21 ++++++++++++++
 automations/scenes-ericks-desk-lamp.yaml      | 21 ++++++++++++++
 automations/scenes-living-room.yaml           | 21 ++++++++++++++
 automations/scenes-master-bath.yaml           | 26 ++++++++++++++++-
 automations/scenes-master-bedroom.yaml        | 21 ++++++++++++++
 automations/scenes-office.yaml                | 21 ++++++++++++++
 configuration.yaml                            | 14 +++++++---
 ...{input-sliders.yaml => input-numbers.yaml} |  6 ++--
 customizations/lights.yaml                    |  2 ++
 customizations/scripts.yaml                   |  6 ----
 customizations/sensors.yaml                   |  3 ++
 customizations/switches.yaml                  |  4 +--
 groups.yaml                                   | 13 +++++----
 hue-token-living-room.conf                    |  0
 hue-token-office.conf                         |  0
 input-sliders.yaml => input-numbers.yaml      |  3 ++
 known_devices.yaml                            |  8 +++---
 scenes/master-bath-dash-off.yaml              |  8 ------
 ...aml => master-bath-single-nightlight.yaml} |  2 +-
 scripts.yaml                                  | 10 -------
 sensors/template.yaml                         | 28 -------------------
 shell_commands.yaml                           |  2 --
 31 files changed, 252 insertions(+), 98 deletions(-)
 create mode 100644 automations/dining-area-window-opened-outside.yaml
 rename customizations/{input-sliders.yaml => input-numbers.yaml} (53%)
 mode change 100755 => 100644 hue-token-living-room.conf
 mode change 100755 => 100644 hue-token-office.conf
 rename input-sliders.yaml => input-numbers.yaml (84%)
 delete mode 100644 scenes/master-bath-dash-off.yaml
 rename scenes/{master-bath-dash-on.yaml => master-bath-single-nightlight.yaml} (85%)
 delete mode 100644 sensors/template.yaml

diff --git a/automations/balcony-late-night-dim.yaml b/automations/balcony-late-night-dim.yaml
index f22202a..91d91db 100644
--- a/automations/balcony-late-night-dim.yaml
+++ b/automations/balcony-late-night-dim.yaml
@@ -1,7 +1,7 @@
 alias: 'Dim balcony lights after midnight'
 trigger:
   platform: time
-  after: "00:00"
+  at: "00:00"
 condition:
   - condition: state
     entity_id: light.balcony
diff --git a/automations/brightness-dining-area-set.yaml b/automations/brightness-dining-area-set.yaml
index 4ea712a..7be10dc 100644
--- a/automations/brightness-dining-area-set.yaml
+++ b/automations/brightness-dining-area-set.yaml
@@ -1,7 +1,7 @@
 alias: Brightness Dining Area
 trigger:
   platform: state
-  entity_id: input_slider.brightness_da
+  entity_id: input_number.brightness_da
 action:
   service: light.turn_on
   data:
@@ -9,4 +9,4 @@ action:
       - light.ceiling_fan_1
       - light.ceiling_fan_2
   data_template:
-    brightness: '{{ states( "input_slider.brightness_da" )|round( 0 ) }}'
+    brightness: '{{ states( "input_number.brightness_da" )|round( 0 ) }}'
diff --git a/automations/brightness-dining-area-sync.yaml b/automations/brightness-dining-area-sync.yaml
index ebdebde..d911588 100644
--- a/automations/brightness-dining-area-sync.yaml
+++ b/automations/brightness-dining-area-sync.yaml
@@ -2,13 +2,19 @@ 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"
+condition:
+  condition: and
+  conditions:
+    - condition: state
+      entity_id: light.ceiling_fan_1
+      state: 'on'
+    - condition: state
+      entity_id: light.ceiling_fan_2
+      state: 'on'
 action:
-  service: input_slider.select_value
-  data:
-    entity_id: input_slider.brightness_da
+  service: input_number.set_value
   data_template:
+    entity_id: input_number.brightness_da
     value: '{{ trigger.to_state.attributes.brightness|float }}'
diff --git a/automations/brightness-living-room-set.yaml b/automations/brightness-living-room-set.yaml
index 9edd36b..4f6057e 100644
--- a/automations/brightness-living-room-set.yaml
+++ b/automations/brightness-living-room-set.yaml
@@ -1,7 +1,7 @@
 alias: Brightness Living Room
 trigger:
   platform: state
-  entity_id: input_slider.brightness_lr
+  entity_id: input_number.brightness_lr
 action:
   service: light.turn_on
   data:
@@ -9,4 +9,4 @@ action:
       - light.endtable
       - light.corner_table
   data_template:
-    brightness: '{{ states( "input_slider.brightness_lr" )|round( 0 ) }}'
+    brightness: '{{ states( "input_number.brightness_lr" )|round( 0 ) }}'
diff --git a/automations/brightness-living-room-sync.yaml b/automations/brightness-living-room-sync.yaml
index 17cae09..21ad09a 100644
--- a/automations/brightness-living-room-sync.yaml
+++ b/automations/brightness-living-room-sync.yaml
@@ -2,13 +2,19 @@ alias: Brightness Living Room Sync
 trigger:
   - platform: state
     entity_id: light.endtable
-    to: "on"
   - platform: state
     entity_id: light.corner_table
-    to: "on"
+condition:
+  condition: and
+  conditions:
+    - condition: state
+      entity_id: light.endtable
+      state: 'on'
+    - condition: state
+      entity_id: light.corner_table
+      state: 'on'
 action:
-  service: input_slider.select_value
-  data:
-    entity_id: input_slider.brightness_lr
+  service: input_number.set_value
   data_template:
+    entity_id: input_number.brightness_lr
     value: '{{ trigger.to_state.attributes.brightness|float }}'
diff --git a/automations/brightness-master-bath-set.yaml b/automations/brightness-master-bath-set.yaml
index 72648bd..7b7a6fa 100644
--- a/automations/brightness-master-bath-set.yaml
+++ b/automations/brightness-master-bath-set.yaml
@@ -1,7 +1,7 @@
 alias: Brightness Master Bath
 trigger:
   platform: state
-  entity_id: input_slider.brightness_master_bath
+  entity_id: input_number.brightness_master_bath
 action:
   service: light.turn_on
   data:
@@ -10,4 +10,4 @@ action:
       - light.master_bath_2
       - light.master_bath_3
   data_template:
-    brightness: '{{ states( "input_slider.brightness_master_bath" )|round( 0 ) }}'
+    brightness: '{{ states( "input_number.brightness_master_bath" )|round( 0 ) }}'
diff --git a/automations/brightness-master-bath-sync.yaml b/automations/brightness-master-bath-sync.yaml
index 80827ef..001be74 100644
--- a/automations/brightness-master-bath-sync.yaml
+++ b/automations/brightness-master-bath-sync.yaml
@@ -2,16 +2,24 @@ 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"
+condition:
+  condition: and
+  conditions:
+    - condition: state
+      entity_id: light.master_bath_1
+      state: 'on'
+    - condition: state
+      entity_id: light.master_bath_2
+      state: 'on'
+    - condition: state
+      entity_id: light.master_bath_3
+      state: 'on'
 action:
-  service: input_slider.select_value
-  data:
-    entity_id: input_slider.brightness_master_bath
+  service: input_number.set_value
   data_template:
+    entity_id: input_number.brightness_master_bath
     value: '{{ trigger.to_state.attributes.brightness|float }}'
diff --git a/automations/dining-area-window-opened-outside.yaml b/automations/dining-area-window-opened-outside.yaml
new file mode 100644
index 0000000..e894732
--- /dev/null
+++ b/automations/dining-area-window-opened-outside.yaml
@@ -0,0 +1,23 @@
+alias: Turn on lights when dining room window opened from outside
+trigger:
+  - platform: state
+    entity_id: binary_sensor.dining_area_window_motion
+    to: 'on'
+condition:
+  condition: and
+  conditions:
+    - condition: state
+      entity_id: binary_sensor.lr_motion_sensor_over_slider
+      state: 'off'
+    - condition: state
+      entity_id: binary_sensor.lr_motion_sensor_over_utility_closet
+      state: 'off'
+    - condition: state
+      entity_id: binary_sensor.kitchen
+      state: 'off'
+action:
+  service: scene.turn_on
+  entity_id:
+    - scene.da_bright
+    - scene.lr_bright
+    - scene.balcony_bright
diff --git a/automations/scenes-balcony.yaml b/automations/scenes-balcony.yaml
index 35b7684..04f78b8 100644
--- a/automations/scenes-balcony.yaml
+++ b/automations/scenes-balcony.yaml
@@ -2,6 +2,27 @@ alias: Scene Balcony
 trigger:
   platform: state
   entity_id: input_select.scene_balcony
+condition:
+  condition: or
+  conditions:
+    - condition: state
+      entity_id: 'input_select.scene_balcony'
+      state: 'Nightlight'
+    - condition: state
+      entity_id: 'input_select.scene_balcony'
+      state: 'Dimmed'
+    - condition: state
+      entity_id: 'input_select.scene_balcony'
+      state: 'Relax'
+    - condition: state
+      entity_id: 'input_select.scene_balcony'
+      state: 'Read'
+    - condition: state
+      entity_id: 'input_select.scene_balcony'
+      state: 'Bright'
+    - condition: state
+      entity_id: 'input_select.scene_balcony'
+      state: 'Off'
 action:
   - service: scene.turn_on
     data_template:
diff --git a/automations/scenes-dining-area.yaml b/automations/scenes-dining-area.yaml
index b1946a7..00b8d66 100644
--- a/automations/scenes-dining-area.yaml
+++ b/automations/scenes-dining-area.yaml
@@ -2,6 +2,27 @@ alias: Scene Dining Area
 trigger:
   platform: state
   entity_id: input_select.scene_da
+condition:
+  condition: or
+  conditions:
+    - condition: state
+      entity_id: 'input_select.scene_da'
+      state: 'Nightlight'
+    - condition: state
+      entity_id: 'input_select.scene_da'
+      state: 'Dimmed'
+    - condition: state
+      entity_id: 'input_select.scene_da'
+      state: 'Relax'
+    - condition: state
+      entity_id: 'input_select.scene_da'
+      state: 'Read'
+    - condition: state
+      entity_id: 'input_select.scene_da'
+      state: 'Bright'
+    - condition: state
+      entity_id: 'input_select.scene_da'
+      state: 'Off'
 action:
   - service: scene.turn_on
     data_template:
diff --git a/automations/scenes-ericks-desk-lamp.yaml b/automations/scenes-ericks-desk-lamp.yaml
index 0eb21f2..fcc4687 100644
--- a/automations/scenes-ericks-desk-lamp.yaml
+++ b/automations/scenes-ericks-desk-lamp.yaml
@@ -2,6 +2,27 @@ alias: Scene Erick's Desk Lamp
 trigger:
   platform: state
   entity_id: input_select.scene_ericks_desk_lamp
+condition:
+  condition: or
+  conditions:
+    - condition: state
+      entity_id: 'input_select.scene_ericks_desk_lamp'
+      state: 'Nightlight'
+    - condition: state
+      entity_id: 'input_select.scene_ericks_desk_lamp'
+      state: 'Dimmed'
+    - condition: state
+      entity_id: 'input_select.scene_ericks_desk_lamp'
+      state: 'Relax'
+    - condition: state
+      entity_id: 'input_select.scene_ericks_desk_lamp'
+      state: 'Read'
+    - condition: state
+      entity_id: 'input_select.scene_ericks_desk_lamp'
+      state: 'Bright'
+    - condition: state
+      entity_id: 'input_select.scene_ericks_desk_lamp'
+      state: 'Off'
 action:
   - service: scene.turn_on
     data_template:
diff --git a/automations/scenes-living-room.yaml b/automations/scenes-living-room.yaml
index 608cf4f..abae61e 100644
--- a/automations/scenes-living-room.yaml
+++ b/automations/scenes-living-room.yaml
@@ -2,6 +2,27 @@ alias: Scene Living Room
 trigger:
   platform: state
   entity_id: input_select.scene_lr
+condition:
+  condition: or
+  conditions:
+    - condition: state
+      entity_id: 'input_select.scene_lr'
+      state: 'Nightlight'
+    - condition: state
+      entity_id: 'input_select.scene_lr'
+      state: 'Dimmed'
+    - condition: state
+      entity_id: 'input_select.scene_lr'
+      state: 'Relax'
+    - condition: state
+      entity_id: 'input_select.scene_lr'
+      state: 'Read'
+    - condition: state
+      entity_id: 'input_select.scene_lr'
+      state: 'Bright'
+    - condition: state
+      entity_id: 'input_select.scene_lr'
+      state: 'Off'
 action:
   - service: scene.turn_on
     data_template:
diff --git a/automations/scenes-master-bath.yaml b/automations/scenes-master-bath.yaml
index 238de50..ed5533a 100644
--- a/automations/scenes-master-bath.yaml
+++ b/automations/scenes-master-bath.yaml
@@ -2,12 +2,36 @@ alias: Scene Master Bath
 trigger:
   platform: state
   entity_id: input_select.scene_master_bath
+condition:
+  condition: or
+  conditions:
+    - condition: state
+      entity_id: 'input_select.scene_master_bath'
+      state: 'Nightlight (single)'
+    - condition: state
+      entity_id: 'input_select.scene_master_bath'
+      state: 'Nightlight'
+    - condition: state
+      entity_id: 'input_select.scene_master_bath'
+      state: 'Dimmed'
+    - condition: state
+      entity_id: 'input_select.scene_master_bath'
+      state: 'Relax'
+    - condition: state
+      entity_id: 'input_select.scene_master_bath'
+      state: 'Read'
+    - condition: state
+      entity_id: 'input_select.scene_master_bath'
+      state: 'Bright'
+    - condition: state
+      entity_id: 'input_select.scene_master_bath'
+      state: 'Off'
 action:
   - service: scene.turn_on
     data_template:
       entity_id: >
         {% if is_state( "input_select.scene_master_bath", "Nightlight (single)" ) %}
-          scene.master_bath_dash_on
+          scene.master_bath_single_nightlight
         {%-elif is_state( "input_select.scene_master_bath", "Nightlight" ) %}
           scene.master_bath_nightlight
         {%-elif is_state( "input_select.scene_master_bath", "Dimmed" ) %}
diff --git a/automations/scenes-master-bedroom.yaml b/automations/scenes-master-bedroom.yaml
index beb3d2a..40ce8ae 100644
--- a/automations/scenes-master-bedroom.yaml
+++ b/automations/scenes-master-bedroom.yaml
@@ -2,6 +2,27 @@ alias: Scene Master Bedroom
 trigger:
   platform: state
   entity_id: input_select.scene_master_bedroom
+condition:
+  condition: or
+  conditions:
+    - condition: state
+      entity_id: 'input_select.scene_master_bedroom'
+      state: 'Nightlight'
+    - condition: state
+      entity_id: 'input_select.scene_master_bedroom'
+      state: 'Dimmed'
+    - condition: state
+      entity_id: 'input_select.scene_master_bedroom'
+      state: 'Relax'
+    - condition: state
+      entity_id: 'input_select.scene_master_bedroom'
+      state: 'Read'
+    - condition: state
+      entity_id: 'input_select.scene_master_bedroom'
+      state: 'Bright'
+    - condition: state
+      entity_id: 'input_select.scene_master_bedroom'
+      state: 'Off'
 action:
   - service: scene.turn_on
     data_template:
diff --git a/automations/scenes-office.yaml b/automations/scenes-office.yaml
index 630da29..cdea937 100644
--- a/automations/scenes-office.yaml
+++ b/automations/scenes-office.yaml
@@ -2,6 +2,27 @@ alias: Scene Office
 trigger:
   platform: state
   entity_id: input_select.scene_office
+condition:
+  condition: or
+  conditions:
+    - condition: state
+      entity_id: 'input_select.scene_office'
+      state: 'Nightlight'
+    - condition: state
+      entity_id: 'input_select.scene_office'
+      state: 'Dimmed'
+    - condition: state
+      entity_id: 'input_select.scene_office'
+      state: 'Relax'
+    - condition: state
+      entity_id: 'input_select.scene_office'
+      state: 'Read'
+    - condition: state
+      entity_id: 'input_select.scene_office'
+      state: 'Bright'
+    - condition: state
+      entity_id: 'input_select.scene_office'
+      state: 'Off'
 action:
   - service: scene.turn_on
     data_template:
diff --git a/configuration.yaml b/configuration.yaml
index 2d7029b..68b13f4 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -34,13 +34,15 @@ zone:
 # Checks for available updates
 updater:
   reporting: no
+  include_used_components: false
 
 # Enables the frontend
 frontend:
 
 # Set recorder options
 recorder:
-  purge_days: 14
+  purge_interval: 1
+  purge_keep_days: 90
   db_url: !secret mysql_recorder
 
 # Enables support for tracking state changes over time.
@@ -48,13 +50,17 @@ history:
 
 # Discover some devices automatically
 discovery:
+  ignore:
+    - apple_tv
+    - samsung_tv
 
 # Logging settings
 logger:
-  default: info # default logging level
+  default: warn # default logging level
   logs:
     homeassistant.components.device_tracker.asuswrt: error # suppress IPv6-related warnings; see https://github.com/home-assistant/home-assistant/issues/2814
-    homeassistant.components.sensor.rest: debug
+    homeassistant.components.sensor.rest: debug # to aid debugging locks
+    homeassistant.helpers.entity: fatal # Hue bridge throws lots of errors
 
 # View all events in a logbook
 logbook:
@@ -116,4 +122,4 @@ automation: !include_dir_list automations
 # Controls
 input_select: !include input-selects.yaml
 
-input_slider: !include input-sliders.yaml
+input_number: !include input-numbers.yaml
diff --git a/customizations/input-sliders.yaml b/customizations/input-numbers.yaml
similarity index 53%
rename from customizations/input-sliders.yaml
rename to customizations/input-numbers.yaml
index a1646db..1f2151c 100644
--- a/customizations/input-sliders.yaml
+++ b/customizations/input-numbers.yaml
@@ -1,7 +1,7 @@
-input_slider.brightness_da:
+input_number.brightness_da:
   friendly_name: DA Brightness
   icon: mdi:brightness-6
-input_slider.brightness_lr:
+input_number.brightness_lr:
   icon: mdi:brightness-6
-input_slider.brightness_master_bath:
+input_number.brightness_master_bath:
   icon: mdi:brightness-6
diff --git a/customizations/lights.yaml b/customizations/lights.yaml
index f0cf059..574a968 100644
--- a/customizations/lights.yaml
+++ b/customizations/lights.yaml
@@ -1,7 +1,9 @@
 light.office:
   friendly_name: Office Lamp
+  emulated_hue_name: "Floor Lamp"
 light.ericks_desk_lamp:
   icon: mdi:lightbulb-outline
+  emulated_hue_name: "Desk Lamp"
 light.ceiling_fan_1:
   friendly_name: Ceiling Fan Front
 light.ceiling_fan_2:
diff --git a/customizations/scripts.yaml b/customizations/scripts.yaml
index 22a2f2c..6e081d0 100644
--- a/customizations/scripts.yaml
+++ b/customizations/scripts.yaml
@@ -19,9 +19,3 @@ 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
diff --git a/customizations/sensors.yaml b/customizations/sensors.yaml
index 6804f70..21d0451 100644
--- a/customizations/sensors.yaml
+++ b/customizations/sensors.yaml
@@ -165,3 +165,6 @@ sensor.ups_load_mean:
 sensor.breaches_somethingexamplecom:
   friendly_name: something@example.com
   icon: mdi:email-open-outline
+sensor.spare_outlet_consumption:
+  friendly_name: Christmas Tree
+  icon: mdi:pine-tree-box
diff --git a/customizations/switches.yaml b/customizations/switches.yaml
index 01842d1..7975332 100644
--- a/customizations/switches.yaml
+++ b/customizations/switches.yaml
@@ -7,11 +7,11 @@ switch.wireless_charger:
 switch.august_interior:
   friendly_name: Interior Bolt
   icon: mdi:key
-  emulated_hue: false
+  emulated_hue_hidden: true
 switch.august_keyed:
   friendly_name: Keyed Bolt
   icon: mdi:key
-  emulated_hue: false
+  emulated_hue_hidden: true
 switch.kitchen_nightlight:
   icon: mdi:theme-light-dark
 switch.alarm_status:
diff --git a/groups.yaml b/groups.yaml
index d86b1bd..985892e 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -67,14 +67,14 @@ master_bathroom:
     - light.master_bath_1
     - light.master_bath_2
     - light.master_bath_3
-    - input_slider.brightness_master_bath
+    - input_number.brightness_master_bath
     - input_select.scene_master_bath
 living_room:
   name: Living Room
   entities:
     - light.endtable
     - light.corner_table
-    - input_slider.brightness_lr
+    - input_number.brightness_lr
     - input_select.scene_lr
 dining_area:
   name: Kitchen & Dining
@@ -82,7 +82,7 @@ dining_area:
     - switch.kitchen
     - light.ceiling_fan_1
     - light.ceiling_fan_2
-    - input_slider.brightness_da
+    - input_number.brightness_da
     - input_select.scene_da
 office:
   name: Office
@@ -100,8 +100,10 @@ balcony:
     - switch.balcony_outlet
 other:
   name: Other
+  control: hidden
   entities:
     - switch.wireless_charger
+    - scene.all_lights_off
 temperature:
   name: Temperature
   entities:
@@ -195,6 +197,7 @@ sensor_apc:
     - sensor.ups_load_mean
 scripts_misc:
   name: Lock Actions
+  control: hidden
   entities:
     - script.restart_august_daemon
     - script.force_lock_interior
@@ -205,12 +208,10 @@ scripts_misc:
     - script.force_disconnect_keyed
 misc_misc:
   name: Other
+  control: hidden
   entities:
     - switch.alarm_status
     - switch.kitchen_nightlight
-    - scene.all_lights_off
-    - script.restart_dash_button_shm
-    - script.restart_dash_button_hac
 haveibeenpwned:
   name: haveibeenpwned
   entities:
diff --git a/hue-token-living-room.conf b/hue-token-living-room.conf
old mode 100755
new mode 100644
diff --git a/hue-token-office.conf b/hue-token-office.conf
old mode 100755
new mode 100644
diff --git a/input-sliders.yaml b/input-numbers.yaml
similarity index 84%
rename from input-sliders.yaml
rename to input-numbers.yaml
index c90683d..f4f24c2 100644
--- a/input-sliders.yaml
+++ b/input-numbers.yaml
@@ -4,15 +4,18 @@ brightness_da:
   min: 1
   max: 255
   step: 1
+  mode: slider
 brightness_lr:
   name: Brightness
   initial: 1
   min: 1
   max: 255
   step: 1
+  mode: slider
 brightness_master_bath:
   name: Brightness
   initial: 1
   min: 1
   max: 255
   step: 1
+  mode: slider
diff --git a/known_devices.yaml b/known_devices.yaml
index 8671e18..8563ff7 100644
--- a/known_devices.yaml
+++ b/known_devices.yaml
@@ -1,20 +1,20 @@
 green_keys:
   name: Green Keys
-  mac: 
-  picture: 
+  mac:
+  picture:
   track: yes
   hide_if_away: no
 
 eh_nexus_6:
   name: EH Nexus 6
   mac: -
-  picture: 
+  gravatar: !secret gravatar_erick
   track: yes
   hide_if_away: no
 
 cl_samsung_s5:
   name: CL Samsung S5
   mac: -
-  picture: 
+  gravatar: !secret gravatar_chris
   track: yes
   hide_if_away: no
diff --git a/scenes/master-bath-dash-off.yaml b/scenes/master-bath-dash-off.yaml
deleted file mode 100644
index 70be3d2..0000000
--- a/scenes/master-bath-dash-off.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-name: Master Bath Dash Off
-entities:
-  light.master_bath_1:
-    state: off
-  light.master_bath_2:
-    state: off
-  light.master_bath_3:
-    state: off
diff --git a/scenes/master-bath-dash-on.yaml b/scenes/master-bath-single-nightlight.yaml
similarity index 85%
rename from scenes/master-bath-dash-on.yaml
rename to scenes/master-bath-single-nightlight.yaml
index 2583a76..dc40c1a 100644
--- a/scenes/master-bath-dash-on.yaml
+++ b/scenes/master-bath-single-nightlight.yaml
@@ -1,4 +1,4 @@
-name: Master Bath Dash On
+name: Master Bath Single Nightlight
 entities:
   light.master_bath_1:
     state: off
diff --git a/scripts.yaml b/scripts.yaml
index 616a316..b6e8cc0 100644
--- a/scripts.yaml
+++ b/scripts.yaml
@@ -147,13 +147,3 @@ kitchen_light_timeout:
     - 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
diff --git a/sensors/template.yaml b/sensors/template.yaml
deleted file mode 100644
index 0bfc692..0000000
--- a/sensors/template.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-platform: template
-sensors:
-  pihole_queries_today:
-    value_template: '{{ states.sensor.pihole.attributes.queries_today | round(0) }}'
-    friendly_name: DNS Queries Today
-    entity_id: sensor.pihole
-  pihole_domains_blocked:
-    value_template: '{{ states.sensor.pihole.attributes.domains_blocked | round(0) }}'
-    friendly_name: Domains Blocked
-    entity_id: sensor.pihole
-  pihole_percent_ads_today:
-    value_template: '{{ states.sensor.pihole.attributes.percentage_today | round(1) }}'
-    friendly_name: Percent Ads Today
-    unit_of_measurement: '%'
-    entity_id: sensor.pihole
-  pihole_2_queries_today:
-    value_template: '{{ states.sensor.pihole_2.attributes.queries_today | round(0) }}'
-    friendly_name: DNS Queries Today (Backup)
-    entity_id: sensor.pihole_2
-  pihole_2_domains_blocked:
-    value_template: '{{ states.sensor.pihole_2.attributes.domains_blocked | round(0) }}'
-    friendly_name: Domains Blocked (Backup)
-    entity_id: sensor.pihole_2
-  pihole_2_percent_ads_today:
-    value_template: '{{ states.sensor.pihole_2.attributes.percentage_today | round(1) }}'
-    friendly_name: Percent Ads Today (Backup)
-    unit_of_measurement: '%'
-    entity_id: sensor.pihole_2
diff --git a/shell_commands.yaml b/shell_commands.yaml
index b2bb8ed..8e9b630 100644
--- a/shell_commands.yaml
+++ b/shell_commands.yaml
@@ -5,5 +5,3 @@ 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
-- 
GitLab