diff --git a/node-red/projects/NerdFlows b/node-red/projects/NerdFlows index 6e4ad7b..8fbc501 160000 --- a/node-red/projects/NerdFlows +++ b/node-red/projects/NerdFlows @@ -1 +1 @@ -Subproject commit 6e4ad7b9e64ee4c979db6aef622486112888670d +Subproject commit 8fbc5016a52f58b75cff286219fb6222558f3df8 diff --git a/sensors/time.yaml b/sensors/time.yaml index 3abb670..3b2a85b 100644 --- a/sensors/time.yaml +++ b/sensors/time.yaml @@ -26,15 +26,6 @@ {% else %} off {% endif %} - work_tomorrow: - friendly_name: 'Work Tomorrow' - value_template: >- - {%- set test=(as_timestamp(now())+ (86400)) | timestamp_custom("%Y-%m-%d",true) %} - {% if states.calendar.family_tinawork.attributes.start_time >= test + " 05:00:00" %} - on - {% else %} - off - {% endif %} kallen_timer_remaining_minutes: friendly_name: 'Kallen Timer Remaining Minutes' value_template: >- diff --git a/templates/speech/nightly_briefing.yaml b/templates/speech/nightly_briefing.yaml index e0d55db..1b9cae8 100644 --- a/templates/speech/nightly_briefing.yaml +++ b/templates/speech/nightly_briefing.yaml @@ -22,9 +22,9 @@ "Tina is at work right now, she will be done at approximately {{ (state_attr('input_datetime.tina_workday_end','timestamp') | int | timestamp_custom('%I:%M %p', False)) }}. " {% elif is_state('input_boolean.work_today','on') %} "Tina has work today at {{ (state_attr('input_datetime.tina_workday_start','timestamp') | int | timestamp_custom('%I:%M %p', False)) }}. " - {% elif is_state('input_boolean.work_today','off') and is_state('sensor.work_tomorrow','on') %} + {% elif is_state('input_boolean.work_today','off') and is_state('binary_sensor.tina_work_tomorrow','on') %} "Tina has work tomorrow at {{ as_timestamp(strptime(state_attr('calendar.family_tinawork','start_time'), '%Y-%m-%d %H:%M:%S')) | timestamp_custom("%I:%M %p") }}. " - {% elif is_state('input_boolean.work_today','off') and is_state('sensor.work_tomorrow','off') %} + {% elif is_state('input_boolean.work_today','off') and is_state('binary_sensor.tina_work_tomorrow','off') %} "Tina appears to have tomorrow off from work. " {% else %} "Tony is an idiot and appears to have broken my awareness of Tina's schedule. Boo this man. "