Too many updates to cover

packages/usps.yaml

@@ -40,10 +40,6 @@ automation:
       at: '00:00:10'
     action:
       - service: shell_command.usps
-      - service: script.add_logbook_entry
-        data_template:
-          name: USPS
-          message: Reset Mail Count 
   
   - id: get_usps
     initial_state: true
@@ -53,10 +49,6 @@ automation:
       at: '10:00:00'
     action:
       - service: shell_command.usps
-      - service: script.add_logbook_entry
-        data_template:
-          name: USPS
-          message: Checking for mail 
 
 # Notify USPS mails via TTS, and iOS notification with attachment
 ###############################################################################
@@ -72,7 +64,12 @@ automation:
       - condition: template
         value_template: '{{ ((now().hour | int) > 7) and ((now().hour | int) < 16) }}'
     action:
-      - service: script.voice_notify
+      - service: script.jarvis_voice
+        data_template:
+          message: !include ../templates/jarvis_interuptions.yaml
+      - delay:
+          seconds: 2
+      - service: script.jarvis_notify
         data_template:
           message: >
             {%- if states.sensor.usps_mail.state | int == 1 -%}
@@ -80,16 +77,18 @@ automation:
             {%- else -%}
               USPS is delivering {{ states.sensor.usps_mail.state }} pieces of mail today.
             {%- endif -%}
-      - service: notify.jeff_ios
+      - service: script.text_notify
         data_template:
+          who: "jeff"
+          title: "USPS Delivering Today"
           message: "USPS will be delivering {{ states.sensor.usps_mail.state }} piece(s) of mail today."
-          data:
-            push:
-              category: camera
-            entity_id: "camera.usps_mail_pictures"
-            attachment:
-              url: "{{ states.camera.usps_mail_pictures.attributes.entity_picture }}"
-              content-type: jpg
+          # data:
+          #   push:
+          #     category: camera
+          #   entity_id: "camera.usps_mail_pictures"
+          #   attachment:
+          #     url: "{{ states.camera.usps_mail_pictures.attributes.entity_picture }}"
+          #     content-type: jpg
 
 # Notify USPS packages via TTS. Usually there are no pictures for packages
 ###############################################################################
@@ -105,7 +104,12 @@ automation:
       - condition: template
         value_template: '{{ ((now().hour | int) > 7) and ((now().hour | int) < 16) }}'
     action:
-      - service: script.voice_notify
+      - service: script.jarvis_voice
+        data_template:
+          message: !include ../templates/jarvis_interuptions.yaml
+      - delay:
+          seconds: 2
+      - service: script.jarvis_notify
         data_template:
           message: >
             {%- if states.sensor.usps_packages.state | int == 1 -%}