Update to v2023.8.2

Custom bluetooth, commonize alert actions, misc fixes
jazzyisj · Aug 13, 2023 · 2021cd8 · 2021cd8
1 parent 00c39f8
commit 2021cd8
Show file tree

Hide file tree

Showing 84 changed files with 679 additions and 313 deletions.
diff --git a/automations/camera/automation_camera_object_detected.yaml b/automations/camera/automation_camera_object_detected.yaml
@@ -99,12 +99,12 @@
                       vibrationPattern: !secret ALERT_VIBRATION
                       clickAction: "/lovelace/{{ camera|replace('_','-') ~ '-camera' }}"
                       actions:
+                        - title: "Pause"
+                          action: pause_camera_object_notifications
+
                         - title: "Cameras"
                           action: URI
                           uri: !secret LOREX_URI
 
                         - title: "Disable Cam"
                           action: "{{ camera }}_detection_off"
-
-                        - title: "Pause Alerts"
-                          action: pause_camera_object_notifications
diff --git a/automations/hass/automation_hass_alert_notification.yaml b/automations/hass/automation_hass_alert_notification.yaml
@@ -45,8 +45,8 @@
               data:
                 title: "{{ tag|replace('_',' ')|title }}"
                 message: >
-                  - {{ expand(state_attr(sensor,'entity_id'))
-                        |map(attribute='name')|sort|join('<br>- ')|truncate(500) }}
+                  {{ expand(state_attr(sensor,'entity_id'))
+                      |map(attribute='name')|sort|join('\n')|truncate(500) }}
                 data:
                   tag: "{{ tag }}"
                   group: System
@@ -62,7 +62,7 @@
                   vibrationPattern: !secret ALERT_VIBRATION
                   clickAction: /ui-system/hass
                   actions:
-                    - title: "Pause Alert"
+                    - title: "Pause"
                       action: "pause_alert_{{ tag }}"
 
                     - title: "View"
@@ -130,7 +130,7 @@
       event_data:
         action: shutdown_server
   action:
-    #TODO phone needs to be unlocked
+    #LOCKED phone needs to be unlocked
     - choose:
         - conditions: "{{ trigger.id == 'restart' }}"
           sequence:

diff --git a/automations/hass/automation_hass_startup_shutdown.yaml b/automations/hass/automation_hass_startup_shutdown.yaml
@@ -93,8 +93,8 @@
                   icon: !secret HASS_ICON
                   badge: !secret HASS_BADGE
                   actions:
-                    - title: "Close"
-                      action: close_hass_restart
+                    - title: "Dismiss"
+                      action: dismiss_hass_restart
 
     - service: system_log.write
       data:
@@ -134,7 +134,7 @@
     - platform: event
       event_type: html5_notification.clicked
       event_data:
-        action: close_hass_restart
+        action: dismiss_hass_restart
 
     - platform: event
       event_type: mobile_app_notification_cleared

diff --git a/automations/mobile/jason/automation_mobile_jason_alert_announcements.yaml b/automations/mobile/jason/automation_mobile_jason_alert_announcements.yaml
@@ -18,6 +18,9 @@
         Jason, your mobile phone went offline at
         {{ as_local(states.binary_sensor.jason_phone_connected.last_changed).strftime('%-I:%M %p') }}
       {% elif t == 'alert.jason_phone_bluetooth_off' %}
+        Jason your mobile phone bluetooth is not connected to HASS.
+      {% elif t == 'alert.jason_phone_bluetooth_disconnected' %}
+        Jason, your phone ringer is off.
         Jason, your phone bluetooth is off.
       {% elif t == 'alert.jason_phone_bluetooth_device' %}
         Jason, get your shit together.
@@ -41,6 +44,7 @@
         - alert.jason_phone_ringer_off
         - alert.jason_phone_offline
         - alert.jason_phone_bluetooth_off
+        - alert.jason_phone_bluetooth_disconnected
         - alert.jason_phone_bluetooth_device
         - alert.jason_phone_battery_low
         - alert.jason_phone_high_accuracy

diff --git a/automations/notify/automation_notify_alert_notification.yaml b/automations/notify/automation_notify_alert_notification.yaml
@@ -85,6 +85,7 @@
         - alert.camera_stream
         - alert.camera_tamper
         - alert.jason_phone_battery_low
+        - alert.jason_phone_bluetooth_disconnected
         - alert.jason_phone_bluetooth_device
         - alert.jason_phone_bluetooth_off
         - alert.jason_phone_high_accuracy

diff --git a/automations/presence/automation_presence_occupancy_notification.yaml b/automations/presence/automation_presence_occupancy_notification.yaml
@@ -146,7 +146,7 @@
               importance: max
               ttl: 0
               priority: high
-              visibility: public
+              visibility: private
               notification_icon: "{{ states.input_select.occupancy_mode.attributes.icon }}"
               icon_url: !secret OCCUPANCY_ICON
               ledColor: !secret NOTIFY_COLOR

diff --git a/automations/weather/automation_weather_gdacs_alert.yaml b/automations/weather/automation_weather_gdacs_alert.yaml
@@ -39,7 +39,7 @@
           vibrationPattern: !secret ALERT_VIBRATION
           clickAction: !secret GDACS
           actions:
-            - title: "Pause Alert"
+            - title: "Pause"
               action: turn_off_gdacs_display
 
 ###############################################################################

diff --git a/include/mass_playlist_template.yaml b/include/mass_playlist_template.yaml
@@ -1,10 +1,14 @@
 ###############################################################################
-## Media Player Entities Single (no groups, mobile players)
+## #MASS Playlist Entries
 ###############################################################################
 >
   {{ [
+    "93.9 Virgin Radio",
     "105.1 The Bounce",
-    "magic_80",
+    "Cool 100.7",
+    "Mix 96.7",
+    "AM 800 CKLW",
+    "CFMK Big 96.3 Kingston, ON",
     "'90s Aggro Anthems",
     "2000s Hip Hop",
     "2000s Hits Throwbacks | Top 100 Songs",

diff --git a/logging/recorder.yaml b/logging/recorder.yaml
@@ -94,7 +94,6 @@ include:
     # ~~~~ Weatherflow Local ~~~~ # graphs
     - sensor.weatherflow_local_battery
     - sensor.weatherflow_local_voltage
-    - sensor.weatherflow_local_zambretti_text #TEST
 
     # ~~~~ Shelly Devices ~~~~
     - sensor.indoor_sump_count # history stats

diff --git a/packages/media/package_alarm_clock.yaml b/packages/media/package_alarm_clock.yaml
@@ -447,8 +447,8 @@ alert:
       vibrationPattern: !secret ALERT_VIBRATION
       clickAction: /ui-mobile/presence
       actions:
+        - title: "Pause"
+          action: pause_alarm_clock_presence
+
         - title: "Alarm Off"
           action: turn_off_alarm_clock
-
-        - title: "Pause Alert"
-          action: pause_alarm_clock_presence
diff --git a/packages/mobile/package_moblie_jason.yaml b/packages/mobile/package_moblie_jason.yaml
@@ -6,6 +6,9 @@ homeassistant:
     alert.jason_phone_high_accuracy:
       icon: mdi:crosshairs-gps
       category: mobile
+    alert.jason_phone_bluetooth_disconnected:
+      icon: mdi:phone-bluetooth
+      category: mobile
     alert.jason_phone_bluetooth_device:
       icon: mdi:headphones-bluetooth
       category: mobile
@@ -138,9 +141,38 @@ alert:
       vibrationPattern: !secret ALERT_VIBRATION
       clickAction: /ui-mobile/presence
       actions:
-        - title: "Pause Alert"
+        - title: "Pause"
           action: pause_alert_jason_phone_battery_low
 
+  jason_phone_bluetooth_disconnected:
+    name: "Jason Phone Bluetooth Disconnected"
+    title: "Bluetooth Disconnected"
+    message: "Your mobile phone bluetooth is not connected to HASS."
+    done_message: clear_notification
+    entity_id: binary_sensor.jason_phone_bluetooth_disconnected_alert
+    state: "on"
+    repeat:
+      - 30
+      - 60
+    notifiers: jason
+    data:
+      tag: jason_phone_bluetooth_disconnected
+      group: General
+      channel: Alert
+      importance: max
+      ttl: 0
+      priority: high
+      visibility: public
+      notification_icon: mdi:bluetooth-connect
+      icon_url: !secret BLUETOOTH_ICON
+      ledColor: !secret WARNING_COLOR
+      color: !secret WARNING_COLOR
+      vibrationPattern: !secret ALERT_VIBRATION
+      clickAction: /ui/presence
+      actions:
+        - title: "Pause"
+          action: pause_alert_jason_phone_bluetooth_disconnected
+
   jason_phone_bluetooth_device:
     name: "Jason Phone Bluetooth Device"
     title: "Phone Bluetooth Device"
@@ -172,7 +204,7 @@ alert:
       vibrationPattern: !secret ALERT_VIBRATION
       clickAction: /ui-mobile/presence
       actions:
-        - title: "Pause Alert"
+        - title: "Pause"
           action: pause_alert_jason_phone_bluetooth_device
 
   jason_phone_bluetooth_off:
@@ -201,12 +233,12 @@ alert:
       vibrationPattern: !secret ALERT_VIBRATION
       clickAction: /ui-mobile/presence
       actions:
+        - title: "Pause"
+          action: pause_alert_jason_phone_bluetooth_off
+
         - title: "Turn On"
           action: turn_jason_phone_bluetooth_on
 
-        - title: "Pause Alert"
-          action: pause_alert_jason_phone_bluetooth_off
-
   jason_phone_high_accuracy:
     name: "Jason Phone High Accuracy"
     title: "Phone High Accuracy On"
@@ -232,12 +264,12 @@ alert:
       vibrationPattern: !secret ALERT_VIBRATION
       clickAction: /ui-mobile/presence
       actions:
+        - title: "Pause"
+          action: pause_alert_mobile_accuracy_jason
+
         - title: "Turn Off"
           action: turn_off_jason_phone_high_accuracy
 
-        - title: "Pause Alert"
-          action: pause_alert_mobile_accuracy_jason
-
   jason_phone_offline:
     name: "Jason Phone Offline"
     title: "Phone Offline"
@@ -266,12 +298,12 @@ alert:
       vibrationPattern: !secret ALERT_VIBRATION
       clickAction: /ui-mobile/presence
       actions:
+        - title: "Pause"
+          action: pause_alert_jason_phone_offline
+
         - title: "Update"
           action: update_jason_location
 
-        - title: "Pause Alert"
-          action: pause_alert_jason_phone_offline
-
   jason_phone_ringer_off:
     name: "Jason Phone Ringer Off"
     title: "Phone Ringer Off"
@@ -298,12 +330,12 @@ alert:
       vibrationPattern: !secret ALERT_VIBRATION
       clickAction: /ui-mobile/presence
       actions:
+        - title: "Pause"
+          action: pause_alert_jason_phone_ringer_off
+
         - title: "Turn On"
           action: turn_jason_phone_ringer_on
 
-        - title: "Pause Alert"
-          action: pause_alert_jason_phone_ringer_off
-
   jason_phone_wifi_disconnected:
     name: "Jason Phone WIFI Disconnected"
     title: "Phone WIFI Disconnected"
@@ -330,7 +362,7 @@ alert:
       vibrationPattern: !secret ALERT_VIBRATION
       clickAction: /ui-mobile/presence
       actions:
-        - title: "Pause Alert"
+        - title: "Pause"
           action: pause_alert_jason_phone_wifi_disconnected
 
   jason_phone_wifi_off:
@@ -359,5 +391,5 @@ alert:
       vibrationPattern: !secret ALERT_VIBRATION
       clickAction: /ui-mobile/presence
       actions:
-        - title: "Pause Alert"
+        - title: "Pause"
           action: pause_alert_jason_phone_wifi_off
diff --git a/packages/package_alarm.yaml b/packages/package_alarm.yaml
@@ -181,15 +181,15 @@ alert:
       vibrationPattern: !secret ALERT_VIBRATION
       clickAction: /ui-mobile/alarm
       actions:
+        - title: "Pause"
+          action: pause_alert_alarm_disabled
+
         - title: "Enable"
           action: enable_alarm
 
         - title: "Auto Arm"
           action: turn_on_auto_arming
 
-        - title: "Pause Alert"
-          action: pause_alert_alarm_disabled
-
   alarm_disabled:
     name: "Alarm Disabled"
     title: "Alarm Disabled"
@@ -221,15 +221,15 @@ alert:
       vibrationPattern: !secret ALERT_VIBRATION
       clickAction: /ui-mobile/alarm
       actions:
+        - title: "Pause"
+          action: pause_alert_alarm_disabled
+
         - title: "Enable"
           action: enable_alarm
 
         - title: "Auto Arm"
           action: turn_on_auto_arming
 
-        - title: "Pause Alert"
-          action: pause_alert_alarm_disabled
-
   danger_alarm:
     name: "Danger Alarm"
     message: >

diff --git a/packages/package_camera.yaml b/packages/package_camera.yaml
@@ -247,6 +247,9 @@ alert:
       vibrationPattern: !secret ALERT_VIBRATION
       clickAction: /ui-mobile/alarm
       actions:
+        - title: "Pause"
+          action: pause_alert_camera_offline
+
         - title: "Alarm"
           action: URI
           uri: !secret ALARM_URI
@@ -255,15 +258,12 @@ alert:
           action: URI
           uri: !secret LOREX_URI
 
-        - title: "Pause Alert"
-          action: pause_alert_camera_offline
-
   camera_stream:
     name: "Camera Stream"
     title: "Camera Stream"
     message: |
-      - {{ expand(state_attr('binary_sensor.camera_stream_alert','entity_id'))
-            |map(attribute='name')|join('\n- ') }}
+      {{ expand(state_attr('binary_sensor.camera_stream_alert','entity_id'))
+          |map(attribute='name')|join('\n') }}
     done_message: clear_notification
     entity_id: binary_sensor.camera_stream_alert
     state: "on"
@@ -284,6 +284,9 @@ alert:
       vibrationPattern: !secret ALERT_VIBRATION
       clickAction: /ui-mobile/alarm
       actions:
+        - title: "Pause"
+          action: pause_alert_camera_stream
+
         - title: "Alarm"
           action: URI
           uri: !secret ALARM_URI
@@ -292,9 +295,6 @@ alert:
           action: URI
           uri: !secret LOREX_URI
 
-        - title: "Pause Alert"
-          action: pause_alert_camera_stream
-
   camera_tamper:
     name: "Camera Tamper"
     entity_id: binary_sensor.camera_tamper_alert