From 1e501eaca2f7aa0c2ff73ef9060c4dc821315270 Mon Sep 17 00:00:00 2001 From: Tony Stork Date: Mon, 27 Feb 2023 17:59:22 -0500 Subject: [PATCH] Remove all garbage collection references The current solution is prone to constantly being incorrect about when our unlimited pickup is, or when the date should be pushed back. Need to find a better solution. --- packages/announcements.yaml | 38 -------------------------- templates/speech/daily_briefing.yaml | 23 ---------------- templates/speech/morning_briefing.yaml | 25 ----------------- templates/speech/nightly_briefing.yaml | 20 -------------- templates/speech/welcome_home.yaml | 27 ------------------ 5 files changed, 133 deletions(-) diff --git a/packages/announcements.yaml b/packages/announcements.yaml index 526d3a1..003a93f 100644 --- a/packages/announcements.yaml +++ b/packages/announcements.yaml @@ -177,31 +177,6 @@ automation: state: 'off' sequence: - service: script.daily_briefing - - if: - - condition: state - entity_id: sensor.garbage_collection_large_pickup - state: '1' - then: - - service: script.text_notify - data: - type: alert - who: "all" - title: "Garbage Collection - Unlimited" - message: "Tomorrow is large trash pickup day. Please take out all large items, and don't forget the trash can!" - tag: garbage-unlimited - else: - - if: - - condition: state - entity_id: sensor.garbage_collection - state: '1' - then: - - service: script.text_notify - data: - type: alert - who: "all" - title: "Garbage Collection - Regular" - message: "Tomorrow is regular trash pickup day. Make sure the trash can is taken to the curb!" - tag: garbage-regular - conditions: - condition: and conditions: @@ -212,19 +187,6 @@ automation: state: 'off' sequence: - service: script.nightly_briefing - - if: - - condition: state - entity_id: sensor.garbage_collection - attribute: days - state: '7' - then: - - service: script.text_notify - data: - type: alert - who: "all" - title: "Retrieve Garbage Can" - message: "Garbage has been collected. Don't forget to move the trash can back to the house!" - tag: garbage-retrieve - id: d7641b5e-3cbb-4fb3-b6ed-5edf3157b88d alias: Kallen Briefing Location Change diff --git a/templates/speech/daily_briefing.yaml b/templates/speech/daily_briefing.yaml index c1586ce..4dc5b54 100644 --- a/templates/speech/daily_briefing.yaml +++ b/templates/speech/daily_briefing.yaml @@ -124,29 +124,6 @@ "The developer has informed me that I must inform you of the following informational information. ", ] | random }} - {% if is_state('sensor.garbage_collection_large_pickup','1') %} - 'Tomorrow is the monthly unlimited garbage pickup. Make sure to take out all large garbage items tonight, and do not forget the trash can!' - {% elif is_state('sensor.garbage_collection','1') %} - {{ [ - 'Do not forget to take the trash bin to the curb, tomorrow is trash pickup day.', - 'Make sure to take the trash out. No, I do not mean Tony.', - 'Tomorrow is a big day for the garbage men. Make sure you do not let them down! Take the trash out!' - ] | random }} - {% endif %} - - {% set gc = state_attr('sensor.garbage_collection','days') %} - {% if gc == 7 %} - {{ [ - 'Do not forget to bring the trash can back from the curb.', - 'The trash can will feel lonely if you leave it at the curb all night.' - ] | random }} - {% elif gc == 6 %} - {{ [ - 'If you have not already, please remember to bring the garbage can back from the sidewalk.', - 'Just in case you forgot, it is time to bring the garbage can back to the house before it gets lonely.' - ] | random }} - {% endif %} - {% if is_state('binary_sensor.evening','on') %} {% if is_state('sensor.anniversary_tony_s_birthday','0') %} Hope you had a happy birthday Tony! diff --git a/templates/speech/morning_briefing.yaml b/templates/speech/morning_briefing.yaml index 80f9ea4..a05c9b9 100644 --- a/templates/speech/morning_briefing.yaml +++ b/templates/speech/morning_briefing.yaml @@ -175,31 +175,6 @@ {% endif %}

-

- {% if is_state('sensor.garbage_collection_large_pickup','1') %} - 'Tomorrow is the monthly unlimited garbage pickup. Make sure to take out all large garbage items tonight, and do not forget the trash can!' - {% elif is_state('sensor.garbage_collection','1') %} - {{ [ - 'Do not forget to take the trash bin to the curb, tomorrow is trash pickup day.', - 'Make sure to take the trash out. No, I do not mean Tony.', - 'Tomorrow is a big day for the garbage men. Make sure you do not let them down! Take the trash out!' - ] | random }} - {% endif %} - - {% set gc = state_attr('sensor.garbage_collection','days') %} - {% if gc == 7 %} - {{ [ - 'Do not forget to bring the trash can back from the curb.', - 'The trash can will feel lonely if you leave it at the curb all night.' - ] | random }} - {% elif gc == 6 %} - {{ [ - 'If you have not already, please remember to bring the garbage can back from the sidewalk.', - 'Just in case you forgot, it is time to bring the garbage can back to the house before it gets lonely.' - ] | random }} - {% endif %} -

-

{% if is_state('input_boolean.sports_updates','on') %} {% if is_state('sensor.michigan_wolverines','PRE') %} diff --git a/templates/speech/nightly_briefing.yaml b/templates/speech/nightly_briefing.yaml index 1555ed4..87a2c7c 100644 --- a/templates/speech/nightly_briefing.yaml +++ b/templates/speech/nightly_briefing.yaml @@ -93,26 +93,6 @@ {% endif %}

-

- {% if is_state('sensor.garbage_collection_large_pickup','1') %} - 'Tomorrow is the monthly unlimited garbage pickup. Make sure to take out all large garbage items tonight, and do not forget the trash can!' - {% elif is_state('sensor.garbage_collection','1') %} - {{ [ - 'Do not forget to take the trash bin to the curb, tomorrow is trash pickup day.', - 'Make sure to take the trash out. No, I do not mean Tony.', - 'Tomorrow is a big day for the garbage men. Make sure you do not let them down! Take the trash out!' - ] | random }} - {% endif %} - - {% set gc = state_attr('sensor.garbage_collection','days') %} - {% if gc == 7 %} - {{ [ - 'Do not forget to bring the trash can back from the curb.', - 'The trash can will feel lonely if you leave it at the curb all night.' - ] | random }} - {% endif %} -

-

{% if is_state('input_boolean.sports_updates','on') %} {% if is_state('sensor.michigan_wolverines','PRE') %} diff --git a/templates/speech/welcome_home.yaml b/templates/speech/welcome_home.yaml index 93abdba..e34522f 100644 --- a/templates/speech/welcome_home.yaml +++ b/templates/speech/welcome_home.yaml @@ -118,33 +118,6 @@ {% endif %}

-

- {% if is_state('sensor.garbage_collection_large_pickup','1') %} - 'Tomorrow is the monthly unlimited garbage pickup. Make sure to take out all large garbage items tonight, and do not forget the trash can!' - {% elif is_state('sensor.garbage_collection','1') %} - {{ [ - 'Do not forget to take the trash bin to the curb, tomorrow is trash pickup day.', - 'Make sure to take the trash out. No, I do not mean Tony.', - 'Tomorrow is a big day for the garbage men. Make sure you do not let them down! Take the trash out!' - ] | random }} - {% endif %} - - {% set gc = state_attr('sensor.garbage_collection','days') %} - {% if gc == 7 %} - {{ [ - 'Do not forget to bring the trash can back from the curb.', - 'The trash can will feel lonely if you leave it at the curb all night.' - ] | random }} - {% elif gc == 6 %} - {% if is_state('binary_sensor.morning','on') or is_state('binary_sensor.midday','on') %} - {{ [ - 'If you have not already, please remember to bring the garbage can back from the sidewalk.', - 'Just in case you forgot, it is time to bring the garbage can back to the house before it gets lonely.' - ] | random }} - {% endif %} - {% endif %} -

-

{% if is_state('light.living_room_lights','on') %} {% if is_state('binary_sensor.early_night_mode','on') %}