From 365626514c5e282270b7a61f480979d404387033 Mon Sep 17 00:00:00 2001
From: Giorgio Ravera <giorgio.ravera@gmail.com>
Date: Fri, 7 Jun 2019 11:39:54 +0200
Subject: [PATCH] Review car lock procedure

---
 binary_sensor/car.yaml | 18 ++++++------------
 ui-lovelace.yaml       | 13 +++++--------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/binary_sensor/car.yaml b/binary_sensor/car.yaml
index 1b3d0168..18ccf661 100644
--- a/binary_sensor/car.yaml
+++ b/binary_sensor/car.yaml
@@ -4,13 +4,13 @@
 
 - platform: template
   sensors:
-    car_doors_lock:
+    ff590mr_lock:
       friendly_name: Vettura Bloccata
-      entity_id: sensor.ff590mr_door_lock_vehicle
+      entity_id: lock.ff590mr_lock
       value_template: >-
-        {{ not is_state('sensor.ff590mr_door_lock_vehicle', '2') }}
+        {{ is_state('lock.ff590mr_lock', 'locked') }}
       icon_template: >-
-        {% if is_state('sensor.ff590mr_door_lock_vehicle', '2') %}
+        {% if is_state('lock.ff590mr_lock', 'unlocked') %}
           mdi:lock
         {% else %}
           mdi:lock-open
@@ -27,15 +27,9 @@
       friendly_name: Chiusura Porte
       entity_id: sensor.ff590mr_lock
       value_template: >-
-        {{ is_state_attr('sensor.ff590mr_lock', 'frontLeftDoorClosed', 'true') 
-           and is_state_attr('sensor.ff590mr_lock', 'frontRightDoorClosed', 'true')
-           and is_state_attr('sensor.ff590mr_lock', 'rearLeftDoorClosed', 'true')
-           and is_state_attr('sensor.ff590mr_lock', 'rearRightDoorClosed', 'true') }}
+        {{ is_state('sensor.ff590mr_lock', 'true') }}
       icon_template: >-
-        {% if is_state_attr('sensor.ff590mr_lock', 'frontLeftDoorClosed', 'true') 
-           and is_state_attr('sensor.ff590mr_lock', 'frontRightDoorClosed', 'true')
-           and is_state_attr('sensor.ff590mr_lock', 'rearLeftDoorClosed', 'true')
-           and is_state_attr('sensor.ff590mr_lock', 'rearRightDoorClosed', 'true') %}
+        {% if is_state('sensor.ff590mr_lock', 'true') %}
           mdi:car-door
         {% else %}
           mdi:car-door
diff --git a/ui-lovelace.yaml b/ui-lovelace.yaml
index f1fe5b0e..73d867ce 100644
--- a/ui-lovelace.yaml
+++ b/ui-lovelace.yaml
@@ -374,10 +374,9 @@ views:
 #      - binary_sensor.ff590mr_park_brake_status
 #      - binary_sensor.ff590mr_status_decklid
       - binary_sensor.ff590mr_engine_light_warning
-      #- binary_sensor.ff590mr_tire_warning
       - binary_sensor.ff590mr_doors_closed
       - binary_sensor.ff590mr_windows_closed
-      - lock.ff590mr_lock
+      - binary_sensor.ff590mr_lock
     cards:
       #- type: gauge
       #  title: "Livello Carburante"
@@ -387,7 +386,10 @@ views:
       #    red: 0
       #    yellow: 30
       #    green: 60
-
+      - type: entity-button
+        name: Blocco/Sblocco Vettura
+        icon: mdi:key
+        entity: lock.ff590mr_lock
       - type: entities
         title: "Mercedes A200d: Sensori"
         show_header_toggle: false
@@ -398,7 +400,6 @@ views:
           - binary_sensor.ff590mr_warning_washwater
           - binary_sensor.ff590mr_warning_coolantlevellow
           #- device_tracker.wdd1760081v167576
-
       - type: entities
         title: "Mercedes A200d: Ruote"
         show_header_toggle: false
@@ -407,7 +408,6 @@ views:
           - sensor.ff590mr_tire_pressure_front_right
           - sensor.ff590mr_tire_pressure_rear_left
           - sensor.ff590mr_tire_pressure_rear_right
-      
       - type: entities
         title: "Mercedes A200d: Finestrini"
         show_header_toggle: false
@@ -416,7 +416,6 @@ views:
           - sensor.ff590mr_window_front_right
           - sensor.ff590mr_window_rear_left
           - sensor.ff590mr_window_rear_right
-      
       - type: entities
         title: "Mercedes A200d: Porte"
         show_header_toggle: false
@@ -425,7 +424,6 @@ views:
           - sensor.ff590mr_door_front_right
           - sensor.ff590mr_door_rear_left
           - sensor.ff590mr_door_rear_right
-
       - type: entities
         title: "Mercedes A200d: Sblocco serrature"
         show_header_toggle: false
@@ -437,7 +435,6 @@ views:
           - sensor.ff590mr_door_lock_rear_right
           - sensor.ff590mr_door_lock_gas
           - sensor.ff590mr_door_lock_decklid
-
       - type: entities
         title: "Mercedes A200d: Dati"
         show_header_toggle: false
-- 
2.47.3