diff --git a/config/templates/speech/daily_briefing.yaml b/config/templates/speech/daily_briefing.yaml index 8e6fc60..9a1d163 100755 --- a/config/templates/speech/daily_briefing.yaml +++ b/config/templates/speech/daily_briefing.yaml @@ -269,7 +269,7 @@ {% if 'Fools' in event %} {{ [ - 'Which reminds me. The camera looking at tbe drive way caught a Tee Rex last night. April Fools!', + 'Which reminds me. The camera looking at the drive way caught a Tee Rex last night. April Fools!', 'Which reminds me. I won the lottery and I am moving out to go live with Siri. April Fools!', 'Which reminds me. there was a time change last night. We have jumped 15 years into the future. April Fools!' ]|random }} @@ -362,26 +362,7 @@

- - - - {% if is_state('binary_sensor.morning','on') %} -

- {%- if states.sensor.home_to_zoo.state|round > 50 %} - Traffic to the Zoo appears heavy than normnal. - {% else %} - Traffic to the Zoo is normal. - {% endif %} - Currently it will take {{states.sensor.home_to_zoo.state|round}} minutes to get to the Zoo taking {{ states.sensor.home_to_zoo.attributes.route }}. - - {%- if states.sensor.home_to_summit.state|round > 50 %} - Traffic to Summit appears heavy than normnal. - {% else %} - Traffic to Summit is normal. - {% endif %} - Currently it will take {{states.sensor.home_to_summit.state|round}} minutes to get to Summit taking {{ states.sensor.home_to_summit.attributes.route }} -

- {%- endif -%} +

@@ -406,7 +387,7 @@ {%- if is_state('climate.home','off') %} The internal climate control system is off. The temperature inside is {{ states.climate.home.attributes.current_temperature }} degrees. {%- elif is_state('climate.home','heat_cool') %} - The internal climate control system will try to keep the temperature between {{ states.climate.home.attributes.target_temp_low }} and {{ states.climate.home.attributes.target_temp_high }}. + The internal climate control system will try to keep the temperature between {{ states.climate.home.attributes.target_temp_low }} and {{ states.climate.home.attributes.target_temp_high }} degrees. {% else %} The internal climate control system is set to {{ states.climate.home.state }} with a current temperature of {{ states.climate.home.attributes.current_temperature }} which is diff --git a/config/templates/speech/morning_wakeup_report.yaml b/config/templates/speech/morning_wakeup_report.yaml index 7654ca3..a453872 100755 --- a/config/templates/speech/morning_wakeup_report.yaml +++ b/config/templates/speech/morning_wakeup_report.yaml @@ -161,22 +161,6 @@ {% endif %}

-

- {%- if states.sensor.home_to_zoo.state|round > 50 %} - Traffic to the Zoo appears heavy than normal. - {% else %} - Traffic to the Zoo is normal. - {% endif %} - Currently it will take {{states.sensor.home_to_zoo.state|round}} minutes to get to the Zoo taking {{ states.sensor.home_to_zoo.attributes.route }}. - - {%- if states.sensor.home_to_summit.state|round > 50 %} - Traffic to Summit appears heavy than normal. - {% else %} - Traffic to Summit is normal. - {% endif %} - Currently it will take {{states.sensor.home_to_summit.state|round}} minutes to get to Summit taking {{ states.sensor.home_to_summit.attributes.route }}. -

- {%- endmacro -%} diff --git a/config/templates/speech/welcome_briefing.yaml b/config/templates/speech/welcome_briefing.yaml index 09d3be6..d868403 100755 --- a/config/templates/speech/welcome_briefing.yaml +++ b/config/templates/speech/welcome_briefing.yaml @@ -3,7 +3,7 @@ {%- macro getReport() -%}

{% set person = expand('group.people')| selectattr('state', 'eq', 'home') | map(attribute='name')|join(' and ') %} - {% set peoplecount = expand('group.arriving') | count %} + {% set peoplecount = expand('group.people') | count %} {% if peoplecount == 0 %} Welcome Home {% else %} @@ -15,11 +15,11 @@ {% set has_have = ' have ' %} {% endif %} {%- macro greeting_sentence(person, is_are, has_have) -%} - {{ [ - "Welcome back home " ~ person, - "Hey" ~ person + "! High Five! Glad you are finally home.", - "Welcome home " ~ person - ] | random }}"Welcome back home " ~ person, + {{ [ + "Welcome back home " ~ person + ".", + "Hey " ~ person + "! High Five! Glad you are finally home.", + "Welcome home " ~ person + "." + ] | random }} {%- endmacro -%} {{greeting_sentence(person, is_are, has_have)}} {% endif %}