From e6b0f2008152d296754c22d05a089f39ab323abd Mon Sep 17 00:00:00 2001 From: Giorgio Ravera Date: Fri, 1 Jan 2021 21:18:34 +0100 Subject: [PATCH] Modification in lovelace due to new mercedes integration & netatmo improvements --- .storage/lovelace | 220 ++++++++++++++----------- packages/mercedes/mercedes_log.yaml | 2 + packages/mercedes/mercedes_sensor.yaml | 90 ---------- 3 files changed, 127 insertions(+), 185 deletions(-) diff --git a/.storage/lovelace b/.storage/lovelace index ed6c350b..4c74282b 100644 --- a/.storage/lovelace +++ b/.storage/lovelace @@ -6,6 +6,9 @@ "title": "Panoramica", "views": [ { + "icon": "mdi:home", + "id": "main", + "title": "Principale", "badges": [ { "entity": "person.giorgio" @@ -14,7 +17,7 @@ "entity": "person.laura" }, { - "entity": "device_tracker.wdd1760081v167576" + "entity": "device_tracker.ff590mr_device_tracker" }, { "entity": "sensor.time" @@ -283,10 +286,7 @@ ], "type": "vertical-stack" } - ], - "icon": "mdi:home", - "id": "main", - "title": "Principale" + ] }, { "badges": [ @@ -495,56 +495,74 @@ "type": "thermostat" }, { + "type": "entities", "entities": [ { - "action_name": "Attiva Boost", - "name": "Cucina", - "service": "script.climate_valve_boost", - "service_data": { - "entity_id": "climate.netatmo_cucina" - }, - "type": "call-service" + "entity": "input_boolean.boost_valvola_cucina" }, { - "action_name": "Attiva Boost", - "name": "Sala", - "service": "script.climate_valve_boost", - "service_data": { - "entity_id": "climate.netatmo_sala" - }, - "type": "call-service" + "entity": "input_boolean.boost_valvola_sala" }, { - "action_name": "Attiva Boost", - "name": "Bagno", - "service": "script.climate_valve_boost", - "service_data": { - "entity_id": "climate.netatmo_bagno" - }, - "type": "call-service" + "entity": "input_boolean.boost_valvola_studio" }, { - "action_name": "Attiva Boost", - "name": "Studio", - "service": "script.climate_valve_boost", - "service_data": { - "entity_id": "climate.netatmo_studio" - }, - "type": "call-service" + "entity": "input_boolean.boost_valvola_bagno" }, { - "action_name": "Attiva Boost", - "name": "Camera", - "service": "script.climate_valve_boost", - "service_data": { - "entity_id": "climate.netatmo_camera_da_letto" - }, - "type": "call-service" + "entity": "input_boolean.boost_valvola_camera_da_letto" } ], "show_header_toggle": false, - "title": "Operazioni", - "type": "entities" + "title": "Modalit\u00e0 Boost" + }, + { + "type": "entities", + "entities": [ + { + "entity": "input_boolean.valvola_cucina" + }, + { + "entity": "input_boolean.valvola_sala" + }, + { + "entity": "input_boolean.valvola_studio" + }, + { + "entity": "input_boolean.valvola_bagno" + }, + { + "entity": "input_boolean.valvola_camera_da_letto" + } + ], + "title": "Accensione / Spegnimento", + "show_header_toggle": false + }, + { + "type": "entities", + "title": "Stato Valvole Netatmo", + "entities": [ + { + "entity": "sensor.valve_cucina_state", + "name": "Cucina" + }, + { + "entity": "sensor.valve_sala_state", + "name": "Sala" + }, + { + "entity": "sensor.valve_studio_state", + "name": "Studio" + }, + { + "entity": "sensor.valve_bagno_state", + "name": "Bagno" + }, + { + "entity": "sensor.valve_camera_da_letto_state", + "name": "Camera" + } + ] }, { "type": "history-graph", @@ -600,32 +618,6 @@ "hours_to_show": 24, "refresh_interval": 0, "title": "Valvola Camera" - }, - { - "type": "entities", - "title": "Stato Valvole Netatmo", - "entities": [ - { - "entity": "sensor.valve_cucina_state", - "name": "Cucina" - }, - { - "entity": "sensor.valve_sala_state", - "name": "Sala" - }, - { - "entity": "sensor.valve_studio_state", - "name": "Studio" - }, - { - "entity": "sensor.valve_bagno_state", - "name": "Bagno" - }, - { - "entity": "sensor.valve_camera_da_letto_state", - "name": "Camera" - } - ] } ] }, @@ -675,20 +667,41 @@ "title": "People" }, { + "icon": "mdi:car", + "id": "car", + "title": "Auto", "badges": [ - "device_tracker.wdd1760081v167576", - "sensor.ff590mr_odometer", - "sensor.ff590mr_fuel_level", - "binary_sensor.ff590mr_locked", - "binary_sensor.ff590mr_doors_closed", - "binary_sensor.ff590mr_windows_closed_2" + { + "entity": "device_tracker.ff590mr_device_tracker" + }, + { + "entity": "sensor.ff590mr_odometer" + }, + { + "entity": "sensor.ff590mr_fuel_level" + }, + { + "entity": "binary_sensor.ff590mr_locked" + }, + { + "entity": "binary_sensor.ff590mr_doors_closed" + }, + { + "entity": "binary_sensor.ff590mr_windows_closed_2" + } ], "cards": [ { "entities": [ - "switch.ff590mr_lock", - "binary_sensor.ff590mr_doors_closed", - "binary_sensor.ff590mr_windows_closed_2" + { + "entity": "binary_sensor.ff590mr_locked" + }, + { + "entity": "binary_sensor.ff590mr_doors_closed" + }, + { + "entity": "binary_sensor.ff590mr_windows_closed_2" + } ], "show_header_toggle": false, "title": "Mercedes A200d: Sensori", @@ -729,12 +742,21 @@ }, { "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_trunk", - "binary_sensor.ff590mr_fuel_lid" + { + "entity": "binary_sensor.ff590mr_door_front_left" + }, + { + "entity": "binary_sensor.ff590mr_door_front_right" + }, + { + "entity": "binary_sensor.ff590mr_door_rear_left" + }, + { + "entity": "binary_sensor.ff590mr_door_rear_right" + }, + { + "entity": "binary_sensor.ff590mr_fuel_lid" + } ], "show_header_toggle": false, "title": "Mercedes A200d: Porte", @@ -753,13 +775,24 @@ }, { "entities": [ - "sensor.ff590mr_odometer", - "sensor.ff590mr_distance_since_start", - "sensor.ff590mr_distance_since_reset", - "sensor.ff590mr_fuel_level", - "sensor.ff590mr_liquid_consumption_start", - "sensor.ff590mr_liquid_consumption_reset", - "sensor.ff590mr_service_interval_days" + { + "entity": "sensor.ff590mr_odometer" + }, + { + "entity": "sensor.ff590mr_distance_since_start" + }, + { + "entity": "sensor.ff590mr_distance_since_reset" + }, + { + "entity": "sensor.ff590mr_fuel_level" + }, + { + "entity": "sensor.ff590mr_liquid_consumption_reset" + }, + { + "entity": "sensor.ff590mr_service_interval_days" + } ], "show_header_toggle": false, "title": "Mercedes A200d: Dati", @@ -769,14 +802,11 @@ "aspect_ratio": 969, "default_zoom": 15, "entities": [ - "device_tracker.wdd1760081v167576" + "device_tracker.ff590mr_device_tracker" ], "type": "map" } - ], - "icon": "mdi:car", - "id": "car", - "title": "Auto" + ] }, { "badges": [ diff --git a/packages/mercedes/mercedes_log.yaml b/packages/mercedes/mercedes_log.yaml index 63907511..3fa36d0c 100644 --- a/packages/mercedes/mercedes_log.yaml +++ b/packages/mercedes/mercedes_log.yaml @@ -43,6 +43,7 @@ history: ###################################################################### # Mercedes Package - Logbook ###################################################################### + logbook: exclude: entities: @@ -84,6 +85,7 @@ logbook: ###################################################################### # Mercedes Package - Recorder ###################################################################### + recorder: exclude: entities: diff --git a/packages/mercedes/mercedes_sensor.yaml b/packages/mercedes/mercedes_sensor.yaml index 9a5d9e92..822f27b7 100644 --- a/packages/mercedes/mercedes_sensor.yaml +++ b/packages/mercedes/mercedes_sensor.yaml @@ -51,96 +51,6 @@ sensor: 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 ###################################################################### -- 2.47.3