From f415cc9c3652aee29ed2dfe00436cb22d58acd67 Mon Sep 17 00:00:00 2001 From: Giorgio Ravera Date: Thu, 31 Dec 2020 19:02:05 +0100 Subject: [PATCH] Restored mercedes integration. --- log/logger.yaml | 2 +- ...l.disabled => mercedes_binary_sensor.yaml} | 124 ++++++++++-------- ....disabled => mercedes_customizations.yaml} | 27 ++-- ...es_log.yaml.disabled => mercedes_log.yaml} | 27 ++-- ...sor.yaml.disabled => mercedes_sensor.yaml} | 14 +- 5 files changed, 104 insertions(+), 90 deletions(-) rename packages/mercedes/{mercedes_binary_sensor.yaml.disabled => mercedes_binary_sensor.yaml} (59%) rename packages/mercedes/{mercedes_customizations.yaml.disabled => mercedes_customizations.yaml} (68%) rename packages/mercedes/{mercedes_log.yaml.disabled => mercedes_log.yaml} (85%) rename packages/mercedes/{mercedes_sensor.yaml.disabled => mercedes_sensor.yaml} (96%) diff --git a/log/logger.yaml b/log/logger.yaml index cc20f4e8..754bfba6 100644 --- a/log/logger.yaml +++ b/log/logger.yaml @@ -5,7 +5,7 @@ default: info logs: - custom_components.mercedesmeapi: warn + custom_components.mbapi2020: warn googleapiclient.discovery: warn homeassistant.components.automation: info homeassistant.components.device_tracker: warn diff --git a/packages/mercedes/mercedes_binary_sensor.yaml.disabled b/packages/mercedes/mercedes_binary_sensor.yaml similarity index 59% rename from packages/mercedes/mercedes_binary_sensor.yaml.disabled rename to packages/mercedes/mercedes_binary_sensor.yaml index 97dc98d4..96d26880 100644 --- a/packages/mercedes/mercedes_binary_sensor.yaml.disabled +++ b/packages/mercedes/mercedes_binary_sensor.yaml @@ -9,11 +9,15 @@ binary_sensor: - platform: template sensors: ff590mr_locked: - friendly_name: Vettura Bloccata + friendly_name: Blocco Vettura value_template: >- - {{ not is_state('lock.ff590mr_lock', 'locked') }} + {% if not is_state('sensor.ff590mr_lock', '2') %} + true + {% else %} + false + {% endif %} icon_template: >- - {% if is_state('lock.ff590mr_lock', 'locked') %} + {% if is_state('sensor.ff590mr_lock' '2') %} mdi:lock {% else %} mdi:lock-open @@ -28,13 +32,11 @@ binary_sensor: ff590mr_doors_closed: friendly_name: Porte 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 %} + {{ (is_state_attr('binary_sensor.ff590mr_windows_closed', 'doorstatusfrontleft', 'false') and + is_state_attr('binary_sensor.ff590mr_windows_closed', 'doorstatusfrontright', 'false') and + is_state_attr('binary_sensor.ff590mr_windows_closed', 'doorstatusrearleft', 'false') and + is_state_attr('binary_sensor.ff590mr_windows_closed', 'doorstatusrearright', 'false')) }} + icon_template: mdi:car-door device_class: opening ###################################################################### @@ -45,8 +47,7 @@ binary_sensor: ff590mr_door_front_left: friendly_name: Anteriore Sinistra 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')) }} + {{ is_state_attr('sensor.ff590mr_lock', 'doorstatusfrontleft', '2') }} icon_template: mdi:car-door device_class: opening @@ -58,8 +59,7 @@ binary_sensor: ff590mr_door_front_right: friendly_name: Anteriore Destra 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')) }} + {{ is_state_attr('sensor.ff590mr_lock', 'doorstatusfrontright', '2') }} icon_template: mdi:car-door device_class: opening @@ -71,8 +71,7 @@ binary_sensor: ff590mr_door_rear_left: friendly_name: Posteriore Sinistra 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')) }} + {{ is_state_attr('sensor.ff590mr_lock', 'doorstatusrearleft', '2') }} icon_template: mdi:car-door device_class: opening @@ -84,41 +83,40 @@ binary_sensor: ff590mr_door_rear_right: friendly_name: Posteriore Destra 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')) }} + {{ is_state_attr('sensor.ff590mr_lock', 'doorstatusrearright', '2') }} icon_template: mdi:car-door device_class: opening ###################################################################### # Binary Sensor: Trunk ###################################################################### - - platform: template - sensors: - ff590mr_trunk: - friendly_name: Bagagliaio - 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 + #- platform: template + # sensors: + # ff590mr_trunk: + # friendly_name: Bagagliaio + # 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 + # Binary Sensor: Deck Lid ###################################################################### - platform: template sensors: ff590mr_fuel_lid: friendly_name: Serbatoio value_template: >- - {{ not is_state_attr('sensor.ff590mr_lock', 'fuelLidClosed', true) }} + {{ is_state_attr('sensor.ff590mr_lock', 'decklidstatus', true) }} icon_template: >- - {% if is_state_attr('sensor.ff590mr_lock', 'fuelLidClosed', true) %} + {% if is_state_attr('sensor.ff590mr_lock', 'decklidstatus', true) %} mdi:gas-station {% else %} mdi:gas-station @@ -133,19 +131,13 @@ binary_sensor: ff590mr_windows_closed_2: friendly_name: Finestrini 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')) }} + {{ is_state('binary_sensor.ff590mr_windows_closed', 'true') }} 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')) %} + {% if not is_state('binary_sensor.ff590mr_windows_closed', '2') %} mdi:window-closed {% else %} mdi:window-open - {% endif %} + {% endif %} device_class: opening ###################################################################### @@ -156,13 +148,17 @@ binary_sensor: ff590mr_window_front_left: friendly_name: Anteriore Sinistro value_template: >- - {{ not is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusfrontleft', 'CLOSED') }} + {% if is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusfrontleft', '2') %} + false + {% else %} + true + {% endif %} icon_template: >- - {% if is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusfrontleft', 'CLOSED') %} - mdi:window-closed + {% if is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusfrontleft', '2') %} + mdi:window-closed {% else %} mdi:window-open - {% endif %} + {% endif %} device_class: opening ###################################################################### @@ -173,10 +169,14 @@ binary_sensor: ff590mr_window_front_right: friendly_name: Anteriore Destro value_template: >- - {{ not is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusfrontright', 'CLOSED') }} + {% if is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusfrontright', '2') %} + false + {% else %} + true + {% endif %} icon_template: >- - {% if is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusfrontright', 'CLOSED') %} - mdi:window-closed + {% if is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusfrontright', '2') %} + mdi:window-closed {% else %} mdi:window-open {% endif %} @@ -190,10 +190,14 @@ binary_sensor: ff590mr_window_rear_left: friendly_name: Posteriore Sinistro value_template: >- - {{ not is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusrearleft', 'CLOSED') }} + {% if is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusrearleft', '2') %} + false + {% else %} + true + {% endif %} icon_template: >- - {% if is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusrearleft', 'CLOSED') %} - mdi:window-closed + {% if is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusrearleft', '2') %} + mdi:window-closed {% else %} mdi:window-open {% endif %} @@ -207,10 +211,14 @@ binary_sensor: ff590mr_window_rear_right: friendly_name: Posteriore Destro value_template: >- - {{ not is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusrearright', 'CLOSED') }} + {% if is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusrearright', '2') %} + false + {% else %} + true + {% endif %} icon_template: >- - {% if is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusrearright', 'CLOSED') %} - mdi:window-closed + {% if is_state_attr('binary_sensor.ff590mr_windows_closed', 'windowstatusrearright', '2') %} + mdi:window-closed {% else %} mdi:window-open {% endif %} diff --git a/packages/mercedes/mercedes_customizations.yaml.disabled b/packages/mercedes/mercedes_customizations.yaml similarity index 68% rename from packages/mercedes/mercedes_customizations.yaml.disabled rename to packages/mercedes/mercedes_customizations.yaml index e14b8a24..2133c1fa 100644 --- a/packages/mercedes/mercedes_customizations.yaml.disabled +++ b/packages/mercedes/mercedes_customizations.yaml @@ -4,14 +4,14 @@ homeassistant: customize: - # Stato Generale + # Stato Generale - warningenginelight binary_sensor.ff590mr_engine_light_warning: friendly_name: Stato Generale device_class: problem icon: mdi:hazard-lights # warningbrakefluid, warningwashwater, warningcoolantlevellow, warninglowbattery - # Freno a Mano + # Freno a Mano - parkbrakestatus #binary_sensor.ff590mr_park_brake_status: # friendly_name: Freno a mano # device_class: plug @@ -36,15 +36,14 @@ homeassistant: device_class: problem icon: mdi:wiper-wash - # Pneumatici + # Pneumatici - tirewarninglamp binary_sensor.ff590mr_tire_warning: friendly_name: Pneumatici device_class: problem icon: mdi:car-tire-alert # tirepressureRearLeft, tirepressureRearRight, tirepressureFrontRight, tirepressureFrontLeft, - # tirewarningsrdk, tirewarningsprwtireMarkerFrontRight, tireMarkerFrontLeft, tireMarkerRearLeft, tireMarkerRearRight, - # tireWarningRollup, lastTirepressureTimestamp - + # tireMarkerFrontRight, tireMarkerFrontLeft, tireMarkerRearLeft, tireMarkerRearRight, tirewarningsrdk, tirewarningsprw, + # Finestrini binary_sensor.ff590mr_windows_closed: friendly_name: Finestrini @@ -52,6 +51,11 @@ homeassistant: icon: mdi:window-closed # windowstatusrearleft, windowstatusrearright, windowstatusfrontright, windowstatusfrontleft + # Device Tracker + device_tracker.ff590mr_device_tracker: + friendly_name: Mercedes A200d + entity_picture: /local/images/device-trackers/mercedes.jpg + # Lock lock.ff590mr_lock: friendly_name: Blocco Sblocco @@ -61,18 +65,23 @@ homeassistant: sensor.ff590mr_fuel_level: friendly_name: Livello Carburante icon: mdi:gas-station + # tankLevelAdBlue - # Blocco Veicolo + # Blocco Veicolo - lock 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 + # doorsClosed, trunkStateRollup, sunroofstatus, fuelLidClosed, engineHoodClosed # Odometria sensor.ff590mr_odometer: friendly_name: Km Percorsi icon: mdi:road-variant - # distanceReset, distanceStart, liquidconsumptionstart, liquidconsumptionreset, liquidRangeSkipIndication, serviceintervaldays, tanklevelpercent, tankReserveLamp + # 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 diff --git a/packages/mercedes/mercedes_log.yaml.disabled b/packages/mercedes/mercedes_log.yaml similarity index 85% rename from packages/mercedes/mercedes_log.yaml.disabled rename to packages/mercedes/mercedes_log.yaml index fc15c11c..63907511 100644 --- a/packages/mercedes/mercedes_log.yaml.disabled +++ b/packages/mercedes/mercedes_log.yaml @@ -12,8 +12,11 @@ history: - binary_sensor.ff590mr_door_rear_right #- binary_sensor.ff590mr_doors_closed - binary_sensor.ff590mr_engine_light_warning + - binary_sensor.ff590mr_fuel_lid #- binary_sensor.ff590mr_locked - - binary_sensor.ff590mr_park_brake_status + - 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_trunk - binary_sensor.ff590mr_fuel_lid @@ -25,10 +28,6 @@ history: - 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 @@ -54,8 +53,11 @@ logbook: - binary_sensor.ff590mr_door_rear_right #- binary_sensor.ff590mr_doors_closed - binary_sensor.ff590mr_engine_light_warning + - binary_sensor.ff590mr_fuel_lid #- binary_sensor.ff590mr_locked - - binary_sensor.ff590mr_park_brake_status + - 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_trunk - binary_sensor.ff590mr_fuel_lid @@ -67,10 +69,6 @@ logbook: - 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 @@ -96,8 +94,11 @@ recorder: - binary_sensor.ff590mr_door_rear_right #- binary_sensor.ff590mr_doors_closed - binary_sensor.ff590mr_engine_light_warning + - binary_sensor.ff590mr_fuel_lid #- binary_sensor.ff590mr_locked - - binary_sensor.ff590mr_park_brake_status + - 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_trunk - binary_sensor.ff590mr_fuel_lid @@ -109,10 +110,6 @@ recorder: - 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 diff --git a/packages/mercedes/mercedes_sensor.yaml.disabled b/packages/mercedes/mercedes_sensor.yaml similarity index 96% rename from packages/mercedes/mercedes_sensor.yaml.disabled rename to packages/mercedes/mercedes_sensor.yaml index 9ad0a342..9a5d9e92 100644 --- a/packages/mercedes/mercedes_sensor.yaml.disabled +++ b/packages/mercedes/mercedes_sensor.yaml @@ -166,13 +166,13 @@ sensor: ###################################################################### # Sensor: Liquid Consumption from Start ###################################################################### - - platform: template - sensors: - ff590mr_liquid_consumption_start: - friendly_name: Consumo dalla partenza - unit_of_measurement: 'l/100Km' - value_template: "{{ state_attr('sensor.ff590mr_odometer', 'liquidconsumptionstart') }}" - icon_template: mdi:gas-station + #- platform: template + # sensors: + # ff590mr_liquid_consumption_start: + # friendly_name: Consumo dalla partenza + # unit_of_measurement: 'l/100Km' + # value_template: "{{ state_attr('sensor.ff590mr_odometer', 'liquidconsumptionstart') }}" + # icon_template: mdi:gas-station ###################################################################### # Sensor: Liquid Consumption from Reset -- 2.47.3