diff --git a/custom_templates/status.jinja b/custom_templates/status.jinja index 312856d..ec7eadf 100644 --- a/custom_templates/status.jinja +++ b/custom_templates/status.jinja @@ -281,11 +281,18 @@ Tony does not have a stream scheduled today. The next scheduled stream is in {{ {% endmacro %} {% macro kallenSleep(method) %} -{% from 'time.jinja' import input_datetime_12hr %} +{% from 'time.jinja' import input_datetime_12hr, ct %} +{% set ct = ct() | int %} {% if is_state('input_boolean.kallen_sleeping','on') %} - Kallen went to bed at {{ input_datetime_12hr('input_datetime.kallen_bedtime') }} today. + Kallen went to bed at {{ input_datetime_12hr('input_datetime.kallen_bedtime') }} tonight. + {% if ct > 14400 %} + His scheduled wakeup time is {{ input_datetime_12hr('input_datetime.kallen_wakeup_time') }} today. + {% endif %} {% else %} Kallen woke up at {{ input_datetime_12hr('input_datetime.kallen_wakeup_time') }} today. + {% if ct > 57600 %} + His scheduled bedtime is {{ input_datetime_12hr('input_datetime.kallen_bedtime') }} tonight. + {% endif %} {% endif %} {% endmacro %} diff --git a/node-red/projects/NerdFlows b/node-red/projects/NerdFlows index d328564..95b38e2 160000 --- a/node-red/projects/NerdFlows +++ b/node-red/projects/NerdFlows @@ -1 +1 @@ -Subproject commit d328564379a4f976d9aaf7501700747711766509 +Subproject commit 95b38e2a49f34be510488d93ee8e3d0972a0e40b