diff --git a/custom_templates/lighting.jinja b/custom_templates/lighting.jinja index d915932..2690f88 100644 --- a/custom_templates/lighting.jinja +++ b/custom_templates/lighting.jinja @@ -3,7 +3,7 @@ {{ ((current / 255) * 100) | float | round(2) }} {% endmacro %} -{% macro lightsOn(type,method) %} +{% macro lights_on(type,method) %} {% set lights = states('sensor.current_lights_on') %} {% if method == 'tts' %} Around the house, there {% if lights == '1' %}is {% else %}are {% endif %}currently {{ lights }} {% if lights == '1' %}light {% else %}lights {% endif %}on. diff --git a/custom_templates/status.jinja b/custom_templates/status.jinja index d5e8ac6..ce382f8 100644 --- a/custom_templates/status.jinja +++ b/custom_templates/status.jinja @@ -1,7 +1,7 @@ {% from 'formatting.jinja' import cleanup %} {% from 'time.jinja' import input_datetime_read, ct, next_twitch_stream, calendar_event_today, time_from_calendar %} {% from 'easy_time.jinja' import count_the_days, custom_time, custom_time_between, clock %} -{% from 'lighting.jinja' import lightsOn %} +{% from 'lighting.jinja' import lights_on %} {% set ct = ct() | int %} {% set workTodayRan = is_state('input_boolean.work_today_ran','on') %} {% set schoolTodayRan = is_state('input_boolean.school_today_ran','on') %} @@ -117,10 +117,10 @@ {% elif type == 'airleaks' %} {{ airLeaks(type,method) }} {% elif type == 'lights' %} - {{ lightsOn(type,method) }} + {{ lights_on(type,method) }} {% elif type == 'full' %} {{ climateDevices(type,method) }} - {{ lightsOn(type,method) }} + {{ lights_on(type,method) }} {{ airLeaks(type,method) }} {% endif %} {% endmacro %}