Sync with upstream

bffc6a9

automations/alert-office-cabinet.yaml

@@ -2,12 +2,11 @@ alias: Slack notification for office cabinet access
 trigger:
   - platform: state
     entity_id: binary_sensor.office_cabinet
-    to: "off"
+    to: "on"
   - platform: state
     entity_id: binary_sensor.office_cabinet_door_motion
     to: "on"
 action:
-  service: notify.slack
+  service: notify.mattermost
   data:
-    message: ':bellhop_bell: *Office cabinet accessed*'
-    target: '#home'
+    message: ':bell: **Office cabinet accessed**'

automations/apc-notification-not-online.yaml

@@ -8,7 +8,7 @@ action:
     data:
       message: "Office APC has status \"{{ states( 'sensor.ups_status' ) }}\""
       target: !secret jabber_recipient
-  - service: notify.slack
+  - service: notify.mattermost
     data:
       message: ":exclamation: :battery: Office APC has status \"{{ states( 'sensor.ups_status' ) }}\""
       target: '#home'

automations/apc-notification-online.yaml

@@ -8,7 +8,7 @@ action:
     data:
       message: 'Office APC is "ONLINE"'
       target: !secret jabber_recipient
-  - service: notify.slack
+  - service: notify.mattermost
     data:
       message: ':exclamation: :electric_plug: Office APC is "ONLINE"'
       target: '#home'

automations/balcony-sunrise-off.yaml

@@ -2,7 +2,7 @@ alias: 'Turn off balcony at sunrise'
 trigger:
   platform: sun
   event: sunrise
-  offset: "+00:60:00"
+  offset: "+00:30:00"
 condition:
   - condition: state
     entity_id: light.balcony

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

@@ -2,21 +2,15 @@ alias: Turn on dining area lights when front door opens
 trigger:
   platform: state
   entity_id: binary_sensor.front_door
-  to: 'off'
+  to: 'on'
 condition:
   condition: and
   conditions:
     - condition: state
-      entity_id: light.ceiling_fan_1
+      entity_id: group.living_room
       state: 'off'
     - condition: state
-      entity_id: light.ceiling_fan_2
-      state: 'off'
-    - condition: state
-      entity_id: light.endtable
-      state: 'off'
-    - condition: state
-      entity_id: light.corner_table
+      entity_id: group.dining_area
       state: 'off'
     - condition: state
       entity_id: binary_sensor.lr_motion_sensor_over_slider

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.office_bright
-    - scene.master_bedroom_bright
-    - scene.master_bath_bright
-    - scene.balcony_bright

automations/lights-off-no-one-home.yaml

+alias: Turn off certain lights when no one is home
+trigger:
+  platform: state
+  entity_id: group.presence
+  from: 'home'
+  to: 'not_home'
+action:
+  service: switch.turn_off
+  entity_id:
+    - switch.lava_lamp

automations/maybe-an-earthquake.yaml

@@ -35,7 +35,7 @@ action:
     data:
       message: 'MAYBE AN EARTHQUAKE?!? ALL ACCELEROMETERS ARE ACTIVE.'
       target: !secret jabber_recipient
-  - service: notify.slack
+  - service: notify.mattermost
     data:
       message: 'MAYBE AN EARTHQUAKE?!? ALL ACCELEROMETERS ARE ACTIVE.'
       target:

automations/update-notification.yaml

@@ -3,11 +3,6 @@ trigger:
   platform: state
   entity_id: updater.updater
 action:
-  - service: notify.jabber
-    data:
-      message: 'There is a new release of Home Assistant available.'
-      target: !secret jabber_recipient
-  - service: notify.slack
-    data:
-      message: ':exclamation: There is a new release of Home Assistant available.'
-      target: '#home'
+  service: notify.mattermost
+  data:
+    message: ':exclamation: There is a new release of Home Assistant available.'

binary-sensors/acceleration-dining-area-window.yaml

@@ -3,4 +3,4 @@ state_topic: "smartthings/Dining Area Window/acceleration"
 name: "Dining Area Window motion"
 payload_on: "active"
 payload_off: "inactive"
-sensor_class: moving
+device_class: moving

binary-sensors/acceleration-front-door.yaml

@@ -3,4 +3,4 @@ state_topic: "smartthings/Front Door/acceleration"
 name: "Front Door motion"
 payload_on: "active"
 payload_off: "inactive"
-sensor_class: moving
+device_class: moving

binary-sensors/acceleration-master-bedroom-window.yaml

@@ -3,4 +3,4 @@ state_topic: "smartthings/Master Bedroom Window/acceleration"
 name: "Master Bedroom Window motion"
 payload_on: "active"
 payload_off: "inactive"
-sensor_class: moving
+device_class: moving

binary-sensors/acceleration-office-cabinet.yaml

@@ -3,4 +3,4 @@ state_topic: "smartthings/Office Cabinet/acceleration"
 name: "Office Cabinet door motion"
 payload_on: "active"
 payload_off: "inactive"
-sensor_class: moving
+device_class: moving

binary-sensors/acceleration-office-window.yaml

@@ -3,4 +3,4 @@ state_topic: "smartthings/Office Window/acceleration"
 name: "Office Window motion"
 payload_on: "active"
 payload_off: "inactive"
-sensor_class: moving
+device_class: moving

binary-sensors/acceleration-slider.yaml

@@ -3,4 +3,4 @@ state_topic: "smartthings/Slider/acceleration"
 name: "Slider motion"
 payload_on: "active"
 payload_off: "inactive"
-sensor_class: moving
+device_class: moving

binary-sensors/co-gas-living-room.yaml

@@ -3,4 +3,4 @@ state_topic: "smartthings/Living Room Alarm/carbonMonoxide"
 name: "Living Room CO Detector"
 payload_on: "detected"
 payload_off: "clear"
-sensor_class: gas
+device_class: gas

binary-sensors/co-gas-master-bedroom.yaml

@@ -3,4 +3,4 @@ state_topic: "smartthings/Master Bedroom Alarm/carbonMonoxide"
 name: "Master Bedroom CO Detector"
 payload_on: "detected"
 payload_off: "clear"
-sensor_class: gas
+device_class: gas

binary-sensors/contact-dining-area-window.yaml

 platform: mqtt
 state_topic: "smartthings/Dining Area Window/contact"
 name: "Dining Area Window"
-payload_on: "closed"
-payload_off: "open"
-sensor_class: opening
+payload_on: "open"
+payload_off: "closed"
+device_class: opening

binary-sensors/contact-front-door.yaml

 platform: mqtt
 state_topic: "smartthings/Front Door/contact"
 name: "Front Door"
-payload_on: "closed"
-payload_off: "open"
-sensor_class: opening
+payload_on: "open"
+payload_off: "closed"
+device_class: opening

binary-sensors/contact-master-bedroom-window.yaml

 platform: mqtt
 state_topic: "smartthings/Master Bedroom Window/contact"
 name: "Master Bedroom Window"
-payload_on: "closed"
-payload_off: "open"
-sensor_class: opening
+payload_on: "open"
+payload_off: "closed"
+device_class: opening