Sync with upstream 76416e0

.HA_VERSION

-0.93.2
\ No newline at end of file
+0.102.3
\ No newline at end of file

asuswrt.yaml

-host: 192.168.1.1
-username: !secret asus_user
-ssh_key: !secret asus_key

automations.yaml

+[]

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/alert-garage-camera-offline.yaml

+alias: Alert when Garage Camera offline
+description: ''
+trigger:
+  - entity_id: device_tracker.50_dc_e7_14_03_ba
+    from: home
+    platform: state
+    to: not_home
+condition: []
+action:
+  - service: notify.mattermost
+    data:
+      message: ':exclamation: Garage camera offline!'

automations/alert-myq-offline.yaml

+alias: Alert when myQ offline
+description: ''
+trigger:
+  - entity_id: device_tracker.64_52_99_c1_9f_68
+    from: home
+    platform: state
+    to: not_home
+condition: []
+action:
+  - service: notify.mattermost
+    data:
+      message: ':exclamation: myQ offline!'

automations/balcony-late-night-dim.yaml

@@ -3,9 +3,14 @@ trigger:
   platform: time
   at: "00:00"
 condition:
-  - condition: state
-    entity_id: light.balcony
-    state: 'on'
+  condition: or
+  conditions:
+    - condition: state
+      entity_id: light.balcony_left
+      state: 'on'
+    - condition: state
+      entity_id: light.balcony_right
+      state: 'on'
 action:
   service: scene.turn_on
   entity_id: scene.balcony_dimmed

automations/balcony-relax-after-sunset.yaml

@@ -4,11 +4,15 @@ trigger:
   entity_id: sun.sun
   from: 'above_horizon'
   to: 'below_horizon'
-  # offset: "+00:30:00"
 condition:
-  - condition: state
-    entity_id: light.balcony
-    state: 'on'
+  condition: or
+  conditions:
+    - condition: state
+      entity_id: light.balcony_left
+      state: 'on'
+    - condition: state
+      entity_id: light.balcony_right
+      state: 'on'
 action:
   service: scene.turn_on
   entity_id: scene.balcony_relax

automations/balcony-sunrise-off.yaml

@@ -2,11 +2,16 @@ alias: 'Turn off balcony at sunrise'
 trigger:
   platform: sun
   event: sunrise
-  offset: "+00:30:00"
+  offset: "+00:10:00"
 condition:
-  - condition: state
-    entity_id: light.balcony
-    state: 'on'
+  condition: or
+  conditions:
+    - condition: state
+      entity_id: light.balcony_left
+      state: 'on'
+    - condition: state
+      entity_id: light.balcony_right
+      state: 'on'
 action:
-  service: light.turn_off
-  entity_id: light.balcony
+  service: scene.turn_on
+  entity_id: scene.balcony_off

automations/balcony-sunset-on.yaml

@@ -2,11 +2,16 @@ alias: 'Turn on balcony at sunset'
 trigger:
   platform: sun
   event: sunset
-  offset: "-00:60:00"
+  offset: "+00:30:00"
 condition:
-  - condition: state
-    entity_id: light.balcony
-    state: 'off'
+  condition: and
+  conditions:
+    - condition: state
+      entity_id: light.balcony_left
+      state: 'off'
+    - condition: state
+      entity_id: light.balcony_right
+      state: 'off'
 action:
-  service: light.turn_on
-  entity_id: light.balcony
+  service: scene.turn_on
+  entity_id: scene.balcony_relax

automations/brightness-balcony-set.yaml

+alias: Brightness Balcony
+trigger:
+  platform: state
+  entity_id: input_number.brightness_balcony
+action:
+  service: light.turn_on
+  data:
+    entity_id:
+      - light.balcony_left
+      - light.balcony_right
+  data_template:
+    brightness: '{{ states( "input_number.brightness_balcony" )|round( 0 ) }}'

automations/brightness-dining-area-sync.yaml → automations/brightness-balcony-sync.yaml

-alias: Brightness Dining Area Sync
+alias: Brightness Balcony Sync
 trigger:
   - platform: state
-    entity_id: light.ceiling_fan_1
+    entity_id: light.balcony_left
   - platform: state
-    entity_id: light.ceiling_fan_2
+    entity_id: light.balcony_right
 condition:
   condition: and
   conditions:
     - condition: state
-      entity_id: light.ceiling_fan_1
+      entity_id: light.balcony_left
       state: 'on'
     - condition: state
-      entity_id: light.ceiling_fan_2
+      entity_id: light.balcony_right
       state: 'on'
 action:
   service: input_number.set_value
   data_template:
-    entity_id: input_number.brightness_da
+    entity_id: input_number.brightness_balcony
     value: '{{ trigger.to_state.attributes.brightness|float }}'

automations/brightness-dining-area-set.yaml → automations/brightness-den-set.yaml

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

automations/brightness-den-sync.yaml

+alias: Brightness Den Sync
+trigger:
+  - platform: state
+    entity_id: light.den_left
+  - platform: state
+    entity_id: light.den_right
+condition:
+  condition: and
+  conditions:
+    - condition: state
+      entity_id: light.den_left
+      state: 'on'
+    - condition: state
+      entity_id: light.den_right
+      state: 'on'
+action:
+  service: input_number.set_value
+  data_template:
+    entity_id: input_number.brightness_den
+    value: '{{ trigger.to_state.attributes.brightness|float }}'

automations/brightness-living-room-set.yaml

@@ -6,7 +6,7 @@ action:
   service: light.turn_on
   data:
     entity_id:
-      - light.endtable
-      - light.corner_table
+      - light.living_room_endtable_left
+      - light.living_room_endtable_right
   data_template:
     brightness: '{{ states( "input_number.brightness_lr" )|round( 0 ) }}'

automations/brightness-living-room-sync.yaml

 alias: Brightness Living Room Sync
 trigger:
   - platform: state
-    entity_id: light.endtable
+    entity_id: light.living_room_endtable_left
   - platform: state
-    entity_id: light.corner_table
+    entity_id: light.living_room_endtable_right
 condition:
   condition: and
   conditions:
     - condition: state
-      entity_id: light.endtable
+      entity_id: light.living_room_endtable_left
       state: 'on'
     - condition: state
-      entity_id: light.corner_table
+      entity_id: light.living_room_endtable_right
       state: 'on'
 action:
   service: input_number.set_value

automations/brightness-lr-ceiling-set.yaml

+alias: Brightness LR Ceiling
+trigger:
+  platform: state
+  entity_id: input_number.brightness_lr_ceiling
+action:
+  service: light.turn_on
+  data:
+    entity_id:
+      - light.living_room_left
+      - light.living_room_center
+      - light.living_room_right
+  data_template:
+    brightness: '{{ states( "input_number.brightness_lr_ceiling" )|round( 0 ) }}'

automations/brightness-master-bath-sync.yaml → automations/brightness-lr-ceiling-sync.yaml

-alias: Brightness Master Bath Sync
+alias: Brightness LR Ceiling Sync
 trigger:
   - platform: state
-    entity_id: light.master_bath_1
+    entity_id: light.living_room_left
   - platform: state
-    entity_id: light.master_bath_2
+    entity_id: light.living_room_center
   - platform: state
-    entity_id: light.master_bath_3
+    entity_id: light.living_room_right
 condition:
   condition: and
   conditions:
     - condition: state
-      entity_id: light.master_bath_1
+      entity_id: light.living_room_left
       state: 'on'
     - condition: state
-      entity_id: light.master_bath_2
+      entity_id: light.living_room_center
       state: 'on'
     - condition: state
-      entity_id: light.master_bath_3
+      entity_id: light.living_room_right
       state: 'on'
 action:
   service: input_number.set_value
   data_template:
-    entity_id: input_number.brightness_master_bath
+    entity_id: input_number.brightness_lr_ceiling
     value: '{{ trigger.to_state.attributes.brightness|float }}'

automations/brightness-master-bath-set.yaml

-alias: Brightness Master Bath
-trigger:
-  platform: state
-  entity_id: input_number.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_number.brightness_master_bath" )|round( 0 ) }}'

automations/brightness-master-bedroom-set.yaml

+alias: Brightness Master Bedroom
+trigger:
+  platform: state
+  entity_id: input_number.brightness_master_bedroom
+action:
+  service: light.turn_on
+  data:
+    entity_id:
+      - light.nightstand_left
+      - light.nightstand_right
+  data_template:
+    brightness: '{{ states( "input_number.brightness_master_bedroom" )|round( 0 ) }}'

automations/brightness-master-bedroom-sync.yaml

+alias: Brightness Master Bedroom Sync
+trigger:
+  - platform: state
+    entity_id: light.nightstand_left
+  - platform: state
+    entity_id: light.nightstand_right
+condition:
+  condition: and
+  conditions:
+    - condition: state
+      entity_id: light.nightstand_left
+      state: 'on'
+    - condition: state
+      entity_id: light.nightstand_right
+      state: 'on'
+action:
+  service: input_number.set_value
+  data_template:
+    entity_id: input_number.brightness_master_bedroom
+    value: '{{ trigger.to_state.attributes.brightness|float }}'

automations/common-area-timeout.yaml

+alias: Turn off common area items after no motion
+trigger:
+  platform: state
+  entity_id: binary_sensor.common_area
+  to: 'on'
+condition:
+  condition: or
+  conditions:
+    - condition: state
+      entity_id: light.living_room_endtable_left
+      state: 'on'
+    - condition: state
+      entity_id: light.living_room_endtable_right
+      state: 'on'
+    - condition: state
+      entity_id: light.living_room_left
+      state: 'on'
+    - condition: state
+      entity_id: light.living_room_center
+      state: 'on'
+    - condition: state
+      entity_id: light.living_room_right
+      state: 'on'
+    - condition: state
+      entity_id: light.kitchen_entrance
+      state: 'on'
+    - condition: state
+      entity_id: light.entryway
+      state: 'on'
+    - condition: state
+      entity_id: light.dining_corner
+      state: 'on'
+    - condition: state
+      entity_id: switch.fireplace
+      state: 'on'
+    - condition: state
+      entity_id: switch.over_front_door
+      state: 'on'
+action:
+  service: homeassistant.turn_on
+  entity_id: script.common_area_set_timeout

automations/living-room-timeout.yaml → automations/den-lights-timeout.yaml

-alias: Turn off living room lights after no motion
+alias: Turn off den lights after no motion
 trigger:
   platform: state
-  entity_id: binary_sensor.lr_motion_sensor_over_slider
+  entity_id: binary_sensor.den_motion_sensor
   to: 'on'
 condition:
   condition: or
   conditions:
     - condition: state
-      entity_id: light.endtable
+      entity_id: light.den_left
       state: 'on'
     - condition: state
-      entity_id: light.corner_table
+      entity_id: light.den_right
+      state: 'on'
+    - condition: state
+      entity_id: switch.lava_lamp
       state: 'on'
 action:
   service: homeassistant.turn_on
-  entity_id: script.living_room_lights_set_timeout
+  entity_id: script.den_lights_set_timeout

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'
-condition:
-  condition: or
-  conditions:
-    - condition: state
-      entity_id: light.ceiling_fan_1
-      state: 'on'
-    - condition: state
-      entity_id: light.ceiling_fan_2
-      state: 'on'
-action:
-  service: homeassistant.turn_on
-  entity_id: script.dining_area_lights_set_timeout

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'
-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

automations/ecobee-away.yaml

+alias: Set ecobee to away when we leave
+trigger:
+  platform: state
+  entity_id: group.presence
+  from: 'home'
+  to: 'not_home'
+  for:
+    hours: 0
+    minutes: 10
+    seconds: 0
+action:
+  service: climate.set_preset_mode
+  data:
+    entity_id: climate.forest_park
+    preset_mode: Away

automations/ecobee-home.yaml

+alias: Set ecobee to home when we return
+trigger:
+  platform: state
+  entity_id: group.presence
+  from: 'not_home'
+  to: 'home'
+action:
+  - service: climate.set_preset_mode
+    data:
+      entity_id: climate.forest_park
+      preset_mode: Home
+  - service: ecobee.resume_program
+    data:
+      entity_id: climate.forest_park
+      resume_all: 'true'

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

-alias: Turn on dining area lights when front door opens
+alias: Turn on lights when front door opens
 trigger:
   platform: state
   entity_id: binary_sensor.front_door
@@ -10,20 +10,17 @@ condition:
       entity_id: group.living_room
       state: 'off'
     - condition: state
-      entity_id: group.dining_area
+      entity_id: group.entryway
       state: 'off'
     - condition: state
-      entity_id: binary_sensor.lr_motion_sensor_over_slider
+      entity_id: group.kitchen
       state: 'off'
     - condition: state
-      entity_id: binary_sensor.lr_motion_sensor_over_utility_closet
-      state: 'off'
-    - condition: state
-      entity_id: binary_sensor.kitchen
+      entity_id: binary_sensor.common_area
       state: 'off'
     - condition: state
       entity_id: sun.sun
       state: 'below_horizon'
 action:
   service: scene.turn_on
-  entity_id: scene.da_relax
+  entity_id: scene.entryway_bright

automations/kitchen-light-timeout.yaml

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

automations/kitchen-nightlight-off.yaml

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

automations/kitchen-nightlight-on-am.yaml

 alias: Turn kitchen nightlight on AM
 trigger:
   - platform: state
-    entity_id: switch.kitchen
+    entity_id: light.living_room_right
   - platform: state
-    entity_id: light.ceiling_fan_1
+    entity_id: light.kitchen_entrance
   - 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
+    entity_id: binary_sensor.common_area
 condition:
   condition: and
   conditions:
@@ -22,13 +18,10 @@ condition:
     - condition: time
       before: '09:00:00'
     - condition: state
-      entity_id: light.ceiling_fan_1
-      state: 'off'
-    - condition: state
-      entity_id: light.ceiling_fan_2
+      entity_id: light.living_room_right
       state: 'off'
     - condition: state
-      entity_id: switch.kitchen
+      entity_id: light.kitchen_entrance
       state: 'off'
 action:
   service: switch.turn_on

automations/kitchen-nightlight-on-pm.yaml

 alias: Turn kitchen nightlight on PM
 trigger:
   - platform: state
-    entity_id: switch.kitchen
+    entity_id: light.living_room_right
   - platform: state
-    entity_id: light.ceiling_fan_1
+    entity_id: light.kitchen_entrance
   - platform: state
-    entity_id: light.ceiling_fan_2
-  -