various tidyups

packages/pet_feeding_reminder.yaml

@@ -1,13 +1,12 @@
 #:########################################################################################:#
 # PACKAGE: Zorro Evening Feeding Reminder (P017-S013)
 # FILE: packages/p017_s013_zorro_feeding_reminder.yaml
-# VERSION: v1.0.1 2026-07-26
+# VERSION: v1.0.2 2026-08-12
 #:########################################################################################:#
 # PURPOSE:
 #   Remind to feed Zorro (evening feeding) if not completed.
 #   LED matrix shows "Feed Zorro" every 30 min from 5pm to 10pm.
 #   Voice says "Zorro has not been fed this afternoon" every 30 min from 5pm to 8pm.
-#   Each announcement has a random delay of 0-10 min for natural variation.
 #   Clears LED matrix immediately when evening feeding is completed.
 #:########################################################################################:#
 # DEPENDENCIES:
@@ -55,25 +54,32 @@ automation:
           voice_hours: "{{ now().hour < 20 }}"
           quiet_time: "{{ is_state('input_boolean.quiet_time', 'on') }}"
 
-      - delay:
-          seconds: "{{ range(0, 601) | random | int }}"
-
-      - action: script.view_road_announcement
-        data:
-          channels: "led_matrix_1, sony_tv_lounge"
-          title: "Zorro"
-          short_announcement: "Feed Zorro"
-          indicator: "zorro,1,15,10,6,5,0,0"
-
       - if:
           - condition: template
-            value_template: "{{ voice_hours and not quiet_time }}"
+            value_template: >-
+              {{ states('sensor.jobs_tracker_dog_feeding_evening') != 'Complete' }}
         then:
           - action: script.view_road_announcement
             data:
-              channels: "lounge_google_home_voice"
+              channels: "led_matrix_1, sony_tv_lounge"
               title: "Zorro"
-              short_announcement: "Zorro has not been fed this afternoon"
+              short_announcement: "Feed Zorro"
+              indicator: "zorro,1,15,10,6,5,0,0"
+
+          - if:
+              - condition: template
+                value_template: >-
+                  {{
+                    voice_hours
+                    and not quiet_time
+                    and is_state('script.view_road_announcement', 'off')
+                  }}
+            then:
+              - action: script.view_road_announcement
+                data:
+                  channels: "lounge_google_home_voice"
+                  title: "Zorro"
+                  short_announcement: "Zorro has not been fed this afternoon"
 
   ##############################################################################
   # CLEAR LED MATRIX WHEN FED