Created Packages Mercedes

diff --git a/binary_sensor/car.yaml b/binary_sensor/car.yaml
deleted file mode 100644 (file)
index a613263..0000000
--- a/binary_sensor/car.yaml
+++ /dev/null
@@ -1,277 +0,0 @@
-######################################################################
-# Binary Sensor: Doors Lock
-######################################################################
-
-- platform: template
-  sensors:
-    ff590mr_locked:
-      friendly_name: Vettura Bloccata
-      entity_id: lock.ff590mr_lock
-      value_template: >-
-        {{ not is_state('lock.ff590mr_lock', 'locked') }}
-      icon_template: >-
-        {% if is_state('lock.ff590mr_lock', 'locked') %}
-          mdi:lock
-        {% else %}
-          mdi:lock-open
-        {% endif %}
-      device_class: lock
-
-######################################################################
-# Binary Sensor: Doors Closed
-######################################################################
-
-- platform: template
-  sensors:
-    ff590mr_doors_closed:
-      friendly_name: Porte
-      entity_id: sensor.ff590mr_lock
-      value_template: >-
-        {{ not is_state_attr('sensor.ff590mr_lock', 'doorsClosed', true) }}
-      icon_template: >-
-        {% if is_state_attr('sensor.ff590mr_lock', 'doorsClosed', true) %}
-          mdi:car-door
-        {% else %}
-          mdi:car-door
-        {% endif %}
-      device_class: opening
-
-######################################################################
-# Binary Sensor: Door Front Left
-######################################################################
-
-- platform: template
-  sensors:
-    ff590mr_door_front_left:
-      friendly_name: Anteriore Sinistra
-      entity_id: sensor.ff590mr_lock
-      value_template: >-
-        {{ not (is_state_attr('sensor.ff590mr_lock', 'doorStateFrontLeft', 'DOOR_CLOSED_AND_DOOR_LOCKED') or
-                is_state_attr('sensor.ff590mr_lock', 'doorStateFrontLeft', 'DOOR_CLOSED_AND_DOOR_UNLOCKED')) }}
-      icon_template: mdi:car-door
-      device_class: opening
-
-######################################################################
-# Binary Sensor: Door Front Right
-######################################################################
-
-- platform: template
-  sensors:
-    ff590mr_door_front_right:
-      friendly_name: Anteriore Destra
-      entity_id: sensor.ff590mr_lock
-      value_template: >-
-        {{ not (is_state_attr('sensor.ff590mr_lock', 'doorStateFrontRight', 'DOOR_CLOSED_AND_DOOR_LOCKED') or
-                is_state_attr('sensor.ff590mr_lock', 'doorStateFrontRight', 'DOOR_CLOSED_AND_DOOR_UNLOCKED')) }}
-      icon_template: mdi:car-door
-      device_class: opening
-
-######################################################################
-# Binary Sensor: Door Rear Left
-######################################################################
-
-- platform: template
-  sensors:
-    ff590mr_door_rear_left:
-      friendly_name: Posteriore Sinistra
-      entity_id: sensor.ff590mr_lock
-      value_template: >-     
-        {{ not (is_state_attr('sensor.ff590mr_lock', 'doorStateRearLeft', 'DOOR_CLOSED_AND_DOOR_LOCKED') or
-                is_state_attr('sensor.ff590mr_lock', 'doorStateRearLeft', 'DOOR_CLOSED_AND_DOOR_UNLOCKED')) }}
-      icon_template: mdi:car-door
-      device_class: opening
-
-######################################################################
-# Binary Sensor: Door Rear Right
-######################################################################
-
-- platform: template
-  sensors:
-    ff590mr_door_rear_right:
-      friendly_name: Posteriore Destra
-      entity_id: sensor.ff590mr_lock
-      value_template: >-
-        {{ not (is_state_attr('sensor.ff590mr_lock', 'doorStateRearRight', 'DOOR_CLOSED_AND_DOOR_LOCKED') or
-                is_state_attr('sensor.ff590mr_lock', 'doorStateRearRight', 'DOOR_CLOSED_AND_DOOR_UNLOCKED')) }}
-      icon_template: mdi:car-door
-      device_class: opening
-
-######################################################################
-# Binary Sensor: Trunk
-######################################################################
-
-- platform: template
-  sensors:
-    ff590mr_trunk:
-      friendly_name: Bagagliaio
-      entity_id: sensor.ff590mr_lock
-      value_template: >-
-        {{ not (is_state_attr('sensor.ff590mr_lock', 'trunkStateRollup', 'CLOSED_AND_LOCKED') or
-                is_state_attr('sensor.ff590mr_lock', 'trunkStateRollup', 'CLOSED_AND_UNLOCKED')) }}
-      icon_template: >-
-        {% if (is_state_attr('sensor.ff590mr_lock', 'trunkStateRollup', 'CLOSED_AND_LOCKED') or 
-               is_state_attr('sensor.ff590mr_lock', 'trunkStateRollup', 'CLOSED_AND_UNLOCKED')) %}
-          mdi:lock
-        {% else %}
-          mdi:lock-open
-        {% endif %}
-      device_class: opening
-
-######################################################################
-# Binary Sensor: Fuel Lid
-######################################################################
-
-- platform: template
-  sensors:
-    ff590mr_fuel_lid:
-      friendly_name: Serbatoio
-      entity_id: sensor.ff590mr_lock
-      value_template: >-
-        {{ not is_state_attr('sensor.ff590mr_lock', 'fuelLidClosed', true) }}
-      icon_template: >-
-        {% if is_state_attr('sensor.ff590mr_lock', 'fuelLidClosed', true) %}
-          mdi:gas-station
-        {% else %}
-          mdi:gas-station
-        {% endif %}
-      device_class: opening
-
-######################################################################
-# Binary Sensor: Windows Closed
-######################################################################
-
-- platform: template
-  sensors:
-    ff590mr_windows_closed_2:
-      friendly_name: Finestrini
-      entity_id: binary_sensor.ff590mr_windows_closed
-      value_template: >-
-        {{ 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_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
-######################################################################
-
-- platform: template
-  sensors:
-    ff590mr_window_front_left:
-      friendly_name: Anteriore Sinistro
-      entity_id: binary_sensor.ff590mr_windows_closed
-      value_template: >-
-        {{ not is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusfrontleft', 'CLOSED') }}
-      icon_template: >-
-        {% if is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusfrontleft', 'CLOSED') %}
-        mdi:window-closed
-        {% else %}
-          mdi:window-open
-        {% endif %}      
-      device_class: opening
-
-######################################################################
-# Binary Sensor: Window Front Right
-######################################################################
-
-- platform: template
-  sensors:
-    ff590mr_window_front_right:
-      friendly_name: Anteriore Destro
-      entity_id: binary_sensor.ff590mr_windows_closed
-      value_template: >-
-        {{ not is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusfrontright', 'CLOSED') }}
-      icon_template: >-
-        {% if is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusfrontright', 'CLOSED') %}
-        mdi:window-closed
-        {% else %}
-          mdi:window-open
-        {% endif %}   
-      device_class: opening
-
-######################################################################
-# Binary Sensor: Window Rear Left
-######################################################################
-
-- platform: template
-  sensors:
-    ff590mr_window_rear_left:
-      friendly_name: Posteriore Sinistro
-      entity_id: binary_sensor.ff590mr_windows_closed
-      value_template: >-
-        {{ not is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusrearleft', 'CLOSED') }}
-      icon_template: >-
-        {% if is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusrearleft', 'CLOSED') %}
-        mdi:window-closed
-        {% else %}
-          mdi:window-open
-        {% endif %}   
-      device_class: opening
-
-######################################################################
-# Binary Sensor: Window Rear Right
-######################################################################
-
-- platform: template
-  sensors:
-    ff590mr_window_rear_right:
-      friendly_name: Posteriore Destro
-      entity_id: binary_sensor.ff590mr_windows_closed
-      value_template: >-
-        {{ not is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusrearright', 'CLOSED') }}
-      icon_template: >-
-        {% if is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusrearright', 'CLOSED') %}
-        mdi:window-closed
-        {% else %}
-          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/customizations/car.yaml b/customizations/car.yaml
deleted file mode 100644 (file)
index 3b9d7a9..0000000
--- a/customizations/car.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-######################################################################
-# Customization: Mercedes Me 
-######################################################################
-
-# Binary Sensors
-binary_sensor.ff590mr_engine_light_warning:
-  friendly_name: Stato Generale
-  device_class: problem
-  icon: mdi:hazard-lights
-  # warningbrakefluid, warningwashwater, warningcoolantlevellow, warninglowbattery
-binary_sensor.ff590mr_park_brake_status:
-  friendly_name: Freno a mano
-  device_class: plug
-  icon: mdi:car-brake-parking
-  # preWarningBrakeLiningWear
-binary_sensor.ff590mr_tire_warning:
-  friendly_name: Allarme Pneumatici
-  device_class: problem
-  icon: mdi:car-tire-alert
-  # tirepressureRearLeft, tirepressureRearRight, tirepressureFrontRight, tirepressureFrontLeft, 
-  # tirewarningsrdk, tirewarningsprwtireMarkerFrontRight, tireMarkerFrontLeft, tireMarkerRearLeft, tireMarkerRearRight, 
-  # tireWarningRollup, lastTirepressureTimestamp
-binary_sensor.ff590mr_windows_closed:
-  friendly_name: Finestrini
-  device_class: opening
-  icon: mdi:window-closed
-  # windowstatusrearleft, windowstatusrearright, windowstatusfrontright, windowstatusfrontleft
-
-# Lock
-lock.ff590mr_lock:
-  friendly_name: Blocco Sblocco 
-  icon: mdi:lock-open
-  
-# Sensors
-sensor.ff590mr_fuel_level:
-  friendly_name: Livello Carburante
-  icon: mdi:gas-station
-sensor.ff590mr_lock:
-  friendly_name: Veicolo
-  icon: mdi:lock-open
-  # doorStateFrontLeft, doorStateFrontRight, doorStateRearLeft, doorStateRearRight, 
-  # frontLeftDoorLocked, frontRightDoorLocked, rearLeftDoorLocked, rearRightDoorLocked, 
-  # frontLeftDoorClosed, frontRightDoorClosed, rearLeftDoorClosed, rearRightDoorClosed, 
-  # doorsClosed, trunkStateRollup, sunroofstatus
-sensor.ff590mr_odometer:
-  friendly_name: Km Percorsi
-  icon: mdi:road-variant
-  # distanceReset, distanceStart, liquidconsumptionstart, liquidconsumptionreset, liquidRangeSkipIndication, serviceintervaldays, tanklevelpercent, tankReserveLamp

diff --git a/customizations/network.yaml b/customizations/network.yaml
index c4d02144e95dc04ba245010b681cadb2cedfcd46..c39bb4e46d3287dff18fb43e466e323865579f72 100644 (file)
--- a/customizations/network.yaml
+++ b/customizations/network.yaml
@@ -10,16 +10,28 @@ sensor.speedtest_upload:
   friendly_name: Upload
 
 ######################################################################
-# # Customization: pfSense
+# Customization: pfSense
 ######################################################################
 
-sensor.freebsd_router_kbyte_sec_received:
-  friendly_name: Traffico in ingresso
-sensor.freebsd_router_kbyte_sec_sent:
-  friendly_name: Traffico in uscita
+sensor.freebsd_router_kib_sec_received:
+  friendly_name: "pfSense: Kbps/s in entrata"
+sensor.freebsd_router_kib_sec_sent:
+  friendly_name: "pfSense: Kbps/s in uscita"
+sensor.freebsd_router_bytes_received:
+  friendly_name: "pfSense: Byte ricevuti"
+sensor.freebsd_router_bytes_sent:
+  friendly_name: "pfSense: Byte inviati"  
+sensor.freebsd_router_packets_received:
+  friendly_name: "pfSense: Pacchetti ricevuti"
+sensor.freebsd_router_packets_sent:
+  friendly_name: "pfSense: Pacchetti inviati"
+sensor.freebsd_router_packets_sec_received:
+  friendly_name: "pfSense: Pacchetti/s ricevuti"
+sensor.freebsd_router_packets_sec_sent:
+  friendly_name: "pfSense: Pacchetti/s inviati"
 
 ######################################################################
-# # Customization: DNS
+# Customization: DNS
 ######################################################################
 
 sensor.ip_1:

diff --git a/history.yaml b/history.yaml
index a280c42c09b2c5afd04763053b9c9a5efd37a249..9fa3cf2e44756a0d319a4e8a0bbe59de574621f6 100644 (file)
--- a/history.yaml
+++ b/history.yaml
@@ -12,45 +12,8 @@ exclude:
     - sensor.date
     - sensor.time
     - sensor.time_date
-    # Mercedes Me
-    - 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_park_brake_status
-    - 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
-    - binary_sensor.ff590mr_window_rear_right
-    - binary_sensor.ff590mr_windows_closed
-    - lock.ff590mr_lock
-    - sensor.ff590mr_distance_since_reset
-    - sensor.ff590mr_distance_since_start
-    - sensor.ff590mr_door_front_left
-    - sensor.ff590mr_door_front_right
-    - sensor.ff590mr_door_rear_left
-    - sensor.ff590mr_door_rear_right
-    #- sensor.ff590mr_fuel_level
-    - sensor.ff590mr_liquid_consumption_reset
-    - sensor.ff590mr_liquid_consumption_start
-    - sensor.ff590mr_lock
-    #- sensor.ff590mr_odometer
-    - 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
-    - sensor.ff590mr_trunk
     # System
+    - sensor.home_assistant_current_version
     - sensor.ssl_certificate
     # Shelly
     - sensor.shelly1_status
@@ -78,10 +41,19 @@ exclude:
     - sensor.porta_casa_2_stato_link
     - sensor.pulsante_batteria
     - sensor.pulsante_stato_link
+    # pfSense
+    - sensor.freebsd_router_bytes_received
+    - sensor.freebsd_router_bytes_sent
+    - sensor.freebsd_router_packets_received
+    - sensor.freebsd_router_packets_sent
+    - sensor.freebsd_router_packets_sec_received
+    - sensor.freebsd_router_packets_sec_sent
   domains:
     - automation
     - group
     - input_boolean
     - input_datetime
+    - input_select
     - input_text
     - script
+    - switch

diff --git a/logbook.yaml b/logbook.yaml
index 8a8a5902c6fa5a0ff09a46fca1c235f69699fd06..e1822be939623d0c06cff3fb556a097b1132d5b0 100644 (file)
--- a/logbook.yaml
+++ b/logbook.yaml
@@ -12,45 +12,8 @@ exclude:
     - sensor.date
     - sensor.time
     - sensor.time_date
-    # Mercedes Me
-    - 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_park_brake_status
-    - 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
-    - binary_sensor.ff590mr_window_rear_right
-    - binary_sensor.ff590mr_windows_closed
-    - lock.ff590mr_lock
-    - sensor.ff590mr_distance_since_reset
-    - sensor.ff590mr_distance_since_start
-    - sensor.ff590mr_door_front_left
-    - sensor.ff590mr_door_front_right
-    - sensor.ff590mr_door_rear_left
-    - sensor.ff590mr_door_rear_right
-    #- sensor.ff590mr_fuel_level
-    - sensor.ff590mr_liquid_consumption_reset
-    - sensor.ff590mr_liquid_consumption_start
-    - sensor.ff590mr_lock
-    #- sensor.ff590mr_odometer
-    - 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
-    - sensor.ff590mr_trunk
     # System
+    - sensor.home_assistant_current_version
     - sensor.ssl_certificate
     # Shelly
     - sensor.shelly1_status
@@ -78,10 +41,19 @@ exclude:
     - sensor.porta_casa_2_stato_link
     - sensor.pulsante_batteria
     - sensor.pulsante_stato_link
+    # pfSense
+    - sensor.freebsd_router_bytes_received
+    - sensor.freebsd_router_bytes_sent
+    - sensor.freebsd_router_packets_received
+    - sensor.freebsd_router_packets_sent
+    - sensor.freebsd_router_packets_sec_received
+    - sensor.freebsd_router_packets_sec_sent
   domains:
     - automation
     - group
     - input_boolean
     - input_datetime
+    - input_select
     - input_text
     - script
+    - switch

diff --git a/packages/mercedes/binary_sensor.yaml b/packages/mercedes/binary_sensor.yaml
new file mode 100644 (file)
index 0000000..01f196a
--- /dev/null
+++ b/packages/mercedes/binary_sensor.yaml
@@ -0,0 +1,282 @@
+######################################################################
+# Mercedes Package - Binary Sensor
+######################################################################
+binary_sensor:
+
+######################################################################
+# Binary Sensor: Doors Lock
+######################################################################
+
+  - platform: template
+    sensors:
+      ff590mr_locked:
+        friendly_name: Vettura Bloccata
+        entity_id: lock.ff590mr_lock
+        value_template: >-
+          {{ not is_state('lock.ff590mr_lock', 'locked') }}
+        icon_template: >-
+          {% if is_state('lock.ff590mr_lock', 'locked') %}
+            mdi:lock
+          {% else %}
+            mdi:lock-open
+          {% endif %}
+        device_class: lock
+
+######################################################################
+# Binary Sensor: Doors Closed
+######################################################################
+
+  - platform: template
+    sensors:
+      ff590mr_doors_closed:
+        friendly_name: Porte
+        entity_id: sensor.ff590mr_lock
+        value_template: >-
+          {{ not is_state_attr('sensor.ff590mr_lock', 'doorsClosed', true) }}
+        icon_template: >-
+          {% if is_state_attr('sensor.ff590mr_lock', 'doorsClosed', true) %}
+            mdi:car-door
+          {% else %}
+            mdi:car-door
+          {% endif %}
+        device_class: opening
+
+######################################################################
+# Binary Sensor: Door Front Left
+######################################################################
+
+  - platform: template
+    sensors:
+      ff590mr_door_front_left:
+        friendly_name: Anteriore Sinistra
+        entity_id: sensor.ff590mr_lock
+        value_template: >-
+          {{ not (is_state_attr('sensor.ff590mr_lock', 'doorStateFrontLeft', 'DOOR_CLOSED_AND_DOOR_LOCKED') or
+                  is_state_attr('sensor.ff590mr_lock', 'doorStateFrontLeft', 'DOOR_CLOSED_AND_DOOR_UNLOCKED')) }}
+        icon_template: mdi:car-door
+        device_class: opening
+
+######################################################################
+# Binary Sensor: Door Front Right
+######################################################################
+
+  - platform: template
+    sensors:
+      ff590mr_door_front_right:
+        friendly_name: Anteriore Destra
+        entity_id: sensor.ff590mr_lock
+        value_template: >-
+          {{ not (is_state_attr('sensor.ff590mr_lock', 'doorStateFrontRight', 'DOOR_CLOSED_AND_DOOR_LOCKED') or
+                  is_state_attr('sensor.ff590mr_lock', 'doorStateFrontRight', 'DOOR_CLOSED_AND_DOOR_UNLOCKED')) }}
+        icon_template: mdi:car-door
+        device_class: opening
+
+######################################################################
+# Binary Sensor: Door Rear Left
+######################################################################
+
+  - platform: template
+    sensors:
+      ff590mr_door_rear_left:
+        friendly_name: Posteriore Sinistra
+        entity_id: sensor.ff590mr_lock
+        value_template: >-     
+          {{ not (is_state_attr('sensor.ff590mr_lock', 'doorStateRearLeft', 'DOOR_CLOSED_AND_DOOR_LOCKED') or
+                  is_state_attr('sensor.ff590mr_lock', 'doorStateRearLeft', 'DOOR_CLOSED_AND_DOOR_UNLOCKED')) }}
+        icon_template: mdi:car-door
+        device_class: opening
+
+######################################################################
+# Binary Sensor: Door Rear Right
+######################################################################
+
+  - platform: template
+    sensors:
+      ff590mr_door_rear_right:
+        friendly_name: Posteriore Destra
+        entity_id: sensor.ff590mr_lock
+        value_template: >-
+          {{ not (is_state_attr('sensor.ff590mr_lock', 'doorStateRearRight', 'DOOR_CLOSED_AND_DOOR_LOCKED') or
+                  is_state_attr('sensor.ff590mr_lock', 'doorStateRearRight', 'DOOR_CLOSED_AND_DOOR_UNLOCKED')) }}
+        icon_template: mdi:car-door
+        device_class: opening
+
+######################################################################
+# Binary Sensor: Trunk
+######################################################################
+
+  - platform: template
+    sensors:
+      ff590mr_trunk:
+        friendly_name: Bagagliaio
+        entity_id: sensor.ff590mr_lock
+        value_template: >-
+          {{ not (is_state_attr('sensor.ff590mr_lock', 'trunkStateRollup', 'CLOSED_AND_LOCKED') or
+                  is_state_attr('sensor.ff590mr_lock', 'trunkStateRollup', 'CLOSED_AND_UNLOCKED')) }}
+        icon_template: >-
+          {% if (is_state_attr('sensor.ff590mr_lock', 'trunkStateRollup', 'CLOSED_AND_LOCKED') or 
+                 is_state_attr('sensor.ff590mr_lock', 'trunkStateRollup', 'CLOSED_AND_UNLOCKED')) %}
+            mdi:lock
+          {% else %}
+            mdi:lock-open
+          {% endif %}
+        device_class: opening
+
+######################################################################
+# Binary Sensor: Fuel Lid
+######################################################################
+
+  - platform: template
+    sensors:
+      ff590mr_fuel_lid:
+        friendly_name: Serbatoio
+        entity_id: sensor.ff590mr_lock
+        value_template: >-
+          {{ not is_state_attr('sensor.ff590mr_lock', 'fuelLidClosed', true) }}
+        icon_template: >-
+          {% if is_state_attr('sensor.ff590mr_lock', 'fuelLidClosed', true) %}
+            mdi:gas-station
+          {% else %}
+            mdi:gas-station
+          {% endif %}
+        device_class: opening
+
+######################################################################
+# Binary Sensor: Windows Closed
+######################################################################
+
+  - platform: template
+    sensors:
+      ff590mr_windows_closed_2:
+        friendly_name: Finestrini
+        entity_id: binary_sensor.ff590mr_windows_closed
+        value_template: >-
+          {{ 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_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
+######################################################################
+
+  - platform: template
+    sensors:
+      ff590mr_window_front_left:
+        friendly_name: Anteriore Sinistro
+        entity_id: binary_sensor.ff590mr_windows_closed
+        value_template: >-
+          {{ not is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusfrontleft', 'CLOSED') }}
+        icon_template: >-
+          {% if is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusfrontleft', 'CLOSED') %}
+          mdi:window-closed
+          {% else %}
+            mdi:window-open
+          {% endif %}      
+        device_class: opening
+
+######################################################################
+# Binary Sensor: Window Front Right
+######################################################################
+
+  - platform: template
+    sensors:
+      ff590mr_window_front_right:
+        friendly_name: Anteriore Destro
+        entity_id: binary_sensor.ff590mr_windows_closed
+        value_template: >-
+          {{ not is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusfrontright', 'CLOSED') }}
+        icon_template: >-
+          {% if is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusfrontright', 'CLOSED') %}
+          mdi:window-closed
+          {% else %}
+            mdi:window-open
+          {% endif %}   
+        device_class: opening
+
+######################################################################
+# Binary Sensor: Window Rear Left
+######################################################################
+
+  - platform: template
+    sensors:
+      ff590mr_window_rear_left:
+        friendly_name: Posteriore Sinistro
+        entity_id: binary_sensor.ff590mr_windows_closed
+        value_template: >-
+          {{ not is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusrearleft', 'CLOSED') }}
+        icon_template: >-
+          {% if is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusrearleft', 'CLOSED') %}
+          mdi:window-closed
+          {% else %}
+            mdi:window-open
+          {% endif %}   
+        device_class: opening
+
+######################################################################
+# Binary Sensor: Window Rear Right
+######################################################################
+
+  - platform: template
+    sensors:
+      ff590mr_window_rear_right:
+        friendly_name: Posteriore Destro
+        entity_id: binary_sensor.ff590mr_windows_closed
+        value_template: >-
+          {{ not is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusrearright', 'CLOSED') }}
+        icon_template: >-
+          {% if is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusrearright', 'CLOSED') %}
+          mdi:window-closed
+          {% else %}
+            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
new file mode 100644 (file)
index 0000000..6735608
--- /dev/null
+++ b/packages/mercedes/customizations.yaml
@@ -0,0 +1,50 @@
+######################################################################
+# Mercedes Package - Customizations
+######################################################################
+
+homeassistant:
+  customize:
+    # Binary Sensors
+    binary_sensor.ff590mr_engine_light_warning:
+      friendly_name: Stato Generale
+      device_class: problem
+      icon: mdi:hazard-lights
+      # warningbrakefluid, warningwashwater, warningcoolantlevellow, warninglowbattery
+    binary_sensor.ff590mr_park_brake_status:
+      friendly_name: Freno a mano
+      device_class: plug
+      icon: mdi:car-brake-parking
+      # preWarningBrakeLiningWear
+    binary_sensor.ff590mr_tire_warning:
+      friendly_name: Allarme Pneumatici
+      device_class: problem
+      icon: mdi:car-tire-alert
+      # tirepressureRearLeft, tirepressureRearRight, tirepressureFrontRight, tirepressureFrontLeft, 
+      # tirewarningsrdk, tirewarningsprwtireMarkerFrontRight, tireMarkerFrontLeft, tireMarkerRearLeft, tireMarkerRearRight, 
+      # tireWarningRollup, lastTirepressureTimestamp
+    binary_sensor.ff590mr_windows_closed:
+      friendly_name: Finestrini
+      device_class: opening
+      icon: mdi:window-closed
+      # windowstatusrearleft, windowstatusrearright, windowstatusfrontright, windowstatusfrontleft
+
+    # Lock
+    lock.ff590mr_lock:
+      friendly_name: Blocco Sblocco 
+      icon: mdi:lock-open
+      
+    # Sensors
+    sensor.ff590mr_fuel_level:
+      friendly_name: Livello Carburante
+      icon: mdi:gas-station
+    sensor.ff590mr_lock:
+      friendly_name: Veicolo
+      icon: mdi:lock-open
+      # doorStateFrontLeft, doorStateFrontRight, doorStateRearLeft, doorStateRearRight, 
+      # frontLeftDoorLocked, frontRightDoorLocked, rearLeftDoorLocked, rearRightDoorLocked, 
+      # frontLeftDoorClosed, frontRightDoorClosed, rearLeftDoorClosed, rearRightDoorClosed, 
+      # doorsClosed, trunkStateRollup, sunroofstatus
+    sensor.ff590mr_odometer:
+      friendly_name: Km Percorsi
+      icon: mdi:road-variant
+      # distanceReset, distanceStart, liquidconsumptionstart, liquidconsumptionreset, liquidRangeSkipIndication, serviceintervaldays, tanklevelpercent, tankReserveLamp

diff --git a/packages/mercedes/log.yaml b/packages/mercedes/log.yaml
new file mode 100644 (file)
index 0000000..2b66056
--- /dev/null
+++ b/packages/mercedes/log.yaml
@@ -0,0 +1,138 @@
+######################################################################\r
+# Mercedes Package - Log\r
+######################################################################\r
+\r
+######################################################################\r
+# History\r
+######################################################################\r
+history:\r
+  exclude:\r
+    entities:\r
+    # Mercedes Me\r
+    - binary_sensor.ff590mr_door_front_left\r
+    - binary_sensor.ff590mr_door_front_right\r
+    - binary_sensor.ff590mr_door_rear_left\r
+    - binary_sensor.ff590mr_door_rear_right\r
+    #- binary_sensor.ff590mr_doors_closed\r
+    - binary_sensor.ff590mr_engine_light_warning\r
+    #- binary_sensor.ff590mr_locked\r
+    - binary_sensor.ff590mr_park_brake_status\r
+    - binary_sensor.ff590mr_tire_warning\r
+    - binary_sensor.ff590mr_trunk\r
+    - binary_sensor.ff590mr_fuel_lid\r
+    #- binary_sensor.ff590mr_warning_brakefluid\r
+    #- binary_sensor.ff590mr_warning_coolantlevellow\r
+    #- binary_sensor.ff590mr_warning_washwater\r
+    - binary_sensor.ff590mr_window_front_left\r
+    - binary_sensor.ff590mr_window_front_right\r
+    - binary_sensor.ff590mr_window_rear_left\r
+    - binary_sensor.ff590mr_window_rear_right\r
+    - binary_sensor.ff590mr_windows_closed\r
+    - lock.ff590mr_lock\r
+    - sensor.ff590mr_distance_since_reset\r
+    - sensor.ff590mr_distance_since_start\r
+    - sensor.ff590mr_door_front_left\r
+    - sensor.ff590mr_door_front_right\r
+    - sensor.ff590mr_door_rear_left\r
+    - sensor.ff590mr_door_rear_right\r
+    #- sensor.ff590mr_fuel_level\r
+    - sensor.ff590mr_liquid_consumption_reset\r
+    - sensor.ff590mr_liquid_consumption_start\r
+    - sensor.ff590mr_lock\r
+    #- sensor.ff590mr_odometer\r
+    - sensor.ff590mr_service_interval_days\r
+    - sensor.ff590mr_tire_pressure_front_left\r
+    - sensor.ff590mr_tire_pressure_front_right\r
+    - sensor.ff590mr_tire_pressure_rear_left\r
+    - sensor.ff590mr_tire_pressure_rear_right\r
+    - sensor.ff590mr_trunk\r
+\r
+######################################################################\r
+# Logbook\r
+######################################################################\r
+logbook:\r
+  exclude:\r
+    entities:\r
+    # Mercedes Me\r
+    - binary_sensor.ff590mr_door_front_left\r
+    - binary_sensor.ff590mr_door_front_right\r
+    - binary_sensor.ff590mr_door_rear_left\r
+    - binary_sensor.ff590mr_door_rear_right\r
+    #- binary_sensor.ff590mr_doors_closed\r
+    - binary_sensor.ff590mr_engine_light_warning\r
+    #- binary_sensor.ff590mr_locked\r
+    - binary_sensor.ff590mr_park_brake_status\r
+    - binary_sensor.ff590mr_tire_warning\r
+    - binary_sensor.ff590mr_trunk\r
+    - binary_sensor.ff590mr_fuel_lid\r
+    #- binary_sensor.ff590mr_warning_brakefluid\r
+    #- binary_sensor.ff590mr_warning_coolantlevellow\r
+    #- binary_sensor.ff590mr_warning_washwater\r
+    - binary_sensor.ff590mr_window_front_left\r
+    - binary_sensor.ff590mr_window_front_right\r
+    - binary_sensor.ff590mr_window_rear_left\r
+    - binary_sensor.ff590mr_window_rear_right\r
+    - binary_sensor.ff590mr_windows_closed\r
+    - lock.ff590mr_lock\r
+    - sensor.ff590mr_distance_since_reset\r
+    - sensor.ff590mr_distance_since_start\r
+    - sensor.ff590mr_door_front_left\r
+    - sensor.ff590mr_door_front_right\r
+    - sensor.ff590mr_door_rear_left\r
+    - sensor.ff590mr_door_rear_right\r
+    #- sensor.ff590mr_fuel_level\r
+    - sensor.ff590mr_liquid_consumption_reset\r
+    - sensor.ff590mr_liquid_consumption_start\r
+    - sensor.ff590mr_lock\r
+    #- sensor.ff590mr_odometer\r
+    - sensor.ff590mr_service_interval_days\r
+    - sensor.ff590mr_tire_pressure_front_left\r
+    - sensor.ff590mr_tire_pressure_front_right\r
+    - sensor.ff590mr_tire_pressure_rear_left\r
+    - sensor.ff590mr_tire_pressure_rear_right\r
+    - sensor.ff590mr_trunk\r
+\r
+######################################################################\r
+# Recorder\r
+######################################################################\r
+recorder:\r
+  exclude:\r
+    entities:\r
+    # Mercedes Me\r
+    - binary_sensor.ff590mr_door_front_left\r
+    - binary_sensor.ff590mr_door_front_right\r
+    - binary_sensor.ff590mr_door_rear_left\r
+    - binary_sensor.ff590mr_door_rear_right\r
+    #- binary_sensor.ff590mr_doors_closed\r
+    - binary_sensor.ff590mr_engine_light_warning\r
+    #- binary_sensor.ff590mr_locked\r
+    - binary_sensor.ff590mr_park_brake_status\r
+    - binary_sensor.ff590mr_tire_warning\r
+    - binary_sensor.ff590mr_trunk\r
+    - binary_sensor.ff590mr_fuel_lid\r
+    #- binary_sensor.ff590mr_warning_brakefluid\r
+    #- binary_sensor.ff590mr_warning_coolantlevellow\r
+    #- binary_sensor.ff590mr_warning_washwater\r
+    - binary_sensor.ff590mr_window_front_left\r
+    - binary_sensor.ff590mr_window_front_right\r
+    - binary_sensor.ff590mr_window_rear_left\r
+    - binary_sensor.ff590mr_window_rear_right\r
+    - binary_sensor.ff590mr_windows_closed\r
+    - lock.ff590mr_lock\r
+    - sensor.ff590mr_distance_since_reset\r
+    - sensor.ff590mr_distance_since_start\r
+    - sensor.ff590mr_door_front_left\r
+    - sensor.ff590mr_door_front_right\r
+    - sensor.ff590mr_door_rear_left\r
+    - sensor.ff590mr_door_rear_right\r
+    #- sensor.ff590mr_fuel_level\r
+    - sensor.ff590mr_liquid_consumption_reset\r
+    - sensor.ff590mr_liquid_consumption_start\r
+    - sensor.ff590mr_lock\r
+    #- sensor.ff590mr_odometer\r
+    - sensor.ff590mr_service_interval_days\r
+    - sensor.ff590mr_tire_pressure_front_left\r
+    - sensor.ff590mr_tire_pressure_front_right\r
+    - sensor.ff590mr_tire_pressure_rear_left\r
+    - sensor.ff590mr_tire_pressure_rear_right\r
+    - sensor.ff590mr_trunk\r

diff --git a/packages/mercedes/sensor.yaml b/packages/mercedes/sensor.yaml
new file mode 100644 (file)
index 0000000..4bfa93d
--- /dev/null
+++ b/packages/mercedes/sensor.yaml
@@ -0,0 +1,220 @@
+######################################################################
+# Mercedes Package - Sensor
+######################################################################
+sensor:
+
+######################################################################
+# Sensor: Tire Pressure Front Left
+######################################################################
+
+  - platform: template
+    sensors:
+      ff590mr_tire_pressure_front_left:
+        friendly_name: Anteriore Sinistra
+        entity_id: sensor.ff590mr_lock
+        unit_of_measurement: 'kPa'
+        value_template: "{{ state_attr('binary_sensor.ff590mr_tire_warning', 'tirepressureFrontLeft') }}"
+        icon_template: mdi:car-tire-alert
+        device_class: pressure
+      
+######################################################################
+# Sensor: Tire Pressure Front Right
+######################################################################
+
+  - platform: template
+    sensors:
+      ff590mr_tire_pressure_front_right:
+        friendly_name: Anteriore Destra
+        entity_id: sensor.ff590mr_lock
+        unit_of_measurement: 'kPa'
+        value_template: "{{ state_attr('binary_sensor.ff590mr_tire_warning', 'tirepressureFrontRight') }}"
+        icon_template: mdi:car-tire-alert
+        device_class: pressure
+      
+######################################################################
+# Sensor: Tire Pressure Rear Left
+######################################################################
+
+  - platform: template
+    sensors:
+      ff590mr_tire_pressure_rear_left:
+        friendly_name: Posteriore Sinistra
+        entity_id: sensor.ff590mr_lock
+        unit_of_measurement: 'kPa'
+        value_template: "{{ state_attr('binary_sensor.ff590mr_tire_warning', 'tirepressureRearLeft') }}"
+        icon_template: mdi:car-tire-alert
+        device_class: pressure
+
+######################################################################
+# Sensor: Tire Pressure Rear Right
+######################################################################
+
+  - platform: template
+    sensors:
+      ff590mr_tire_pressure_rear_right:
+        friendly_name: Posteriore Destra
+        entity_id: sensor.ff590mr_lock
+        unit_of_measurement: 'kPa'
+        value_template: "{{ state_attr('binary_sensor.ff590mr_tire_warning', 'tirepressureRearRight') }}"
+        icon_template: mdi:car-tire-alert
+        device_class: pressure
+
+######################################################################
+# Sensor: Door Front Left
+######################################################################
+
+#- platform: template
+#  sensors:
+#    ff590mr_door_front_left:
+#      friendly_name: Anteriore Sinistra
+#      entity_id: sensor.ff590mr_lock
+#      value_template: >-
+#        {% if is_state_attr('sensor.ff590mr_lock', 'doorStateFrontLeft', 'DOOR_CLOSED_AND_DOOR_LOCKED') %}
+#          Chiusa e Bloccata
+#        {% elif is_state_attr('sensor.ff590mr_lock', 'doorStateFrontLeft', 'DOOR_CLOSED_AND_DOOR_UNLOCKED') %}
+#          Chiuse
+#        {% else %}
+#          Aperta
+#        {% endif %}
+#      icon_template: mdi:car-door
+
+######################################################################
+# Sensor: Door Front Right
+######################################################################
+
+#- platform: template
+#  sensors:
+#    ff590mr_door_front_right:
+#      friendly_name: Anteriore Destra
+#      entity_id: sensor.ff590mr_lock
+#      value_template: >-
+#        {% if is_state_attr('sensor.ff590mr_lock', 'doorStateFrontRight', 'DOOR_CLOSED_AND_DOOR_LOCKED') %}
+#          Chiusa e Bloccata
+#        {% elif is_state_attr('sensor.ff590mr_lock', 'doorStateFrontRight', 'DOOR_CLOSED_AND_DOOR_UNLOCKED') %}
+#          Chiuse
+#        {% else %}
+#          Aperta
+#        {% endif %}
+#      icon_template: mdi:car-door
+
+######################################################################
+# Sensor: Door Rear Left
+######################################################################
+
+#- platform: template
+#  sensors:
+#    ff590mr_door_rear_left:
+#      friendly_name: Posteriore Sinistra
+#      entity_id: sensor.ff590mr_lock
+#      value_template: >-
+#        {% if is_state_attr('sensor.ff590mr_lock', 'doorStateRearLeft', 'DOOR_CLOSED_AND_DOOR_LOCKED') %}
+#          Chiusa e Bloccata
+#        {% elif is_state_attr('sensor.ff590mr_lock', 'doorStateRearLeft', 'DOOR_CLOSED_AND_DOOR_UNLOCKED') %}
+#          Chiuse
+#        {% else %}
+#          Aperta
+#        {% endif %}
+#      icon_template: mdi:car-door
+
+######################################################################
+# Sensor: Door Rear Right
+######################################################################
+
+#- platform: template
+#  sensors:
+#    ff590mr_door_rear_right:
+#      friendly_name: Posteriore Destra
+#      entity_id: sensor.ff590mr_lock
+#      value_template: >-
+#        {% if is_state_attr('sensor.ff590mr_lock', 'doorStateRearRight', 'DOOR_CLOSED_AND_DOOR_LOCKED') %}
+#          Chiusa e Bloccata
+#        {% elif is_state_attr('sensor.ff590mr_lock', 'doorStateRearRight', 'DOOR_CLOSED_AND_DOOR_UNLOCKED') %}
+#          Chiuse
+#        {% else %}
+#          Aperta
+#        {% endif %}
+#      icon_template: mdi:car-door
+
+######################################################################
+# Sensor: Trunk
+######################################################################
+
+#- platform: template
+#  sensors:
+#    ff590mr_trunk:
+#      friendly_name: Bagagliaio
+#      entity_id: sensor.ff590mr_lock
+#      value_template: >-
+#        {% if is_state_attr('sensor.ff590mr_lock', 'trunkStateRollup', 'CLOSED_AND_LOCKED') %}
+#          Chiuso e Bloccato
+#        {% elif is_state_attr('sensor.ff590mr_lock', 'trunkStateRollup', 'CLOSED_AND_UNLOCKED') %}
+#          Chiuso
+#        {% else %}
+#          Aperto
+#        {% endif %}
+#      icon_template: mdi:car-door
+
+######################################################################
+# Sensor: Distance from Start
+######################################################################
+
+  - platform: template
+    sensors:
+      ff590mr_distance_since_start:
+        friendly_name: Distanza dalla partenza
+        entity_id: sensor.ff590mr_odometer
+        unit_of_measurement: 'Km'
+        value_template: "{{ state_attr('sensor.ff590mr_odometer', 'distanceStart') }}"
+        icon_template: mdi:road-variant
+
+######################################################################
+# Sensor: Distance from Reset
+######################################################################
+
+  - platform: template
+    sensors:
+      ff590mr_distance_since_reset:
+        friendly_name: Distanza dal reset
+        entity_id: sensor.ff590mr_odometer
+        unit_of_measurement: 'Km'
+        value_template: "{{ state_attr('sensor.ff590mr_odometer', 'distanceReset') }}"
+        icon_template: mdi:road-variant
+
+######################################################################
+# Sensor: Liquid Consumption from Start
+######################################################################
+
+  - platform: template
+    sensors:
+      ff590mr_liquid_consumption_start:
+        friendly_name: Consumo dalla partenza
+        entity_id: sensor.ff590mr_odometer
+        unit_of_measurement: 'l/100Km'
+        value_template: "{{ state_attr('sensor.ff590mr_odometer', 'liquidconsumptionstart') }}"
+        icon_template: mdi:gas-station
+
+######################################################################
+# Sensor: Liquid Consumption from Reset
+######################################################################
+
+  - platform: template
+    sensors:
+      ff590mr_liquid_consumption_reset:
+        friendly_name: Consumo dal reset
+        entity_id: sensor.ff590mr_odometer
+        unit_of_measurement: 'l/100Km'
+        value_template: "{{ state_attr('sensor.ff590mr_odometer', 'liquidconsumptionreset') }}"
+        icon_template: mdi:gas-station
+
+######################################################################
+# Sensor: Service Interval Days
+######################################################################
+
+  - platform: template
+    sensors:
+      ff590mr_service_interval_days:
+        friendly_name: Prossimo Tagliando
+        entity_id: sensor.ff590mr_odometer
+        unit_of_measurement: 'giorni'
+        value_template: "{{ state_attr('sensor.ff590mr_odometer', 'serviceintervaldays') }}"
+        icon_template: mdi:wrench

diff --git a/packages/mercedes/switch.yaml b/packages/mercedes/switch.yaml
new file mode 100644 (file)
index 0000000..eed88f5
--- /dev/null
+++ b/packages/mercedes/switch.yaml
@@ -0,0 +1,23 @@
+######################################################################
+# Mercedes Package - Switch
+######################################################################
+
+switch:
+  - platform: template
+    switches:
+      ff590mr_lock:
+        friendly_name: Blocco Auto
+        entity_id: lock.ff590mr_lock
+        value_template: "{{ is_state('lock.ff590mr_lock', 'locked') }}"
+        turn_on:
+          - service: lock.lock
+            entity_id: lock.ff590mr_lock
+        turn_off:
+        - service: lock.unlock
+          entity_id: lock.ff590mr_lock      
+        icon_template: >-
+          {% if is_state('lock.ff590mr_lock', 'locked') %}
+            mdi:lock
+          {% else %}
+            mdi:lock-open
+          {% endif %}

diff --git a/recorder.yaml b/recorder.yaml
index 0f5b138c7f1ac20faf8950f8e96183910ec8db8e..8840e6aebd08eb397bfe57fd1d5329e9d2178573 100644 (file)
--- a/recorder.yaml
+++ b/recorder.yaml
@@ -14,45 +14,8 @@ exclude:
     - sensor.date
     - sensor.time
     - sensor.time_date
-    # Mercedes Me
-    - 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_park_brake_status
-    - 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
-    - binary_sensor.ff590mr_window_rear_right
-    - binary_sensor.ff590mr_windows_closed
-    - lock.ff590mr_lock
-    - sensor.ff590mr_distance_since_reset
-    - sensor.ff590mr_distance_since_start
-    - sensor.ff590mr_door_front_left
-    - sensor.ff590mr_door_front_right
-    - sensor.ff590mr_door_rear_left
-    - sensor.ff590mr_door_rear_right
-    #- sensor.ff590mr_fuel_level
-    - sensor.ff590mr_liquid_consumption_reset
-    - sensor.ff590mr_liquid_consumption_start
-    - sensor.ff590mr_lock
-    #- sensor.ff590mr_odometer
-    - 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
-    - sensor.ff590mr_trunk
     # System
+    - sensor.home_assistant_current_version
     - sensor.ssl_certificate
     # Shelly
     - sensor.shelly1_status
@@ -80,10 +43,19 @@ exclude:
     - sensor.porta_casa_2_stato_link
     - sensor.pulsante_batteria
     - sensor.pulsante_stato_link
+    # pfSense
+    - sensor.freebsd_router_bytes_received
+    - sensor.freebsd_router_bytes_sent
+    - sensor.freebsd_router_packets_received
+    - sensor.freebsd_router_packets_sent
+    - sensor.freebsd_router_packets_sec_received
+    - sensor.freebsd_router_packets_sec_sent
   domains:
     - automation
     - group
     - input_boolean
     - input_datetime
+    - input_select
     - input_text
     - script
+    - switch

diff --git a/sensor/car.yaml b/sensor/car.yaml
deleted file mode 100644 (file)
index ca3f6a1..0000000
--- a/sensor/car.yaml
+++ /dev/null
@@ -1,215 +0,0 @@
-######################################################################
-# Sensor: Tire Pressure Front Left
-######################################################################
-
-- platform: template
-  sensors:
-    ff590mr_tire_pressure_front_left:
-      friendly_name: Anteriore Sinistra
-      entity_id: sensor.ff590mr_lock
-      unit_of_measurement: 'kPa'
-      value_template: "{{ state_attr('binary_sensor.ff590mr_tire_warning', 'tirepressureFrontLeft') }}"
-      icon_template: mdi:car-tire-alert
-      device_class: pressure
-      
-######################################################################
-# Sensor: Tire Pressure Front Right
-######################################################################
-
-- platform: template
-  sensors:
-    ff590mr_tire_pressure_front_right:
-      friendly_name: Anteriore Destra
-      entity_id: sensor.ff590mr_lock
-      unit_of_measurement: 'kPa'
-      value_template: "{{ state_attr('binary_sensor.ff590mr_tire_warning', 'tirepressureFrontRight') }}"
-      icon_template: mdi:car-tire-alert
-      device_class: pressure
-      
-######################################################################
-# Sensor: Tire Pressure Rear Left
-######################################################################
-
-- platform: template
-  sensors:
-    ff590mr_tire_pressure_rear_left:
-      friendly_name: Posteriore Sinistra
-      entity_id: sensor.ff590mr_lock
-      unit_of_measurement: 'kPa'
-      value_template: "{{ state_attr('binary_sensor.ff590mr_tire_warning', 'tirepressureRearLeft') }}"
-      icon_template: mdi:car-tire-alert
-      device_class: pressure
-
-######################################################################
-# Sensor: Tire Pressure Rear Right
-######################################################################
-
-- platform: template
-  sensors:
-    ff590mr_tire_pressure_rear_right:
-      friendly_name: Posteriore Destra
-      entity_id: sensor.ff590mr_lock
-      unit_of_measurement: 'kPa'
-      value_template: "{{ state_attr('binary_sensor.ff590mr_tire_warning', 'tirepressureRearRight') }}"
-      icon_template: mdi:car-tire-alert
-      device_class: pressure
-
-######################################################################
-# Sensor: Door Front Left
-######################################################################
-
-#- platform: template
-#  sensors:
-#    ff590mr_door_front_left:
-#      friendly_name: Anteriore Sinistra
-#      entity_id: sensor.ff590mr_lock
-#      value_template: >-
-#        {% if is_state_attr('sensor.ff590mr_lock', 'doorStateFrontLeft', 'DOOR_CLOSED_AND_DOOR_LOCKED') %}
-#          Chiusa e Bloccata
-#        {% elif is_state_attr('sensor.ff590mr_lock', 'doorStateFrontLeft', 'DOOR_CLOSED_AND_DOOR_UNLOCKED') %}
-#          Chiuse
-#        {% else %}
-#          Aperta
-#        {% endif %}
-#      icon_template: mdi:car-door
-
-######################################################################
-# Sensor: Door Front Right
-######################################################################
-
-#- platform: template
-#  sensors:
-#    ff590mr_door_front_right:
-#      friendly_name: Anteriore Destra
-#      entity_id: sensor.ff590mr_lock
-#      value_template: >-
-#        {% if is_state_attr('sensor.ff590mr_lock', 'doorStateFrontRight', 'DOOR_CLOSED_AND_DOOR_LOCKED') %}
-#          Chiusa e Bloccata
-#        {% elif is_state_attr('sensor.ff590mr_lock', 'doorStateFrontRight', 'DOOR_CLOSED_AND_DOOR_UNLOCKED') %}
-#          Chiuse
-#        {% else %}
-#          Aperta
-#        {% endif %}
-#      icon_template: mdi:car-door
-
-######################################################################
-# Sensor: Door Rear Left
-######################################################################
-
-#- platform: template
-#  sensors:
-#    ff590mr_door_rear_left:
-#      friendly_name: Posteriore Sinistra
-#      entity_id: sensor.ff590mr_lock
-#      value_template: >-
-#        {% if is_state_attr('sensor.ff590mr_lock', 'doorStateRearLeft', 'DOOR_CLOSED_AND_DOOR_LOCKED') %}
-#          Chiusa e Bloccata
-#        {% elif is_state_attr('sensor.ff590mr_lock', 'doorStateRearLeft', 'DOOR_CLOSED_AND_DOOR_UNLOCKED') %}
-#          Chiuse
-#        {% else %}
-#          Aperta
-#        {% endif %}
-#      icon_template: mdi:car-door
-
-######################################################################
-# Sensor: Door Rear Right
-######################################################################
-
-#- platform: template
-#  sensors:
-#    ff590mr_door_rear_right:
-#      friendly_name: Posteriore Destra
-#      entity_id: sensor.ff590mr_lock
-#      value_template: >-
-#        {% if is_state_attr('sensor.ff590mr_lock', 'doorStateRearRight', 'DOOR_CLOSED_AND_DOOR_LOCKED') %}
-#          Chiusa e Bloccata
-#        {% elif is_state_attr('sensor.ff590mr_lock', 'doorStateRearRight', 'DOOR_CLOSED_AND_DOOR_UNLOCKED') %}
-#          Chiuse
-#        {% else %}
-#          Aperta
-#        {% endif %}
-#      icon_template: mdi:car-door
-
-######################################################################
-# Sensor: Trunk
-######################################################################
-
-#- platform: template
-#  sensors:
-#    ff590mr_trunk:
-#      friendly_name: Bagagliaio
-#      entity_id: sensor.ff590mr_lock
-#      value_template: >-
-#        {% if is_state_attr('sensor.ff590mr_lock', 'trunkStateRollup', 'CLOSED_AND_LOCKED') %}
-#          Chiuso e Bloccato
-#        {% elif is_state_attr('sensor.ff590mr_lock', 'trunkStateRollup', 'CLOSED_AND_UNLOCKED') %}
-#          Chiuso
-#        {% else %}
-#          Aperto
-#        {% endif %}
-#      icon_template: mdi:car-door
-
-######################################################################
-# Sensor: Distance from Start
-######################################################################
-
-- platform: template
-  sensors:
-    ff590mr_distance_since_start:
-      friendly_name: Distanza dalla partenza
-      entity_id: sensor.ff590mr_odometer
-      unit_of_measurement: 'Km'
-      value_template: "{{ state_attr('sensor.ff590mr_odometer', 'distanceStart') }}"
-      icon_template: mdi:road-variant
-
-######################################################################
-# Sensor: Distance from Reset
-######################################################################
-
-- platform: template
-  sensors:
-    ff590mr_distance_since_reset:
-      friendly_name: Distanza dal reset
-      entity_id: sensor.ff590mr_odometer
-      unit_of_measurement: 'Km'
-      value_template: "{{ state_attr('sensor.ff590mr_odometer', 'distanceReset') }}"
-      icon_template: mdi:road-variant
-
-######################################################################
-# Sensor: Liquid Consumption from Start
-######################################################################
-
-- platform: template
-  sensors:
-    ff590mr_liquid_consumption_start:
-      friendly_name: Consumo dalla partenza
-      entity_id: sensor.ff590mr_odometer
-      unit_of_measurement: 'l/100Km'
-      value_template: "{{ state_attr('sensor.ff590mr_odometer', 'liquidconsumptionstart') }}"
-      icon_template: mdi:gas-station
-
-######################################################################
-# Sensor: Liquid Consumption from Reset
-######################################################################
-
-- platform: template
-  sensors:
-    ff590mr_liquid_consumption_reset:
-      friendly_name: Consumo dal reset
-      entity_id: sensor.ff590mr_odometer
-      unit_of_measurement: 'l/100Km'
-      value_template: "{{ state_attr('sensor.ff590mr_odometer', 'liquidconsumptionreset') }}"
-      icon_template: mdi:gas-station
-
-######################################################################
-# Sensor: Service Interval Days
-######################################################################
-
-- platform: template
-  sensors:
-    ff590mr_service_interval_days:
-      friendly_name: Prossimo Tagliando
-      entity_id: sensor.ff590mr_odometer
-      unit_of_measurement: 'giorni'
-      value_template: "{{ state_attr('sensor.ff590mr_odometer', 'serviceintervaldays') }}"
-      icon_template: mdi:wrench

diff --git a/switch/car.yaml b/switch/car.yaml
deleted file mode 100644 (file)
index 953aa35..0000000
--- a/switch/car.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-######################################################################
-# Switch: Lock
-######################################################################
-
-- platform: template
-  switches:
-    ff590mr_lock:
-      friendly_name: Blocco Auto
-      entity_id: lock.ff590mr_lock
-      value_template: "{{ is_state('lock.ff590mr_lock', 'locked') }}"
-      turn_on:
-        - service: lock.lock
-          entity_id: lock.ff590mr_lock
-      turn_off:
-      - service: lock.unlock
-        entity_id: lock.ff590mr_lock      
-      icon_template: >-
-        {% if is_state('lock.ff590mr_lock', 'locked') %}
-          mdi:lock
-        {% else %}
-          mdi:lock-open
-        {% endif %}