Updated mercedes package

diff --git a/packages/mercedes/mercedes_customizations.yaml b/packages/mercedes/mercedes_customizations.yaml
index f03ffbdce0ca1aadeb44700f9722c0cf8ea45bb9..53294d246306eeefd4d7a21e4f5624f83b905485 100644 (file)
--- a/packages/mercedes/mercedes_customizations.yaml
+++ b/packages/mercedes/mercedes_customizations.yaml
@@ -30,7 +30,7 @@ homeassistant:
       friendly_name: Stato Generale
       device_class: problem
       icon: mdi:hazard-lights
-      # warningbrakefluid, warningwashwater, warningcoolantlevellow, warninglowbattery
+      # warningbrakefluid, warningcoolantlevellow, warningwashwater
 
     # Freno a Mano - parkbrakestatus
     #binary_sensor.engine_light_warning:
@@ -44,16 +44,16 @@ homeassistant:
       friendly_name: Pneumatici
       device_class: problem
       #icon: mdi:car-tire-alert
-      #tirepressureRearLeft, tirepressureRearRight, tirepressureFrontRight, tirepressureFrontLeft, tireMarkerFrontRight, tireMarkerFrontLeft,tireMarkerRearLeft, tireMarkerRearRight,
-      #tirewarningsrdk, tirewarningsprw, tireTemperatureRearLeft, tireTemperatureFrontRight,
-      #tireTemperatureRearRight, tireTemperatureFrontLeft
+      #tireMarkerFrontLeft, tireMarkerFrontRight, tireMarkerRearLeft, tireMarkerRearRight
+      #tirepressureFrontLeft, tirepressureFrontRight, tirepressureRearLeft, tirepressureRearRight,
+      # tirewarningsrdk
 
     # Finestrini - windowsClosed
     binary_sensor.ff590mr_windows_closed:
       friendly_name: Finestrini
       device_class: opening
       icon: mdi:window-closed
-      # windowstatusrearleft, windowstatusrearright, windowstatusfrontright, windowstatusfrontleft
+      # windowstatusfrontleft, windowstatusfrontright, windowstatusrearleft, windowstatusrearright
 
     ######################################################################
     # Device Tracker
@@ -66,7 +66,7 @@ homeassistant:
     # Locks
     ######################################################################
     lock.ff590mr_lock:
-      friendly_name: Blocco Auto
+      friendly_name: Blocco auto
       icon: mdi:lock
 
     ######################################################################
@@ -76,31 +76,31 @@ homeassistant:
     sensor.ff590mr_lock:
       friendly_name: Veicolo
       icon: mdi:lock-open
-      # doorLockStatusOverall, doorlockstatusvehicle, doorStatusOverall,
-      # doorlockstatusfrontleft,doorlockstatusfrontright, doorlockstatusrearleft, doorlockstatusrearright, doorlockstatusdecklid, doorlockstatusgas,
-      # doorstatusrearleft, doorstatusfrontright, doorstatusrearright, doorstatusfrontleft, decklidstatus,
+      # decklidstatus, doorLockStatusOverall, doorStatusOverall,
+      # doorlockstatusdecklid,doorlockstatusfrontleft, doorlockstatusfrontright, doorlockstatusgas, doorlockstatusrearleft, doorlockstatusrearright,
+      # doorlockstatusvehicle, doorstatusfrontleft, doorstatusfrontright, doorstatusrearleft, doorstatusrearright,
       # rooftopstatus, sunroofstatus
 
-    # Sensore Carburante - Fuel Level
+    # Sensore carburante - Fuel level
     sensor.ff590mr_fuel_level:
-      friendly_name: Livello Carburante
+      friendly_name: Livello carburante
       icon: mdi:gas-station
       # tankLevelAdBlue
 
-    # Violazione Geolocalizzazione - Geofencing Violation
+    # Violazione geolocalizzazione - Geofencing violation
     sensor.ff590mr_geofencing_violation:
-      friendly_name: Violazione Geolocalizzazione
+      friendly_name: Violazione geolocalizzazione
       icon: mdi:map-marker-radius
+      # Last_event_zone
 
     # Odometria - odometer
     sensor.ff590mr_odometer:
-      friendly_name: Km Percorsi
+      friendly_name: Km percorsi
       icon: mdi:road-variant
-      # distanceReset, distanceStart, averageSpeedReset, averageSpeedStart, distanceZEReset,
-      # drivenTimeZEReset, drivenTimeReset, drivenTimeStart, ecoscoretotal, ecoscorefreewhl, ecoscorebonusrange, ecoscoreconst, ecoscoreaccel,
-      # gasconsumptionstart, gasconsumptionreset, gasTankRange, gasTankLevel,
-      # liquidconsumptionstart, liquidconsumptionreset, liquidRangeSkipIndication, rangeliquid, serviceintervaldays, tanklevelpercent, tankReserveLamp,
-      # batteryState, tankLevelAdBlue
+
+    # Gamma fossile - Range liquid
+    sensor.ff590mr_range_liquid:
+      friendly_name: Gamma fossile
     sensor.ff590mr_distance_reset:
       friendly_name: Distanza dal reset
     sensor.ff590mr_distance_start:
@@ -109,25 +109,72 @@ homeassistant:
       friendly_name: Consumo dalla partenza
     sensor.ff590mr_liquid_consumption_reset:
       friendly_name: Consumo dal reset
-
-    # Sensore Avviamento
+    sensor.ff590mr_average_speed_start:
+      friendly_name: Velocità media da start
+    sensor.ff590mr_average_speed_reset:
+      friendly_name: Velocità media da reset
+
+    # Gamma elettrica - Range electric
+    sensor.ff590mr_range_electric:
+      friendly_name: Gamma elettrica
+    sensor.ff590mr_charging_power:
+     friendly_name: Potenza di caricamento
+    sensor.ff590mr_electric_consumption_start:
+      friendly_name: Consumi elettrici da start
+    sensor.ff590mr_electric_consumption_reset:
+      friendly_name: Consumi elettrici da reset
+    sensor.ff590mr_max_state_of_charge:
+      friendly_name: Massimo stato di carica
+    sensor.ff590mr_state_of_charge:
+      friendly_name: Stato carica
+
+    # Batteria di avviamento - Starter battery state
+    sensor.ff590mr_starter_battery_state:
+      friendly_name: Batteria di avviamento
+
+    # Sensore avviamento
     sensor.ff590mr_ignition_state:
-      friendly_name: Stato Accensione
+      friendly_name: Stato accensione
       icon: mdi:key-wireless
 
+    # Riscaldamento ausiliario
+    sensor.ff590mr_auxheat_status:
+      friendly_name: Riscaldamento ausiliario
+
+    # Partenza prevista - Departure time
+    sensor.ff590mr_departure_time:
+      friendly_name: Partenza prevista
+
+    # Sensori Pneumaticici
+    sensor.ff590mr_tire_pressure_front_left:
+      friendly_name: Anteriore sinstro
+      icon_template: mdi:car-tire-alert
+    sensor.ff590mr_tire_pressure_front_right:
+      friendly_name: Anteriore destro
+      icon_template: mdi:car-tire-alert
+    sensor.ff590mr_tire_pressure_rear_left:
+      friendly_name: Posteriore sinistro
+      icon_template: mdi:car-tire-alert
+    sensor.ff590mr_tire_pressure_rear_right:
+      friendly_name: Posteriore destro
+      icon_template: mdi:car-tire-alert
+
+    sensor.ff590mr_car_alarm:
+      friendly_name: Allarme auto
+
     ######################################################################
     # Diagnostic Sensors
     ######################################################################
-    # Sensore Dati Connessione
+    # Sensore Dati connessione
     sensor.ff590mr_car:
-      friendly_name: Messaggi Auto
+      friendly_name: Messaggi auto
       icon: mdi:car-connected
       # full_update_messages_received, partital_update_messages_received, last_message_received,
       # last_command_type, last_command_state,
       # last_command_error_code, last_command_error_message
 
-    # Sensore Configurazione Estesa
+    # Sensore Configurazione estesa
     sensor.ff590mr_rcp_features:
-      friendly_name: Configurazione Estesa
+      friendly_name: Configurazione estesa
       icon: mdi:car-cog
       # rcp_supported_settings (List of all remote configuration options, I'll implement them step by step as services or buttons)

diff --git a/packages/mercedes/mercedes_log.yaml b/packages/mercedes/mercedes_log.yaml
index 8642d0a2d75c4cd3521eb3a1ce4942213fd67100..febef0c250f1fac90a50bac91bfcbadb8e93e03f 100644 (file)
--- a/packages/mercedes/mercedes_log.yaml
+++ b/packages/mercedes/mercedes_log.yaml
@@ -5,41 +5,62 @@
 logbook:
   exclude:
     entities:
-    - binary_sensor.ff590mr_door_front_left
-    - binary_sensor.ff590mr_door_front_right
-    - binary_sensor.ff590mr_door_rear_left
-    - binary_sensor.ff590mr_door_rear_right
-    #- binary_sensor.ff590mr_doors_closed
-    - binary_sensor.ff590mr_engine_light_warning
-    #- binary_sensor.ff590mr_locked
-    - binary_sensor.ff590mr_low_brake_fluid_warning
-    - binary_sensor.ff590mr_low_coolant_level_warning
-    - binary_sensor.ff590mr_low_wash_water_warning
-    - binary_sensor.ff590mr_tire_warning
-    - binary_sensor.ff590mr_decklid
-    - binary_sensor.ff590mr_fuellid
-    - binary_sensor.ff590mr_window_front_left
-    - binary_sensor.ff590mr_window_front_right
-    - binary_sensor.ff590mr_window_rear_left
-    - binary_sensor.ff590mr_window_rear_right
-    - binary_sensor.ff590mr_windows_closed
-    - lock.ff590mr_lock
-    - sensor.ff590mr_car
-    - 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
-    - sensor.ff590mr_lock
-    #- sensor.ff590mr_odometer
-    - sensor.ff590mr_rcp_features
-    - sensor.ff590mr_service_interval_days
-    - sensor.ff590mr_tire_pressure_front_left
-    - sensor.ff590mr_tire_pressure_front_right
-    - sensor.ff590mr_tire_pressure_rear_left
-    - sensor.ff590mr_tire_pressure_rear_right
+      - binary_sensor.ff590mr_decklid
+      - binary_sensor.ff590mr_door_front_left
+      - binary_sensor.ff590mr_door_front_right
+      - binary_sensor.ff590mr_door_rear_left
+      - binary_sensor.ff590mr_door_rear_right
+      #- binary_sensor.ff590mr_doors_closed
+      - binary_sensor.ff590mr_engine_light_warning
+      - binary_sensor.ff590mr_low_brake_fluid_warning
+      - binary_sensor.ff590mr_low_coolant_level_warning
+      - binary_sensor.ff590mr_low_wash_water_warning
+      - binary_sensor.ff590mr_tire_warning
+      - binary_sensor.ff590mr_window_front_left
+      - binary_sensor.ff590mr_window_front_right
+      - binary_sensor.ff590mr_window_rear_left
+      - binary_sensor.ff590mr_window_rear_right
+      - binary_sensor.ff590mr_windows_closed
+      #- binary_sensor.ff590mr_windows_closed_2
+      - binary_sensor.ff590mr_fuellid
+      #- device_tracker.ff590mr_device_tracker
+      - lock.ff590mr_lock
+      #- lock.ff590mr_lock_no_pin
+      - sensor.ff590mr_auxheat_status
+      - sensor.ff590mr_average_speed_reset
+      - sensor.ff590mr_average_speed_start
+      - sensor.ff590mr_car
+      - sensor.ff590mr_car_alarm
+      - sensor.ff590mr_charging_power
+      - sensor.ff590mr_departure_time
+      - sensor.ff590mr_distance_reset
+      - sensor.ff590mr_distance_start
+      - sensor.ff590mr_distance_zero_emission_reset
+      - sensor.ff590mr_eco_score_acceleration
+      - sensor.ff590mr_eco_score_bonus_range
+      - sensor.ff590mr_eco_score_constant
+      - sensor.ff590mr_eco_score_free_wheel
+      - sensor.ff590mr_eco_score_total
+      - sensor.ff590mr_electric_consumption_reset
+      - sensor.ff590mr_electric_consumption_start
+      - sensor.ff590mr_fuel_level
+      - sensor.ff590mr_geofencing_violation
+      - sensor.ff590mr_ignition_state
+      - sensor.ff590mr_liquid_consumption_reset
+      - sensor.ff590mr_liquid_consumption_start
+      - sensor.ff590mr_lock
+      - sensor.ff590mr_max_state_of_charge
+      #- sensor.ff590mr_odometer
+      - sensor.ff590mr_range_electric
+      - sensor.ff590mr_range_liquid
+      - sensor.ff590mr_rcp_features
+      - sensor.ff590mr_service_interval_days
+      - sensor.ff590mr_starter_battery_state
+      - sensor.ff590mr_state_of_charge
+      - sensor.ff590mr_tire_pressure_front_left
+      - sensor.ff590mr_tire_pressure_front_right
+      - sensor.ff590mr_tire_pressure_rear_left
+      - sensor.ff590mr_tire_pressure_rear_right
 
 ######################################################################
 # Mercedes Package - Recorder
@@ -48,38 +69,59 @@ logbook:
 recorder:
   exclude:
     entities:
-    - binary_sensor.ff590mr_door_front_left
-    - binary_sensor.ff590mr_door_front_right
-    - binary_sensor.ff590mr_door_rear_left
-    - binary_sensor.ff590mr_door_rear_right
-    #- binary_sensor.ff590mr_doors_closed
-    - binary_sensor.ff590mr_engine_light_warning
-    #- binary_sensor.ff590mr_locked
-    - binary_sensor.ff590mr_low_brake_fluid_warning
-    - binary_sensor.ff590mr_low_coolant_level_warning
-    - binary_sensor.ff590mr_low_wash_water_warning
-    - binary_sensor.ff590mr_tire_warning
-    - binary_sensor.ff590mr_decklid
-    - binary_sensor.ff590mr_fuellid
-    - binary_sensor.ff590mr_window_front_left
-    - binary_sensor.ff590mr_window_front_right
-    - binary_sensor.ff590mr_window_rear_left
-    - binary_sensor.ff590mr_window_rear_right
-    - binary_sensor.ff590mr_windows_closed
-    - lock.ff590mr_lock
-    - sensor.ff590mr_car
-    - 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
-    - sensor.ff590mr_lock
-    #- sensor.ff590mr_odometer
-    - sensor.ff590mr_rcp_features
-    - sensor.ff590mr_service_interval_days
-    - sensor.ff590mr_tire_pressure_front_left
-    - sensor.ff590mr_tire_pressure_front_right
-    - sensor.ff590mr_tire_pressure_rear_left
-    - sensor.ff590mr_tire_pressure_rear_right
+      - binary_sensor.ff590mr_decklid
+      - binary_sensor.ff590mr_door_front_left
+      - binary_sensor.ff590mr_door_front_right
+      - binary_sensor.ff590mr_door_rear_left
+      - binary_sensor.ff590mr_door_rear_right
+      #- binary_sensor.ff590mr_doors_closed
+      - binary_sensor.ff590mr_engine_light_warning
+      - binary_sensor.ff590mr_low_brake_fluid_warning
+      - binary_sensor.ff590mr_low_coolant_level_warning
+      - binary_sensor.ff590mr_low_wash_water_warning
+      - binary_sensor.ff590mr_tire_warning
+      - binary_sensor.ff590mr_window_front_left
+      - binary_sensor.ff590mr_window_front_right
+      - binary_sensor.ff590mr_window_rear_left
+      - binary_sensor.ff590mr_window_rear_right
+      - binary_sensor.ff590mr_windows_closed
+      #- binary_sensor.ff590mr_windows_closed_2
+      - binary_sensor.ff590mr_fuellid
+      #- device_tracker.ff590mr_device_tracker
+      - lock.ff590mr_lock
+      #- lock.ff590mr_lock_no_pin
+      - sensor.ff590mr_auxheat_status
+      - sensor.ff590mr_average_speed_reset
+      - sensor.ff590mr_average_speed_start
+      - sensor.ff590mr_car
+      - sensor.ff590mr_car_alarm
+      - sensor.ff590mr_charging_power
+      - sensor.ff590mr_departure_time
+      - sensor.ff590mr_distance_reset
+      - sensor.ff590mr_distance_start
+      - sensor.ff590mr_distance_zero_emission_reset
+      - sensor.ff590mr_eco_score_acceleration
+      - sensor.ff590mr_eco_score_bonus_range
+      - sensor.ff590mr_eco_score_constant
+      - sensor.ff590mr_eco_score_free_wheel
+      - sensor.ff590mr_eco_score_total
+      - sensor.ff590mr_electric_consumption_reset
+      - sensor.ff590mr_electric_consumption_start
+      - sensor.ff590mr_fuel_level
+      - sensor.ff590mr_geofencing_violation
+      - sensor.ff590mr_ignition_state
+      - sensor.ff590mr_liquid_consumption_reset
+      - sensor.ff590mr_liquid_consumption_start
+      - sensor.ff590mr_lock
+      - sensor.ff590mr_max_state_of_charge
+      #- sensor.ff590mr_odometer
+      - sensor.ff590mr_range_electric
+      - sensor.ff590mr_range_liquid 
+      - sensor.ff590mr_rcp_features
+      - sensor.ff590mr_service_interval_days
+      - sensor.ff590mr_starter_battery_state
+      - sensor.ff590mr_state_of_charge
+      - sensor.ff590mr_tire_pressure_front_left
+      - sensor.ff590mr_tire_pressure_front_right
+      - sensor.ff590mr_tire_pressure_rear_left
+      - sensor.ff590mr_tire_pressure_rear_right