From 8c0859191841f07c9799c3b804d691c32e537ea9 Mon Sep 17 00:00:00 2001
From: Giorgio Ravera <giorgio.ravera@gmail.com>
Date: Sat, 27 Jun 2020 11:56:20 +0200
Subject: [PATCH] updated mercedes sensors.

---
 packages/mercedes/binary_sensor.yaml  | 36 ---------------------------
 packages/mercedes/customizations.yaml | 20 ++++++++++++++-
 packages/mercedes/log.yaml            |  9 -------
 templates/speech_message.yaml         |  7 +++---
 4 files changed, 23 insertions(+), 49 deletions(-)

diff --git a/packages/mercedes/binary_sensor.yaml b/packages/mercedes/binary_sensor.yaml
index 2eeb9429..6aa2c4c7 100644
--- a/packages/mercedes/binary_sensor.yaml
+++ b/packages/mercedes/binary_sensor.yaml
@@ -228,39 +228,3 @@ binary_sensor:
             mdi:window-open
           {% endif %}   
         device_class: opening
-
-  ######################################################################
-  # Binary Sensor: Warning Brake fluid
-  ######################################################################
-  - platform: template
-    sensors:
-      ff590mr_warning_brakefluid:
-        friendly_name: Liquido freni
-        entity_id: binary_sensor.ff590mr_engine_light_warning
-        value_template: >-
-          {{ is_state_attr('binary_sensor.ff590mr_engine_light_warning', 'warningbrakefluid', 'true') }}
-        device_class: problem
-
-  ######################################################################
-  # Binary Sensor: Warning Wash Water
-  ######################################################################
-  - platform: template
-    sensors:
-      ff590mr_warning_washwater:
-        friendly_name: Liquido lavacristalli
-        entity_id: binary_sensor.ff590mr_engine_light_warning
-        value_template: >-
-          {{ is_state_attr('binary_sensor.ff590mr_engine_light_warning', 'warningwashwater', 'true') }}
-        device_class: problem
-
-  ######################################################################
-  # Binary Sensor: Warning Coolant Level Low
-  ######################################################################
-  - platform: template
-    sensors:
-      ff590mr_warning_coolantlevellow:
-        friendly_name: Liquido raffreddamento
-        entity_id: binary_sensor.ff590mr_engine_light_warning
-        value_template: >-
-          {{ is_state_attr('binary_sensor.ff590mr_engine_light_warning', 'warningcoolantlevellow', 'true') }}
-        device_class: problem
diff --git a/packages/mercedes/customizations.yaml b/packages/mercedes/customizations.yaml
index e77657c1..e14b8a24 100644
--- a/packages/mercedes/customizations.yaml
+++ b/packages/mercedes/customizations.yaml
@@ -18,9 +18,27 @@ homeassistant:
     #  icon: mdi:car-brake-parking
     #  # preWarningBrakeLiningWear
 
+    # Freni
+    binary_sensor.ff590mr_low_brake_fluid_warning:
+      friendly_name: Liquido Freni
+      device_class: problem
+      icon: mdi:car-brake-alert
+
+    # Liquido Raffreddamento
+    binary_sensor.ff590mr_low_coolant_level_warning:
+      friendly_name: Liquido Raffreddamento
+      device_class: problem
+      icon: mdi:coolant-temperature
+      
+    # Liquido Lavacristalli
+    binary_sensor.ff590mr_low_wash_water_warning:
+      friendly_name: Liquido Lavacristalli
+      device_class: problem
+      icon: mdi:wiper-wash
+
     # Pneumatici
     binary_sensor.ff590mr_tire_warning:
-      friendly_name: Allarme Pneumatici
+      friendly_name: Pneumatici
       device_class: problem
       icon: mdi:car-tire-alert
       # tirepressureRearLeft, tirepressureRearRight, tirepressureFrontRight, tirepressureFrontLeft, 
diff --git a/packages/mercedes/log.yaml b/packages/mercedes/log.yaml
index 8c17dd8d..fc15c11c 100644
--- a/packages/mercedes/log.yaml
+++ b/packages/mercedes/log.yaml
@@ -17,9 +17,6 @@ history:
     - binary_sensor.ff590mr_tire_warning
     - binary_sensor.ff590mr_trunk
     - binary_sensor.ff590mr_fuel_lid
-    #- binary_sensor.ff590mr_warning_brakefluid
-    #- binary_sensor.ff590mr_warning_coolantlevellow
-    #- binary_sensor.ff590mr_warning_washwater
     - binary_sensor.ff590mr_window_front_left
     - binary_sensor.ff590mr_window_front_right
     - binary_sensor.ff590mr_window_rear_left
@@ -62,9 +59,6 @@ logbook:
     - binary_sensor.ff590mr_tire_warning
     - binary_sensor.ff590mr_trunk
     - binary_sensor.ff590mr_fuel_lid
-    #- binary_sensor.ff590mr_warning_brakefluid
-    #- binary_sensor.ff590mr_warning_coolantlevellow
-    #- binary_sensor.ff590mr_warning_washwater
     - binary_sensor.ff590mr_window_front_left
     - binary_sensor.ff590mr_window_front_right
     - binary_sensor.ff590mr_window_rear_left
@@ -107,9 +101,6 @@ recorder:
     - binary_sensor.ff590mr_tire_warning
     - binary_sensor.ff590mr_trunk
     - binary_sensor.ff590mr_fuel_lid
-    #- binary_sensor.ff590mr_warning_brakefluid
-    #- binary_sensor.ff590mr_warning_coolantlevellow
-    #- binary_sensor.ff590mr_warning_washwater
     - binary_sensor.ff590mr_window_front_left
     - binary_sensor.ff590mr_window_front_right
     - binary_sensor.ff590mr_window_rear_left
diff --git a/templates/speech_message.yaml b/templates/speech_message.yaml
index 877564a9..00fa3f3d 100644
--- a/templates/speech_message.yaml
+++ b/templates/speech_message.yaml
@@ -113,9 +113,10 @@
     {% endif %}
     La Mercedes si trova {{ car_position }}. è {{ car_lock }} con i finestrini {{ car_windows }}.
     Il livello del carburante è {{ states('sensor.ff590mr_fuel_level') }} percento.
-    {% if is_state('binary_sensor.ff590mr_warning_brakefluid', 'on') or
-          is_state('binary_sensor.ff590mr_warning_coolantlevellow', 'on') or
-          is_state('binary_sensor.ff590mr_warning_washwater', 'on') %}
+    {% if is_state('binary_sensor.ff590mr_low_brake_fluid_warning', 'on') or
+          is_state('binary_sensor.ff590mr_low_coolant_level_warning', 'on') or
+          is_state('binary_sensor.ff590mr_low_wash_water_warning', 'on') or
+          is_state('binary_sensor.ff590mr_tire_warning', 'on') %}
       Sono inoltre presenti allarmi.
     {% endif %}
   {%- endmacro -%}
-- 
2.47.3