Sync with upstream

edadb98

automations/dining-area-on-at-entry.yaml

 alias: Turn on dining area lights when front door opens
 trigger:
-  - platform: state
-    entity_id: binary_sensor.front_door
-    to: 'off'
+  platform: state
+  entity_id: binary_sensor.front_door
+  to: 'off'
 condition:
   condition: and
   conditions:

automations/dining-area-timeout.yaml

 alias: Turn off dining area lights after no motion
 trigger:
-  - platform: state
-    entity_id: binary_sensor.lr_motion_sensor_over_utility_closet
-    to: 'on'
+  platform: state
+  entity_id: binary_sensor.lr_motion_sensor_over_utility_closet
+  to: 'on'
 condition:
   condition: or
   conditions:

automations/dining-area-window-opened-outside.yaml

 alias: Turn on lights when dining room window opened from outside
 trigger:
-  - platform: state
-    entity_id: binary_sensor.dining_area_window_motion
-    to: 'on'
+  platform: state
+  entity_id: binary_sensor.dining_area_window_motion
+  to: 'on'
 condition:
   condition: and
   conditions:

automations/kitchen-light-timeout.yaml

 alias: Turn off kitchen light after no motion
 trigger:
-  - platform: state
-    entity_id: switch.kitchen
-    to: 'on'
+  platform: state
+  entity_id: binary_sensor.kitchen
+  to: 'on'
 condition:
-  condition: and
+  condition: or
   conditions:
     - condition: state
-      entity_id: binary_sensor.kitchen
+      entity_id: switch.kitchen
       state: 'on'
 action:
   service: homeassistant.turn_on

automations/lights-off-when-alarm-away.yaml

 alias: Turn off lights when alarm is set to away
 trigger:
-  - platform: state
-    entity_id: alarm_control_panel.shm
-    to: 'armed_away'
+  platform: state
+  entity_id: alarm_control_panel.shm
+  to: 'armed_away'
 action:
   service: homeassistant.turn_off
   entity_id:

automations/living-room-timeout.yaml

 alias: Turn off living room lights after no motion
 trigger:
-  - platform: state
-    entity_id: binary_sensor.lr_motion_sensor_over_slider
-    to: 'on'
+  platform: state
+  entity_id: binary_sensor.lr_motion_sensor_over_slider
+  to: 'on'
 condition:
   condition: or
   conditions:

automations/maybe-an-earthquake.yaml

 alias: Turn on all lights when all accelerometers move
 trigger:
-  - platform: state
-    entity_id: binary_sensor.office_cabinet_door_motion
-    to: 'on'
+  platform: state
+  entity_id: binary_sensor.office_cabinet_door_motion
+  to: 'on'
 condition:
   condition: and
   conditions:

automations/office-lights-timeout.yaml

 alias: Turn off office lights after no motion
 trigger:
-  - platform: state
-    entity_id: binary_sensor.office_motion_sensor_over_closet
-    to: 'on'
+  platform: state
+  entity_id: binary_sensor.office_motion_sensor_over_closet
+  to: 'on'
 condition:
   condition: or
   conditions:

automations/scenes-balcony.yaml

+alias: Scene Balcony
+trigger:
+  platform: state
+  entity_id: input_select.scene_balcony
+action:
+  - service: scene.turn_on
+    data_template:
+      entity_id: >
+        {% if is_state( "input_select.scene_balcony", "Nightlight" ) %}
+          scene.balcony_nightlight
+        {%-elif is_state( "input_select.scene_balcony", "Dimmed" ) %}
+          scene.balcony_dimmed
+        {%-elif is_state( "input_select.scene_balcony", "Relax" ) %}
+          scene.balcony_relax
+        {%-elif is_state( "input_select.scene_balcony", "Read" ) %}
+          scene.balcony_read
+        {%-elif is_state( "input_select.scene_balcony", "Bright" ) %}
+          scene.balcony_concentrate
+        {%-elif is_state( "input_select.scene_balcony", "Off" ) %}
+          scene.balcony_off
+        {% endif %}
+  - service: input_select.select_option
+    data:
+      entity_id: input_select.scene_balcony
+      option: "-"

automations/scenes-dining-area.yaml

+alias: Scene Dining Area
+trigger:
+  platform: state
+  entity_id: input_select.scene_da
+action:
+  - service: scene.turn_on
+    data_template:
+      entity_id: >
+        {% if is_state( "input_select.scene_da", "Nightlight" ) %}
+          scene.da_nightlight
+        {%-elif is_state( "input_select.scene_da", "Dimmed" ) %}
+          scene.da_dimmed
+        {%-elif is_state( "input_select.scene_da", "Relax" ) %}
+          scene.da_relax
+        {%-elif is_state( "input_select.scene_da", "Read" ) %}
+          scene.da_read
+        {%-elif is_state( "input_select.scene_da", "Bright" ) %}
+          scene.da_concentrate
+        {%-elif is_state( "input_select.scene_da", "Off" ) %}
+          scene.da_off
+        {% endif %}
+  - service: input_select.select_option
+    data:
+      entity_id: input_select.scene_da
+      option: "-"

automations/scenes-ericks-desk-lamp.yaml

+alias: Scene Erick's Desk Lamp
+trigger:
+  platform: state
+  entity_id: input_select.scene_ericks_desk_lamp
+action:
+  - service: scene.turn_on
+    data_template:
+      entity_id: >
+        {% if is_state( "input_select.scene_ericks_desk_lamp", "Nightlight" ) %}
+          scene.ericks_desk_lamp_nightlight
+        {%-elif is_state( "input_select.scene_ericks_desk_lamp", "Dimmed" ) %}
+          scene.ericks_desk_lamp_dimmed
+        {%-elif is_state( "input_select.scene_ericks_desk_lamp", "Relax" ) %}
+          scene.ericks_desk_lamp_relax
+        {%-elif is_state( "input_select.scene_ericks_desk_lamp", "Read" ) %}
+          scene.ericks_desk_lamp_read
+        {%-elif is_state( "input_select.scene_ericks_desk_lamp", "Bright" ) %}
+          scene.ericks_desk_lamp_concentrate
+        {%-elif is_state( "input_select.scene_ericks_desk_lamp", "Off" ) %}
+          scene.ericks_desk_lamp_off
+        {% endif %}
+  - service: input_select.select_option
+    data:
+      entity_id: input_select.scene_ericks_desk_lamp
+      option: "-"

automations/scenes-living-room.yaml

+alias: Scene Living Room
+trigger:
+  platform: state
+  entity_id: input_select.scene_lr
+action:
+  - service: scene.turn_on
+    data_template:
+      entity_id: >
+        {% if is_state( "input_select.scene_lr", "Nightlight" ) %}
+          scene.lr_nightlight
+        {%-elif is_state( "input_select.scene_lr", "Dimmed" ) %}
+          scene.lr_dimmed
+        {%-elif is_state( "input_select.scene_lr", "Relax" ) %}
+          scene.lr_relax
+        {%-elif is_state( "input_select.scene_lr", "Read" ) %}
+          scene.lr_read
+        {%-elif is_state( "input_select.scene_lr", "Bright" ) %}
+          scene.lr_concentrate
+        {%-elif is_state( "input_select.scene_lr", "Off" ) %}
+          scene.lr_off
+        {% endif %}
+  - service: input_select.select_option
+    data:
+      entity_id: input_select.scene_lr
+      option: "-"

automations/scenes-master-bath.yaml

+alias: Scene Master Bath
+trigger:
+  platform: state
+  entity_id: input_select.scene_master_bath
+action:
+  - service: scene.turn_on
+    data_template:
+      entity_id: >
+        {% if 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
+        {%-elif is_state( "input_select.scene_master_bath", "Relax" ) %}
+          scene.master_bath_relax
+        {%-elif is_state( "input_select.scene_master_bath", "Read" ) %}
+          scene.master_bath_read
+        {%-elif is_state( "input_select.scene_master_bath", "Bright" ) %}
+          scene.master_bath_concentrate
+        {%-elif is_state( "input_select.scene_master_bath", "Off" ) %}
+          scene.master_bath_off
+        {% endif %}
+  - service: input_select.select_option
+    data:
+      entity_id: input_select.scene_master_bath
+      option: "-"

automations/scenes-master-bedroom.yaml

+alias: Scene Master Bedroom
+trigger:
+  platform: state
+  entity_id: input_select.scene_master_bedroom
+action:
+  - service: scene.turn_on
+    data_template:
+      entity_id: >
+        {% if is_state( "input_select.scene_master_bedroom", "Nightlight" ) %}
+          scene.master_bedroom_nightlight
+        {%-elif is_state( "input_select.scene_master_bedroom", "Dimmed" ) %}
+          scene.master_bedroom_dimmed
+        {%-elif is_state( "input_select.scene_master_bedroom", "Relax" ) %}
+          scene.master_bedroom_relax
+        {%-elif is_state( "input_select.scene_master_bedroom", "Read" ) %}
+          scene.master_bedroom_read
+        {%-elif is_state( "input_select.scene_master_bedroom", "Bright" ) %}
+          scene.master_bedroom_concentrate
+        {%-elif is_state( "input_select.scene_master_bedroom", "Off" ) %}
+          scene.master_bedroom_off
+        {% endif %}
+  - service: input_select.select_option
+    data:
+      entity_id: input_select.scene_master_bedroom
+      option: "-"

automations/scenes-office.yaml

+alias: Scene Office
+trigger:
+  platform: state
+  entity_id: input_select.scene_office
+action:
+  - service: scene.turn_on
+    data_template:
+      entity_id: >
+        {% if is_state( "input_select.scene_office", "Nightlight" ) %}
+          scene.office_nightlight
+        {%-elif is_state( "input_select.scene_office", "Dimmed" ) %}
+          scene.office_dimmed
+        {%-elif is_state( "input_select.scene_office", "Relax" ) %}
+          scene.office_relax
+        {%-elif is_state( "input_select.scene_office", "Read" ) %}
+          scene.office_read
+        {%-elif is_state( "input_select.scene_office", "Bright" ) %}
+          scene.office_concentrate
+        {%-elif is_state( "input_select.scene_office", "Off" ) %}
+          scene.office_off
+        {% endif %}
+  - service: input_select.select_option
+    data:
+      entity_id: input_select.scene_office
+      option: "-"

automations/update-notification.yaml

 alias: Update notifications
 trigger:
-  - platform: state
-    entity_id: updater.updater
+  platform: state
+  entity_id: updater.updater
 action:
   service: notify.jabber
   data:

automations/wireless-charger-timeout.yaml

 alias: Turn off wireless charger after delay
 trigger:
-  - platform: state
-    entity_id: switch.wireless_charger
-    to: 'on'
+  platform: state
+  entity_id: switch.wireless_charger
+  to: 'on'
 action:
   service: homeassistant.turn_on
   entity_id: script.wireless_charger_set_timeout

configuration.yaml

@@ -40,10 +40,6 @@ recorder:
 # Enables support for tracking state changes over time.
 history:
 
-# Save events to logentries service
-logentries:
-  token: !secret logentries_token
-
 # Discover some devices automatically
 discovery:
 
@@ -88,4 +84,6 @@ shell_command: !include shell_commands.yaml
 automation: !include_dir_list automations
 
 # Controls
+input_select: !include input-selects.yaml
+
 input_slider: !include input-sliders.yaml

customizations/lights.yaml

+light.office:
+  friendly_name: Office Lamp
 light.ericks_desk_lamp:
   icon: mdi:lightbulb-outline
 light.ceiling_fan_1:

customizations/scenes.yaml

@@ -13,6 +13,9 @@ scene.master_bedroom_read:
 scene.master_bedroom_concentrate:
   friendly_name: 'Bright'
   icon: mdi:star-circle
+scene.master_bedroom_off:
+  friendly_name: 'Off'
+  icon: mdi:flashlight-off
 scene.master_bath_nightlight:
   friendly_name: 'Nightlight'
   icon: mdi:brightness-4
@@ -28,6 +31,9 @@ scene.master_bath_read:
 scene.master_bath_concentrate:
   friendly_name: 'Bright'
   icon: mdi:star-circle
+scene.master_bath_off:
+  friendly_name: 'Off'
+  icon: mdi:flashlight-off
 scene.lr_nightlight:
   friendly_name: 'Nightlight'
   icon: mdi:brightness-4
@@ -43,6 +49,9 @@ scene.lr_read:
 scene.lr_concentrate:
   friendly_name: 'Bright'
   icon: mdi:star-circle
+scene.lr_off:
+  friendly_name: 'Off'
+  icon: mdi:flashlight-off
 scene.da_nightlight:
   friendly_name: 'Nightlight'
   icon: mdi:brightness-4
@@ -58,6 +67,9 @@ scene.da_read:
 scene.da_concentrate:
   friendly_name: 'Bright'
   icon: mdi:star-circle
+scene.da_off:
+  friendly_name: 'Off'
+  icon: mdi:flashlight-off
 scene.office_nightlight:
   friendly_name: 'Nightlight'
   icon: mdi:brightness-4
@@ -73,12 +85,18 @@ scene.office_read:
 scene.office_concentrate:
   friendly_name: 'Bright'
   icon: mdi:star-circle
+scene.office_off:
+  friendly_name: 'Off'
+  icon: mdi:flashlight-off
 scene.ericks_desk_lamp_nightlight:
   friendly_name: 'Desk Lamp Dim'
   icon: mdi:brightness-3
 scene.ericks_desk_lamp_relax:
   friendly_name: 'Desk Lamp Bright'
   icon: mdi:brightness-1
+scene.ericks_desk_lamp_off:
+  friendly_name: 'Desk Lamp Off'
+  icon: mdi:flashlight-off
 scene.balcony_nightlight:
   friendly_name: 'Nightlight'
   icon: mdi:brightness-4
@@ -94,3 +112,6 @@ scene.balcony_read:
 scene.balcony_concentrate:
   friendly_name: 'Bright'
   icon: mdi:star-circle
+scene.balcony_off:
+  friendly_name: 'Off'
+  icon: mdi:flashlight-off