Fixed car window binary sensor

diff --git a/binary_sensor/car.yaml b/binary_sensor/car.yaml
index d245235de9881f727730c3f3d727b96f6f85d0e0..cf770877126f3bafcf32bee21fcedb0cb4484b5c 100644 (file)
--- a/binary_sensor/car.yaml
+++ b/binary_sensor/car.yaml
@@ -27,15 +27,9 @@
       friendly_name: Porte
       entity_id: sensor.ff590mr_lock
       value_template: >-
-        {{ is_state('binary_sensor.ff590mr_door_front_left', 'on') and
-           is_state('binary_sensor.ff590mr_door_front_right', 'on') and
-           is_state('binary_sensor.ff590mr_door_rear_left', 'on') and
-           is_state('binary_sensor.ff590mr_door_rear_right', 'on') }}
+        {{ not is_state_attr('sensor.ff590mr_lock', 'doorsClosed', 'true') }}
       icon_template: >-
-        {% if is_state('binary_sensor.ff590mr_door_front_left', 'on') and
-           is_state('binary_sensor.ff590mr_door_front_right', 'on') and
-           is_state('binary_sensor.ff590mr_door_rear_left', 'on') and
-           is_state('binary_sensor.ff590mr_door_rear_right', 'on') %}
+        {% is_state_attr('sensor.ff590mr_lock', 'doorsClosed', 'true') %}        
           mdi:car-door
         {% else %}
           mdi:car-door
@@ -133,22 +127,21 @@
       friendly_name: Finestrini
       entity_id: binary_sensor.ff590mr_windows_closed
       value_template: >-
-        {{ is_state('binary_sensor.ff590mr_window_front_left', 'on') and
-           is_state('binary_sensor.ff590mr_window_front_right', 'on') and
-           is_state('binary_sensor.ff590mr_window_rear_left', 'on') and
-           is_state('binary_sensor.ff590mr_window_rear_right', 'on') }}
+        {{ not (is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusfrontleft', 'CLOSED') and
+                is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusfrontright', 'CLOSED') and
+                is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusrearleft', 'CLOSED') and
+                is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusrearright', 'CLOSED')) }}
       icon_template: >-
-        {% if is_state('binary_sensor.ff590mr_window_front_left', 'on') and
-           is_state('binary_sensor.ff590mr_window_front_right', 'on') and
-           is_state('binary_sensor.ff590mr_window_rear_left', 'on') and
-           is_state('binary_sensor.ff590mr_window_rear_right', 'on') %}
-          mdi:window-open
-        {% else %}
+        {% if (is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusfrontleft', 'CLOSED') and
+               is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusfrontright', 'CLOSED') and
+               is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusrearleft', 'CLOSED') and
+               is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusrearright', 'CLOSED')) %}
           mdi:window-closed
+        {% else %}
+          mdi:window-open
         {% endif %}      
       device_class: opening
 
-
 ######################################################################
 # Binary Sensor: Window Front Left
 ######################################################################