Minor Update v2023.8.3

Bugfixes, reminder triggers, cleanup.
jazzyisj · Aug 20, 2023 · 122276e · 122276e
1 parent f0f6014
commit 122276e
Show file tree

Hide file tree

Showing 44 changed files with 292 additions and 391 deletions.
diff --git a/README.md b/README.md
@@ -7,46 +7,46 @@
 
 ## ENTITY COUNTS
 
-##### <font color='cyan'>Updated 23-08-19</font>
+##### <font color='cyan'>Updated 23-08-20</font>
 
-- alarm_control_panel: 3
-- alert: 107
-- automation: 298
-- binary_sensor: 500
-- button: 98
-- calendar: 15
-- camera: 51
-- climate: 5
-- counter: 1
-- cover: 1
-- device_tracker: 71
-- fan: 10
-- group: 27
-- input_boolean: 198
-- input_button: 1
-- input_datetime: 47
-- input_number: 182
-- input_select: 11
-- input_text: 71
-- light: 47
-- lock: 4
-- media_player: 42
-- number: 493
-- person: 1
-- proximity: 1
-- remote: 1
-- scene: 8
-- script: 84
-- select: 474
-- sensor: 1418
-- siren: 2
-- sun: 1
-- switch: 185
-- timer: 55
-- tts: 1
-- update: 125
-- weather: 8
-- zone: 10
+- alarm_control_panel - 3
+- alert - 107
+- automation - 298
+- binary_sensor - 497
+- button - 99
+- calendar - 15
+- camera - 51
+- climate - 5
+- counter - 1
+- cover - 1
+- device_tracker - 71
+- fan - 10
+- group - 61
+- input_boolean - 198
+- input_button - 1
+- input_datetime - 47
+- input_number - 182
+- input_select - 11
+- input_text - 71
+- light - 48
+- lock - 4
+- media_player - 42
+- number - 493
+- person - 1
+- proximity - 1
+- remote - 1
+- scene - 8
+- script - 84
+- select - 474
+- sensor - 1418
+- siren - 2
+- sun - 1
+- switch - 184
+- timer - 55
+- tts - 1
+- update - 125
+- weather - 8
+- zone - 10
 
 ---
 

diff --git a/automations/alarm/automation_alarm_triggered_lights.yaml b/automations/alarm/automation_alarm_triggered_lights.yaml
@@ -7,55 +7,55 @@
   trigger:
     - platform: state
       entity_id: input_boolean.alarm_triggered
-      to: "on"
+      to: ~
   condition:
     - condition: state
       entity_id: input_boolean.alarm_enabled
       state: "on"
   action:
-    - service: scene.create
-      data:
-        scene_id: alarm_triggered_lights_restore
-        entities: !include /config/include/all_lights_scene_entities.yaml
-
-    - delay: 1 # wait for scene to save
-
-    - service: switch.turn_off
-      target:
-        entity_id: switch.adaptive_lighting
-
-    - service: script.turn_light_on
-      data:
-        activate_timer: false
-        profile: default_max
-
-    - wait_for_trigger:
-        - platform: state
+    - if:
+        - condition: state
           entity_id: input_boolean.alarm_triggered
-          to: "off"
-      timeout:
-        minutes: 60
-
-    - service: script.light_scene_on
-      continue_on_error: true
-      data:
-        scene: alarm_triggered_lights_restore
-
-    - service: switch.turn_on
-      target:
-        entity_id: switch.adaptive_lighting
-
-    - condition: state
-      entity_id: input_select.occupancy_mode
-      state: Night
-
-    - condition: state
-      entity_id: binary_sensor.nighttime_illuminance_lights
-      state: "on"
-
-    - service: script.turn_on
-      target:
-        entity_id: script.light_scene_on
-      data:
-        variables:
-          scene: night_lights
+          state: "on"
+      then:
+        - service: scene.create
+          data:
+            scene_id: alarm_triggered_lights_restore
+            entities: !include /config/include/all_lights_scene_entities.yaml
+
+        - delay: 1 # wait for scene to save
+
+        - service: switch.turn_off
+          target:
+            entity_id: switch.adaptive_lighting
+
+        - service: script.turn_light_on
+          data:
+            activate_timer: false
+            profile: default_max
+      else:
+        - service: script.light_scene_on
+          continue_on_error: true
+          data:
+            scene: alarm_triggered_lights_restore
+
+        - service: switch.turn_on
+          target:
+            entity_id: switch.adaptive_lighting
+
+        # if night mode lights will probably all turn off - turn on night lights
+        - and:
+            - condition: state
+              entity_id: input_select.occupancy_mode
+              state: Night
+
+            - condition: state
+              entity_id: binary_sensor.nighttime_illuminance_lights
+              state: "on"
+
+        - service: script.turn_on
+          target:
+            entity_id: script.light_scene_on
+          data:
+            variables:
+              scene: night_lights
diff --git a/automations/camera/automation_camera_alerts.yaml b/automations/camera/automation_camera_alerts.yaml
@@ -37,3 +37,19 @@
     - service: input_boolean.turn_off
       target:
         entity_id: input_boolean.camera_alerts
+
+###############################################################################
+## Camera - Turn Off Tamper Detection
+###############################################################################
+- id: camera_turn_off_tamper_detection
+  alias: "[Camera] Turn Off Tamper Detection"
+  description: "Turn off camera tamper detection."
+  trigger:
+    - platform: event
+      event_type: mobile_app_notification_action
+      event_data:
+        action: turn_off_tamper_detection
+  action:
+    - service: input_boolean.turn_off
+      target:
+        entity_id: input_boolean.camera_tamper_detection
diff --git a/automations/camera/automation_camera_tamper_detection_alert.yaml b/automations/camera/automation_camera_tamper_detection_alert.yaml
@@ -74,5 +74,5 @@
               action: URI
               uri: !secret LOREX_URI
 
-            - title: "Alerts Off"
-              action: turn_off_camera_alerts
+            - title: "Turn Off"
+              action: turn_off_tamper_detection
diff --git a/automations/network/automation_network_wan_down.yaml b/automations/network/automation_network_wan_down.yaml
@@ -46,6 +46,10 @@
                   min_volume: 70
                   quiet_play: true
                   save_msg: true
+
+              - wait_template: "{{ is_state('binary_sensor.wan','on') }}"
+                timeout:
+                  minutes: 15
       else:
         - service: script.tts_play
           data:

diff --git a/automations/zwave/automation_zwave_restart.yaml b/automations/zwave/automation_zwave_restart.yaml
@@ -0,0 +1,23 @@
+###############################################################################
+## ZWave - Restart
+###############################################################################
+- id: zwave_restart
+  alias: "[ZWave] Restart"
+  description: "Restart zwave addon, reload integration."
+  trigger:
+    - platform: event
+      event_type: mobile_app_notification_action
+      event_data:
+        action: restart_zwave_network
+  action:
+    - service: hassio.addon_restart
+      data:
+        addon: core_zwave_js
+
+    - wait_template: "{{ is_state('binary_sensor.z_wave_js_running','on') }}"
+      timeout: 300
+      continue_on_timeout: false
+
+    - service: homeassistant.reload_config_entry
+      target:
+        device_id: 8d81bd72be4f34f5d639ad396db18747
diff --git a/packages/package_camera.yaml b/packages/package_camera.yaml
@@ -247,9 +247,8 @@ alert:
         - title: "Pause"
           action: pause_alert_camera_offline
 
-        - title: "Alarm"
-          action: URI
-          uri: !secret ALARM_URI
+        - title: "Alerts Off"
+          action: turn_off_camera_alerts
 
         - title: "Cameras"
           action: URI
@@ -284,9 +283,8 @@ alert:
         - title: "Pause"
           action: pause_alert_camera_stream
 
-        - title: "Alarm"
-          action: URI
-          uri: !secret ALARM_URI
+        - title: "Alerts Off"
+          action: turn_off_camera_alerts
 
         - title: "Cameras"
           action: URI

diff --git a/packages/package_garage_door.yaml b/packages/package_garage_door.yaml
@@ -6,9 +6,6 @@ homeassistant:
     alert.myq_connected:
       icon: mdi:garage-alert
       category: garage_door
-    alert.myq_bridge_offline:
-      icon: mdi:garage-alert
-      category: garage_door
     cover.garage_bay_door:
       device_class: garage
 
@@ -22,13 +19,3 @@ alert:
     repeat: 999999
     data:
       tag: myq_connected
-
-  myq_bridge_offline:
-    name: "MyQ Bridge Offline"
-    entity_id: binary_sensor.myq_bridge_offline_alert
-    state: "on"
-    notifiers: log
-    skip_first: false
-    repeat: 999999
-    data:
-      tag: myq_bridge_offline
diff --git a/packages/package_save_tts_messages.yaml b/packages/package_save_tts_messages.yaml
@@ -157,16 +157,10 @@ script:
         alias: "Message count > 0 if skip_none is true"
         value_template: "{{ msgs > 0 if skip_none else true }}"
 
-      - service: tts.cloud_say # script.tts_play #TODO - change to your tts service
+      - service: tts.cloud_say #TODO - change to your tts service
         target:
           entity_id: media_player.kiosk_internal #TODO change to your tts media player entity
         data:
-          # tts_service: tts.cloud_say
-          # media_player: media_player.kiosk_internal
-          # quiet_play: true
-          # night_play: true
-          # ignore_away: true
-          # save_msg: false
           message: >
             There {{ 'are no messages' if msgs == 0 else ('is 1 message'
               if msgs == 1 else 'are ' ~ msgs ~ ' messages') }} waiting for you.
@@ -187,16 +181,10 @@ script:
                   sequence:
                     - if: "{{ state_attr('sensor.tts_saved_messages','msg' ~ repeat.index) != none }}"
                       then:
-                        - service: tts.cloud_say # script.tts_play #TODO - change to your tts service
+                        - service: tts.cloud_say #TODO - change to your tts service
                           target:
                             entity_id: media_player.kiosk_internal #TODO change to your tts media player entity
                           data:
-                            # tts_service: tts.cloud_say
-                            # media_player: media_player.kiosk_internal
-                            # quiet_play: true
-                            # night_play: true
-                            # ignore_away: true
-                            # save_msg: false
                             message: >
                               {% set date = state_attr('sensor.tts_saved_messages','msg_time' ~ repeat.index)|as_datetime %}
                               {{ state_attr('sensor.tts_saved_messages','msg' ~ repeat.index) }}
@@ -241,16 +229,10 @@ script:
     description: "Play last TTS message."
     icon: mdi:comment-arrow-left-outline
     sequence:
-      - service: tts.cloud_say # script.tts_play #TODO - change to your tts service
+      - service: tts.cloud_say #TODO - change to your tts service
         target:
           entity_id: media_player.kiosk_internal #TODO change to your media player entity_id
         data:
-          # tts_service: tts.cloud_say
-          # media_player: media_player.kiosk_internal
-          # quiet_play: true
-          # night_play: true
-          # ignore_away: true
-          # save_msg: false
           message: |
             {% set message = states('sensor.tts_last_message')[33:255] %}
             {% if message == '' %} There are no messages in the history.

diff --git a/packages/package_zwave.yaml b/packages/package_zwave.yaml
@@ -37,6 +37,12 @@ alert:
         - title: "Pause"
           action: pause_alert_zwave_network
 
+        - title: "Restart"
+          action: restart_zwave_network
+
+        - title: "Reboot"
+          action: reboot_router
+
   zwave_device:
     name: "ZWave Device"
     title: "ZWave Device Offline"