diff --git a/input_boolean.yaml b/input_boolean.yaml index d1704a9..fe4a3a0 100644 --- a/input_boolean.yaml +++ b/input_boolean.yaml @@ -1,5 +1,5 @@ -good_morning_report: - name: Good Morning Report +good_morning: + name: Good Morning icon: mdi:home-analytics weather_reports: name: Weather Info diff --git a/packages/announcements.yaml b/packages/announcements.yaml index 416b879..7e4fa63 100644 --- a/packages/announcements.yaml +++ b/packages/announcements.yaml @@ -3,18 +3,18 @@ ############################### input_datetime: - morning_report: - name: Morning Report + morning_briefing: + name: Morning Briefing has_date: false has_time: true icon: mdi:home-analytics - nightly_report: - name: Nightly Report + nightly_briefing: + name: Nightly Briefing has_date: false has_time: true icon: mdi:home-analytics - daily_report: - name: Daily Report + daily_briefing: + name: Daily Briefing has_date: false has_time: true icon: mdi:home-analytics @@ -130,13 +130,13 @@ automation: alias: House Briefings trigger: - platform: time - at: input_datetime.morning_report + at: input_datetime.morning_briefing id: house-morning - platform: time - at: input_datetime.daily_report + at: input_datetime.daily_briefing id: house-daily - platform: time - at: input_datetime.nightly_report + at: input_datetime.nightly_briefing id: house-nightly action: - choose: @@ -144,7 +144,7 @@ automation: - condition: trigger id: house-morning sequence: - - service: script.morning_report + - service: script.morning_briefing - conditions: - condition: trigger id: house-daily @@ -213,10 +213,10 @@ script: reset_annc_switches: sequence: - service: input_boolean.turn_off - entity_id: input_boolean.good_morning_report + entity_id: input_boolean.good_morning - morning_briefing: - alias: 'Morning Briefing' + morning_briefing_alexa: + alias: 'Morning Briefing Alexa' sequence: - service: button.press target: @@ -278,8 +278,8 @@ script: who: common message: !include ../templates/speech/nightly_briefing.yaml - morning_report: - alias: 'Morning Report' + morning_briefing: + alias: 'Morning Briefing' sequence: - service: script.speech_engine data: diff --git a/packages/scheduling.yaml b/packages/scheduling.yaml index 0cf2285..57618f2 100644 --- a/packages/scheduling.yaml +++ b/packages/scheduling.yaml @@ -275,7 +275,7 @@ script: 09:00 {% endif %} - service: input_datetime.set_datetime - entity_id: input_datetime.morning_report + entity_id: input_datetime.morning_briefing data_template: time: > {% if is_state('input_boolean.kallen_school_today','on') %} @@ -296,7 +296,7 @@ script: 12:00 {% endif %} - service: input_datetime.set_datetime - entity_id: input_datetime.daily_report + entity_id: input_datetime.daily_briefing data_template: time: > {% if is_state('input_boolean.kallen_school_today','on') %} @@ -351,7 +351,7 @@ script: alias: 'House Scheduling Evening' sequence: - service: input_datetime.set_datetime - entity_id: input_datetime.nightly_report + entity_id: input_datetime.nightly_briefing data: time: > {{ (state_attr('input_datetime.kallen_bedtime','timestamp') - 3600) | timestamp_custom('%H:%M', false) }} diff --git a/templates/speech/kallen_morning_briefing.yaml b/templates/speech/kallen_morning_briefing.yaml index 1f5bb12..4803c52 100644 --- a/templates/speech/kallen_morning_briefing.yaml +++ b/templates/speech/kallen_morning_briefing.yaml @@ -1,5 +1,5 @@ > - {# Kallen Morning Report #} + {# Kallen Morning Briefing #} {%- macro getReport() -%}

Good morning, Collin. diff --git a/templates/speech/kallen_nightly_briefing.yaml b/templates/speech/kallen_nightly_briefing.yaml index e7f2563..54d2a40 100644 --- a/templates/speech/kallen_nightly_briefing.yaml +++ b/templates/speech/kallen_nightly_briefing.yaml @@ -1,5 +1,5 @@ > - {# Kallen Nightly Report #} + {# Kallen Nightly Briefing #} {%- macro getReport() -%}

Good Evening, Collin, diff --git a/templates/speech/morning_briefing.yaml b/templates/speech/morning_briefing.yaml index c6d9fa4..9dfa476 100644 --- a/templates/speech/morning_briefing.yaml +++ b/templates/speech/morning_briefing.yaml @@ -1,5 +1,5 @@ > - {# Morning Report #} + {# Morning Briefing #} {%- macro getReport() -%}

{% if now().strftime('%H')|int < 12 and now().strftime('%H')|int > 6 %}