Change E's status macro names to be consistent with others

This commit is contained in:
2023-10-20 15:27:29 -04:00
parent 7ccc3d84b1
commit 9f8b2e41ad
3 changed files with 7 additions and 7 deletions

View File

@ -577,7 +577,7 @@ Tony is currently streaming. The current stream category is {{ game }}. The curr
{% endif %} {% endif %}
{% endmacro %} {% endmacro %}
{% macro emma_sleep_notification(type,method) %} {% macro emmaSleepNotification(type,method) %}
{% set asleep = state_attr('input_datetime.emma_down_for_nap','timestamp') | int %} {% set asleep = state_attr('input_datetime.emma_down_for_nap','timestamp') | int %}
{% set wakeup = state_attr('input_datetime.emma_up_from_nap','timestamp') | int %} {% set wakeup = state_attr('input_datetime.emma_up_from_nap','timestamp') | int %}
{% set day = now().strftime("%-d") %} {% set day = now().strftime("%-d") %}

View File

@ -157,9 +157,9 @@ automation:
type: alert type: alert
title: Emma Sleeping title: Emma Sleeping
message: > message: >
{% from 'status.jinja' import emma_sleep_notification %} {% from 'status.jinja' import emmaSleepNotification %}
{% from 'formatting.jinja' import cleanup %} {% from 'formatting.jinja' import cleanup %}
{{ cleanup(emma_sleep_notification()) }} {{ cleanup(emmaSleepNotification()) }}
tag: emma-sleep tag: emma-sleep
- conditions: - conditions:
- condition: trigger - condition: trigger
@ -209,9 +209,9 @@ automation:
type: alert type: alert
title: Emma Awakens title: Emma Awakens
message: > message: >
{% from 'status.jinja' import emma_sleep_notification %} {% from 'status.jinja' import emmaSleepNotification %}
{% from 'formatting.jinja' import cleanup %} {% from 'formatting.jinja' import cleanup %}
{{ cleanup(emma_sleep_notification()) }} {{ cleanup(emmaSleepNotification()) }}
tag: emma-wake tag: emma-wake
- service: script.emma_wakeup - service: script.emma_wakeup

View File

@ -4,7 +4,7 @@
{%- macro getReport() -%} {%- macro getReport() -%}
{% from 'speech.jinja' import dadjoke %} {% from 'speech.jinja' import dadjoke %}
{% from 'time.jinja' import input_datetime_read %} {% from 'time.jinja' import input_datetime_read %}
{% from 'status.jinja' import emma_sleep %} {% from 'status.jinja' import emmaSleep %}
{% from 'easy_time.jinja' import count_the_days %} {% from 'easy_time.jinja' import count_the_days %}
{% from 'weather.jinja' import weatherReport %} {% from 'weather.jinja' import weatherReport %}
<p> <p>
@ -124,7 +124,7 @@
</p> </p>
<p> <p>
{{ emma_sleep() }} {{ emmaSleep() }}
</p> </p>
<p> <p>