From 16e117aee9ce2c0aa0ef21c25d9f33d020d60c83 Mon Sep 17 00:00:00 2001
From: Giorgio Ravera <giorgio.ravera@gmail.com>
Date: Sun, 7 Dec 2025 00:58:49 +0100
Subject: [PATCH] Minor fixes to sensor template

---
 packages/alarm/alarm_engine.yaml        | 2 +-
 packages/guard_mode.yaml                | 3 +--
 packages/mercedes/mercedes_log.yaml     | 4 ++++
 packages/mercedes/mercedes_windows.yaml | 8 ++++----
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/alarm/alarm_engine.yaml b/packages/alarm/alarm_engine.yaml
index 6201d2f4..bfa9f1be 100644
--- a/packages/alarm/alarm_engine.yaml
+++ b/packages/alarm/alarm_engine.yaml
@@ -7,7 +7,7 @@ template:
       - name: "alarms"
         unique_id: alarms
         state: "{{ is_state('group.alarms', 'on') }}"
-        device_class: safety
+        device_class: problem
         icon: >
           {% if is_state('group.alarms', 'on') %}
             mdi:alarm-light
diff --git a/packages/guard_mode.yaml b/packages/guard_mode.yaml
index eefe653d..333908c6 100644
--- a/packages/guard_mode.yaml
+++ b/packages/guard_mode.yaml
@@ -36,8 +36,7 @@ template:
   - binary_sensor:
       - name: "guard_mode"
         unique_id: guard_mode
-        state: "{{ is_state('input_boolean.guard_mode', 'off') }}"
-        device_class: safety
+        state: "{{ is_state('input_boolean.guard_mode', 'on') }}"
         icon: >
           {% if is_state('input_boolean.guard_mode', 'on') %}
             mdi:shield-home
diff --git a/packages/mercedes/mercedes_log.yaml b/packages/mercedes/mercedes_log.yaml
index 09a79864..eefc5c4b 100644
--- a/packages/mercedes/mercedes_log.yaml
+++ b/packages/mercedes/mercedes_log.yaml
@@ -27,8 +27,10 @@ logbook:
       #- lock.ff590mr_lock_no_pin
       - sensor.ff590mr_car
       - sensor.ff590mr_charging_power
+      - sensor.ff590mr_data_mode
       - sensor.ff590mr_distance_reset
       - sensor.ff590mr_distance_start
+      - sensor.ff590mr_end_of_charge
       - sensor.ff590mr_fuel_level
       - sensor.ff590mr_geofencing_violation
       - sensor.ff590mr_ignition_state
@@ -73,8 +75,10 @@ recorder:
       #- lock.ff590mr_lock_no_pin
       - sensor.ff590mr_car
       - sensor.ff590mr_charging_power
+      - sensor.ff590mr_data_mode
       - sensor.ff590mr_distance_reset
       - sensor.ff590mr_distance_start
+      - sensor.ff590mr_end_of_charge
       - sensor.ff590mr_fuel_level
       - sensor.ff590mr_geofencing_violation
       - sensor.ff590mr_ignition_state
diff --git a/packages/mercedes/mercedes_windows.yaml b/packages/mercedes/mercedes_windows.yaml
index 34ab676c..dadcef14 100644
--- a/packages/mercedes/mercedes_windows.yaml
+++ b/packages/mercedes/mercedes_windows.yaml
@@ -28,7 +28,7 @@ template:
         state: "{{ is_state('binary_sensor.windowstatusfrontleft', 'on') }}"
         device_class: opening
         icon: >
-          {% if is_state('binary_sensor.windowstatusfrontleft', 'on') %}
+          {% if not is_state('binary_sensor.windowstatusfrontleft', 'on') %}
             mdi:window-closed
           {% else %}
             mdi:window-open
@@ -43,7 +43,7 @@ template:
         state: "{{ is_state('binary_sensor.windowstatusfrontright', 'on') }}"
         device_class: opening
         icon: >
-          {% if is_state('binary_sensor.windowstatusfrontright', 'on') %}
+          {% if not is_state('binary_sensor.windowstatusfrontright', 'on') %}
             mdi:window-closed
           {% else %}
             mdi:window-open
@@ -58,7 +58,7 @@ template:
         state: "{{ is_state('binary_sensor.windowstatusrearleft', 'on') }}"
         device_class: opening
         icon: >
-          {% if is_state('binary_sensor.windowstatusrearleft', 'on') %}
+          {% if not is_state('binary_sensor.windowstatusrearleft', 'on') %}
             mdi:window-closed
           {% else %}
             mdi:window-open
@@ -73,7 +73,7 @@ template:
         state: "{{ is_state('binary_sensor.windowstatusrearright', 'on') }}"
         device_class: opening
         icon: >
-          {% if is_state('binary_sensor.windowstatusrearright', 'on') %}
+          {% if not is_state('binary_sensor.windowstatusrearright', 'on') %}
             mdi:window-closed
           {% else %}
             mdi:window-open
-- 
2.47.3