From 1b8fb943e74152a457ac76404212a1c50a99084c Mon Sep 17 00:00:00 2001
From: Giorgio Ravera <giorgio.ravera@gmail.com>
Date: Mon, 26 Dec 2022 01:14:09 +0100
Subject: [PATCH] Updated MercedesMe component

---
 .storage/lovelace                             |  4 +--
 .../mercedes/mercedes_customizations.yaml     |  4 +++
 packages/mercedes/mercedes_log.yaml           | 15 +++++----
 packages/mercedes/mercedes_odometer.yaml      | 32 +++++++++----------
 4 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/.storage/lovelace b/.storage/lovelace
index 477211fa..07375b73 100644
--- a/.storage/lovelace
+++ b/.storage/lovelace
@@ -1237,10 +1237,10 @@
                   "entity": "sensor.ff590mr_odometer"
                 },
                 {
-                  "entity": "sensor.ff590mr_distance_since_start"
+                  "entity": "sensor.ff590mr_distance_start"
                 },
                 {
-                  "entity": "sensor.ff590mr_distance_since_reset"
+                  "entity": "sensor.ff590mr_distance_reset"
                 },
                 {
                   "entity": "sensor.ff590mr_fuel_level"
diff --git a/packages/mercedes/mercedes_customizations.yaml b/packages/mercedes/mercedes_customizations.yaml
index 1fab58ab..314aad81 100644
--- a/packages/mercedes/mercedes_customizations.yaml
+++ b/packages/mercedes/mercedes_customizations.yaml
@@ -103,6 +103,10 @@ homeassistant:
       # gasconsumptionstart, gasconsumptionreset, gasTankRange, gasTankLevel,
       # liquidconsumptionstart, liquidconsumptionreset, liquidRangeSkipIndication, rangeliquid, serviceintervaldays, tanklevelpercent, tankReserveLamp,
       # batteryState, tankLevelAdBlue
+    sensor.ff590mr_distance_reset:
+      friendly_name: Distanza dal reset
+    sensor.ff590mr_distance_start:
+      friendly_name: Distanza dalla partenza
     sensor.ff590mr_liquid_consumption_start:
       friendly_name: Consumo dalla partenza
     sensor.ff590mr_liquid_consumption_reset:
diff --git a/packages/mercedes/mercedes_log.yaml b/packages/mercedes/mercedes_log.yaml
index e04a99f3..acde1fa8 100644
--- a/packages/mercedes/mercedes_log.yaml
+++ b/packages/mercedes/mercedes_log.yaml
@@ -25,9 +25,10 @@ history:
     - binary_sensor.ff590mr_windows_closed
     - lock.ff590mr_lock
     - sensor.ff590mr_car
-    - sensor.ff590mr_distance_since_reset
-    - sensor.ff590mr_distance_since_start
+    - sensor.ff590mr_distance_reset
+    - sensor.ff590mr_distance_start
     #- sensor.ff590mr_fuel_level
+    - sensor.ff590mr_geofencing_violation
     - sensor.ff590mr_ignition_state
     - sensor.ff590mr_liquid_consumption_reset
     - sensor.ff590mr_liquid_consumption_start
@@ -67,9 +68,10 @@ logbook:
     - binary_sensor.ff590mr_windows_closed
     - lock.ff590mr_lock
     - sensor.ff590mr_car
-    - sensor.ff590mr_distance_since_reset
-    - sensor.ff590mr_distance_since_start
+    - sensor.ff590mr_distance_reset
+    - sensor.ff590mr_distance_start
     #- sensor.ff590mr_fuel_level
+    - sensor.ff590mr_geofencing_violation
     - sensor.ff590mr_ignition_state
     - sensor.ff590mr_liquid_consumption_reset
     - sensor.ff590mr_liquid_consumption_start
@@ -109,9 +111,10 @@ recorder:
     - binary_sensor.ff590mr_windows_closed
     - lock.ff590mr_lock
     - sensor.ff590mr_car
-    - sensor.ff590mr_distance_since_reset
-    - sensor.ff590mr_distance_since_start
+    - sensor.ff590mr_distance_reset
+    - sensor.ff590mr_distance_start
     #- sensor.ff590mr_fuel_level
+    - sensor.ff590mr_geofencing_violation
     - sensor.ff590mr_ignition_state
     - sensor.ff590mr_liquid_consumption_reset
     - sensor.ff590mr_liquid_consumption_start
diff --git a/packages/mercedes/mercedes_odometer.yaml b/packages/mercedes/mercedes_odometer.yaml
index 64e7b883..63a29099 100644
--- a/packages/mercedes/mercedes_odometer.yaml
+++ b/packages/mercedes/mercedes_odometer.yaml
@@ -4,26 +4,26 @@
 
 sensor:
   ######################################################################
-  # Sensor: Distance from Start
+  # Sensor: Distance from Reset
   ######################################################################
-  - platform: template
-    sensors:
-      ff590mr_distance_since_start:
-        friendly_name: Distanza dalla partenza
-        unit_of_measurement: 'Km'
-        value_template: "{{ state_attr('sensor.ff590mr_odometer', 'distanceStart') }}"
-        icon_template: mdi:road-variant
+  #- platform: template
+  #  sensors:
+  #    ff590mr_distance_since_reset:
+  #      friendly_name: Distanza dal reset
+  #      unit_of_measurement: 'Km'
+  #      value_template: "{{ state_attr('sensor.ff590mr_odometer', 'distanceReset') }}"
+  #      icon_template: mdi:map-marker-distance
 
   ######################################################################
-  # Sensor: Distance from Reset
+  # Sensor: Distance from Start
   ######################################################################
-  - platform: template
-    sensors:
-      ff590mr_distance_since_reset:
-        friendly_name: Distanza dal reset
-        unit_of_measurement: 'Km'
-        value_template: "{{ state_attr('sensor.ff590mr_odometer', 'distanceReset') }}"
-        icon_template: mdi:road-variant
+  #- platform: template
+  #  sensors:
+  #    ff590mr_distance_since_start:
+  #      friendly_name: Distanza dalla partenza
+  #      unit_of_measurement: 'Km'
+  #      value_template: "{{ state_attr('sensor.ff590mr_odometer', 'distanceStart') }}"
+  #      icon_template: mdi:map-marker-distance
 
   ######################################################################
   # Sensor: Liquid Consumption from Start
-- 
2.47.3