From d72f26fdb85972f8bf761c29b1a3288f075a7bcb Mon Sep 17 00:00:00 2001 From: Georgi Gardev Date: Thu, 13 Jan 2022 20:27:38 +0200 Subject: [PATCH] Fix vacuum tasks --- config/templates/partials/tasks.yaml | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/config/templates/partials/tasks.yaml b/config/templates/partials/tasks.yaml index 13b06eb..0a4a110 100644 --- a/config/templates/partials/tasks.yaml +++ b/config/templates/partials/tasks.yaml @@ -6,12 +6,11 @@ {% set purifier_water = is_state('binary_sensor.purifier_out_of_water', 'on') %} {% set has_purifier_tasks = purifier_filter or purifier_water %} - {% set vacuum_entity = 'vacuum.vacuum' %} - {% set vacuum_main_brush = state_attr(vacuum_entity, 'main_brush_left') | int == 0 %} - {% set vacuum_side_brush = state_attr(vacuum_entity, 'side_brush_left') | int == 0 %} - {% set vacuum_filter = state_attr(vacuum_entity, 'filter_left') | int == 0 %} - {% set vacuum_sensor = state_attr(vacuum_entity, 'sensor_dirty_left') | int == 0 %} - {% set has_vacuum_tasks = vacuum_main_brush or vacuum_side_brush or vacuum_filter or vacuum_sensor %} + {% set vacuum_main_brush = states('sensor.roborock_vacuum_s5_main_brush_left') | int == 0 %} + {% set vacuum_side_brush = states('sensor.roborock_vacuum_s5_side_brush_left') | int == 0 %} + {% set vacuum_filter = states('sensor.roborock_vacuum_s5_filter_left') | int == 0 %} + {% set vacuum_dirty = states('sensor.roborock_vacuum_s5_sensor_dirty_left') | int == 0 %} + {% set has_vacuum_tasks = vacuum_main_brush or vacuum_side_brush or vacuum_filter or vacuum_dirty %} {% set has_tasks = brita_filter or has_purifier_tasks or has_vacuum_tasks %} @@ -21,12 +20,12 @@ "Here are the tasks for today.", "You have stuff to do." ] | random - }} {% endif %} + }} {%- endif -%} - {%- if brita_filter -%} Brita needs filter change. {% endif %} - {%- if purifier_filter -%} Purifier needs filter change. {% endif %} - {%- if purifier_water -%} Purifier needs water. {%- endif -%} - {%- if vacuum_main_brush -%} Vacuum main brush needs changing. {%- endif -%} - {%- if vacuum_side_brush -%} Vacuum side brush needs changing. {%- endif -%} - {%- if vacuum_filter -%} Vacuum filter needs changing. {%- endif -%} - {%- if vacuum_sensor -%} Vacuum sensor needs cleaning. {%- endif -%} + {% if brita_filter %} Brita needs filter change. {%- endif -%} + {% if purifier_filter %} Purifier needs filter change. {%- endif -%} + {% if purifier_water %} Purifier needs water. {%- endif -%} + {% if vacuum_main_brush %} Vacuum main brush needs changing. {%- endif -%} + {% if vacuum_side_brush %} Vacuum side brush needs changing. {%- endif -%} + {% if vacuum_filter %} Vacuum filter needs changing. {%- endif -%} + {% if vacuum_dirty %} Vacuum sensor needs cleaning. {%- endif -%}