Bump version

README.md

@@ -10,6 +10,8 @@ Maybe this component works also with other Volvo cars. Please try out the native
 - C40 PHEV (2022)
 - XC90 T8 PHEV (2023)
 - XC60 PHEV (2023)
+- XC60 PHEV (2022)
+- V90 PHEV T8 (2019)
 
 Please let me know if your car works with this addon so I can expand the list!
 
@@ -30,7 +32,7 @@ NOTE: Energy status currently available only for cars in the Europe / Middle Eas
 Just install this addon with the following command.
 Please note to fill in your settings inside the environment variables.
 
-`docker run --pull=always -e CONF_updateInterval=300 -e CONF_babelLocale='de' -e CONF_mqtt='@json {"broker": "", "username": "", "password": ""}' -e CONF_volvoData='@json {"username": "", "password": "", "vin": "",   "vccapikey": ""}' -e TZ='Europe/Berlin' --name volvo2mqtt ghcr.io/dielee/volvo2mqtt:latest`
+`docker run -d --pull=always -e CONF_updateInterval=300 -e CONF_babelLocale='de' -e CONF_mqtt='@json {"broker": "", "username": "", "password": ""}' -e CONF_volvoData='@json {"username": "", "password": "", "vin": "",   "vccapikey": ""}' -e TZ='Europe/Berlin' --name volvo2mqtt ghcr.io/dielee/volvo2mqtt:latest`
 
 <b>HA Add-On:</b><br>
 

src/config.yaml

@@ -1,6 +1,6 @@
 name: "Volvo2Mqtt"
 description: "Volvo AAOS MQTT bridge"
-version: "1.2.1"
+version: "1.3.0"
 slug: "volvo2mqtt"
 init: false
 url: "https://github.com/Dielee/volvo2mqtt"

src/const.py

@@ -1,6 +1,6 @@
 from config import settings
 
-VERSION = "v1.2.1"
+VERSION = "v1.3.0"
 
 OAUTH_URL = "https://volvoid.eu.volvocars.com/as/token.oauth2"
 VEHICLES_URL = "https://api.volvocars.com/connected-vehicle/v1/vehicles"
@@ -14,43 +14,44 @@ CAR_UNLOCK_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/co
 RECHARGE_STATE_URL = "https://api.volvocars.com/energy/v1/vehicles/{0}/recharge-status"
 ODOMETER_STATE_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/odometer"
 LOCATION_STATE_URL = "https://api.volvocars.com/location/v1/vehicles/{0}/location"
+TYRE_STATE_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/tyres"
+ENGINE_STATE_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/engine-status"
+BATTERY_CHARGE_STATE_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/battery-charge-level"
 
 charging_system_states = {"CHARGING_SYSTEM_CHARGING": "Charging", "CHARGING_SYSTEM_IDLE": "Idle",
                           "CHARGING_SYSTEM_FAULT": "Fault", "CHARGING_SYSTEM_UNSPECIFIED": "Unspecified"}
 
-supported_sensors = [
-                        {"name": "Battery Charge Level", "id": "battery_charge_level", "unit": "%", "icon": "car-battery", "url": RECHARGE_STATE_URL},
-                        {"name": "Electric Range", "id": "electric_range", "unit": "km" if settings["babelLocale"] != "en_US" else "mi", "icon": "map-marker-distance", "url": RECHARGE_STATE_URL},
-                        {"name": "Estimated Charging Time", "id": "estimated_charging_time", "unit": "minutes", "icon": "timer-sync-outline", "url": RECHARGE_STATE_URL},
-                        {"name": "Charging System Status", "id": "charging_system_status", "icon": "ev-plug-ccs2", "url": RECHARGE_STATE_URL},
-                        {"name": "Estimated Charging Finish Time", "id": "estimated_charging_finish_time", "icon": "timer-sync-outline", "url": RECHARGE_STATE_URL},
-                        {"name": "Odometer", "id": "odometer", "unit": "km" if settings["babelLocale"] != "en_US" else "mi", "icon": "counter", "url": ODOMETER_STATE_URL},
-                        {"name": "Last Data Update", "id": "last_data_update", "icon": "timer", "url": ""},
-                        {"name": "Window Front Left", "id": "window_front_left", "icon": "car-door-lock", "url": WINDOWS_STATE_URL},
-                        {"name": "Window Front Right", "id": "window_front_right", "icon": "car-door-lock", "url": WINDOWS_STATE_URL},
-                        {"name": "Window Rear Left", "id": "window_rear_left", "icon": "car-door-lock", "url": WINDOWS_STATE_URL},
-                        {"name": "Window Rear Right", "id": "window_rear_right", "icon": "car-door-lock", "url": WINDOWS_STATE_URL},
-                        {"name": "Door Front Left", "id": "door_front_left", "icon": "car-door-lock", "url": LOCK_STATE_URL},
-                        {"name": "Door Front Right", "id": "door_front_right", "icon": "car-door-lock", "url": LOCK_STATE_URL},
-                        {"name": "Door Rear Left", "id": "door_rear_left", "icon": "car-door-lock", "url": LOCK_STATE_URL},
-                        {"name": "Door Rear Right", "id": "door_rear_right", "icon": "car-door-lock", "url": LOCK_STATE_URL},
-                        {"name": "Tailgate", "id": "tailgate", "icon": "car-door-lock", "url": LOCK_STATE_URL},
-                        {"name": "Engine Hood", "id": "engine_hood", "icon": "car-door-lock", "url": LOCK_STATE_URL},
-                        {"name": "Tank Lid", "id": "tank_lid", "icon": "car-door-lock", "url": LOCK_STATE_URL}
-]
+charging_connection_states = {"CONNECTION_STATUS_DISCONNECTED": "Disconnected", "CONNECTION_STATUS_UNSPECIFIED": "Unspecified",
+                              "CONNECTION_STATUS_CONNECTED_DC": "Connected DC", "CONNECTION_STATUS_CONNECTED_AC": "Connected AC"}
 
-supported_switches = [
-                        {"name": "Air Conditioning", "id": "climate_status", "icon": "air-conditioner"},
+supported_entities = [
+                        {"name": "Battery Charge Level", "domain": "sensor", "id": "battery_charge_level", "unit": "%", "icon": "car-battery", "url": RECHARGE_STATE_URL},
+                        {"name": "Battery Charge Level", "domain": "sensor", "id": "battery_charge_level", "unit": "%", "icon": "car-battery", "url": BATTERY_CHARGE_STATE_URL},
+                        {"name": "Electric Range", "domain": "sensor", "id": "electric_range", "unit": "km" if settings["babelLocale"] != "en_US" else "mi", "icon": "map-marker-distance", "url": RECHARGE_STATE_URL},
+                        {"name": "Estimated Charging Time", "domain": "sensor", "id": "estimated_charging_time", "unit": "minutes", "icon": "timer-sync-outline", "url": RECHARGE_STATE_URL},
+                        {"name": "Charging System Status", "domain": "sensor", "id": "charging_system_status", "icon": "ev-station", "url": RECHARGE_STATE_URL},
+                        {"name": "Charging Connection Status", "domain": "sensor", "id": "charging_connection_status", "icon": "ev-plug-ccs2", "url": RECHARGE_STATE_URL},
+                        {"name": "Estimated Charging Finish Time", "domain": "sensor", "id": "estimated_charging_finish_time", "icon": "timer-sync-outline", "url": RECHARGE_STATE_URL},
+                        {"name": "Odometer", "domain": "sensor", "id": "odometer", "unit": "km" if settings["babelLocale"] != "en_US" else "mi", "icon": "counter", "url": ODOMETER_STATE_URL},
+                        {"name": "Last Data Update", "domain": "sensor", "id": "last_data_update", "icon": "timer", "url": ""},
+                        {"name": "Window Front Left", "domain": "sensor", "id": "window_front_left", "icon": "car-door-lock", "url": WINDOWS_STATE_URL},
+                        {"name": "Window Front Right", "domain": "sensor", "id": "window_front_right", "icon": "car-door-lock", "url": WINDOWS_STATE_URL},
+                        {"name": "Window Rear Left", "domain": "sensor", "id": "window_rear_left", "icon": "car-door-lock", "url": WINDOWS_STATE_URL},
+                        {"name": "Window Rear Right", "domain": "sensor", "id": "window_rear_right", "icon": "car-door-lock", "url": WINDOWS_STATE_URL},
+                        {"name": "Door Front Left", "domain": "sensor", "id": "door_front_left", "icon": "car-door-lock", "url": LOCK_STATE_URL},
+                        {"name": "Door Front Right", "domain": "sensor", "id": "door_front_right", "icon": "car-door-lock", "url": LOCK_STATE_URL},
+                        {"name": "Door Rear Left", "domain": "sensor", "id": "door_rear_left", "icon": "car-door-lock", "url": LOCK_STATE_URL},
+                        {"name": "Door Rear Right", "domain": "sensor", "id": "door_rear_right", "icon": "car-door-lock", "url": LOCK_STATE_URL},
+                        {"name": "Tailgate", "domain": "sensor", "id": "tailgate", "icon": "car-door-lock", "url": LOCK_STATE_URL},
+                        {"name": "Engine Hood", "domain": "sensor", "id": "engine_hood", "icon": "car-door-lock", "url": LOCK_STATE_URL},
+                        {"name": "Tank Lid", "domain": "sensor", "id": "tank_lid", "icon": "car-door-lock", "url": LOCK_STATE_URL},
+                        {"name": "Air Conditioning", "domain": "switch", "id": "climate_status", "icon": "air-conditioner"},
+                        {"name": "Lock state", "domain": "lock", "id": "lock_status", "icon": "lock", "url": LOCK_STATE_URL},
+                        {"name": "Force Update Data", "domain": "button", "id": "update_data", "icon": "update", "url": ""},
+                        {"name": "Location", "domain": "device_tracker", "id": "location", "icon": "map-marker-radius", "url": LOCATION_STATE_URL},
+                        {"name": "Tyre Front Left", "domain": "sensor", "id": "tyre_front_left", "icon": "car-tire-alert", "url": TYRE_STATE_URL},
+                        {"name": "Tyre Front Right", "domain": "sensor", "id": "tyre_front_right", "icon": "car-tire-alert", "url": TYRE_STATE_URL},
+                        {"name": "Tyre Rear Left", "domain": "sensor", "id": "tyre_rear_left", "icon": "car-tire-alert", "url": TYRE_STATE_URL},
+                        {"name": "Tyre Rear Right", "domain": "sensor", "id": "tyre_rear_right", "icon": "car-tire-alert", "url": TYRE_STATE_URL},
+                        {"name": "Engine State", "domain": "sensor", "id": "engine_state", "icon": "engine", "url": ENGINE_STATE_URL}
 ]
-
-supported_locks = [
-                        {"name": "Lock state", "id": "lock_status", "icon": "lock", "url": LOCK_STATE_URL}
-]
-
-supported_buttons = [
-                        {"name": "Force Update Data", "id": "update_data", "icon": "update", "url": ""}
-]
-
-supported_device_trackers = [
-                        {"name": "Location", "id": "location", "icon": "map-marker-radius", "url": LOCATION_STATE_URL}
-]

src/mqtt.py

@@ -7,9 +7,7 @@ from datetime import datetime
 from babel.dates import format_datetime
 from config import settings
 from const import CLIMATE_START_URL, CLIMATE_STOP_URL, CAR_LOCK_URL, \
-            CAR_UNLOCK_URL, supported_sensors, supported_buttons, supported_switches, \
-            supported_locks, supported_device_trackers
-
+            CAR_UNLOCK_URL
 
 
 mqtt_client: mqtt.Client
@@ -44,37 +42,41 @@ def on_disconnect(client, userdata,  rc):
 
 
 def on_message(client, userdata, msg):
-    if msg.topic in subscribed_topics:
+    try:
         vin = msg.topic.split('/')[2].split('_')[0]
-        payload = msg.payload.decode("UTF-8")
-        if "climate_status" in msg.topic:
-            global assumed_climate_state, climate_timer
-            if payload == "ON":
-                api_thread = Thread(target=volvo.api_call, args=(CLIMATE_START_URL, "POST", vin))
-                api_thread.start()
-                assumed_climate_state[vin] = "ON"
-                # Starting timer to disable climate after 30 mins
-                climate_timer = Timer(1 * 60, volvo.disable_climate, (vin, ))
-                climate_timer.start()
-                update_car_data()
-            elif payload == "OFF":
-                api_thread = Thread(target=volvo.api_call, args=(CLIMATE_STOP_URL, "POST", vin))
-                api_thread.start()
-                assumed_climate_state[vin] = "OFF"
-                # Stop timer if active
-                if climate_timer.is_alive():
-                    climate_timer.cancel()
-                update_car_data()
-        elif "lock_status" in msg.topic:
-            if payload == "LOCK":
-                volvo.api_call(CAR_LOCK_URL, "POST", vin)
-                update_car_data()
-            elif payload == "UNLOCK":
-                volvo.api_call(CAR_UNLOCK_URL, "POST", vin)
-                update_car_data()
-        elif "update_data" in msg.topic:
-            if payload == "PRESS":
-                update_car_data(True)
+    except IndexError:
+        print("Error - Cannot get vin from MQTT topic!")
+        return None
+
+    payload = msg.payload.decode("UTF-8")
+    if "climate_status" in msg.topic:
+        global assumed_climate_state, climate_timer
+        if payload == "ON":
+            api_thread = Thread(target=volvo.api_call, args=(CLIMATE_START_URL, "POST", vin))
+            api_thread.start()
+            assumed_climate_state[vin] = "ON"
+            # Starting timer to disable climate after 30 mins
+            climate_timer = Timer(1 * 60, volvo.disable_climate, (vin, ))
+            climate_timer.start()
+            update_car_data()
+        elif payload == "OFF":
+            api_thread = Thread(target=volvo.api_call, args=(CLIMATE_STOP_URL, "POST", vin))
+            api_thread.start()
+            assumed_climate_state[vin] = "OFF"
+            # Stop timer if active
+            if climate_timer.is_alive():
+                climate_timer.cancel()
+            update_car_data()
+    elif "lock_status" in msg.topic:
+        if payload == "LOCK":
+            volvo.api_call(CAR_LOCK_URL, "POST", vin)
+            update_car_data()
+        elif payload == "UNLOCK":
+            volvo.api_call(CAR_UNLOCK_URL, "POST", vin)
+            update_car_data()
+    elif "update_data" in msg.topic:
+        if payload == "PRESS":
+            update_car_data(True)
 
 
 def update_loop():
@@ -90,136 +92,56 @@ def update_car_data(force_update=False):
     global last_data_update
     last_data_update = format_datetime(datetime.now(), format="medium", locale=settings["babelLocale"])
     for vin in volvo.vins:
-        for device_tracker in supported_device_trackers:
-            state = volvo.api_call(device_tracker["url"], "GET", vin, device_tracker["id"], force_update)
-            mqtt_client.publish(
-                f"homeassistant/device_tracker/{vin}_{device_tracker['id']}/attributes",
-                json.dumps(state)
-            )
+        for entity in volvo.supported_endpoints[vin]:
+            if entity["domain"] == "button":
+                continue
 
-        for lock in supported_locks:
-            state = volvo.api_call(lock["url"], "GET", vin, lock["id"], force_update)
-            mqtt_client.publish(
-                f"homeassistant/lock/{vin}_{lock['id']}/state",
-                state
-            )
-
-        for switch in supported_switches:
-            if switch["id"] == "climate_status":
+            if entity["id"] == "climate_status":
                 state = assumed_climate_state[vin]
-            else:
-                state = "OFF"
-
-            mqtt_client.publish(
-                f"homeassistant/switch/{vin}_{switch['id']}/state",
-                state
-            )
-
-        for sensor in supported_sensors:
-            if sensor["id"] == "last_data_update":
+            elif entity["id"] == "last_data_update":
                 state = last_data_update
             else:
-                state = volvo.api_call(sensor["url"], "GET", vin, sensor["id"], force_update)
+                state = volvo.api_call(entity["url"], "GET", vin, entity["id"], force_update)
+
+            if entity["domain"] == "device_tracker":
+                topic = f"homeassistant/{entity['domain']}/{vin}_{entity['id']}/attributes"
+            else:
+                topic = f"homeassistant/{entity['domain']}/{vin}_{entity['id']}/state"
+
             mqtt_client.publish(
-                f"homeassistant/sensor/{vin}_{sensor['id']}/state",
-                state
+                topic,
+                json.dumps(state) if isinstance(state, dict) else state
             )
 
 
 def create_ha_devices():
+    global subscribed_topics
     for vin in volvo.vins:
         device = volvo.get_vehicle_details(vin)
-
-        for device_tracker in supported_device_trackers:
+        for entity in volvo.supported_endpoints[vin]:
             config = {
-                        "name": device_tracker['name'],
-                        "object_id": f"volvo_{vin}_{device_tracker['id']}",
+                        "name": entity['name'],
+                        "object_id": f"volvo_{vin}_{entity['id']}",
                         "schema": "state",
-                        "icon": f"mdi:{device_tracker['icon']}",
-                        "state_topic": f"homeassistant/device_tracker/{vin}_{device_tracker['id']}/state",
+                        "icon": f"mdi:{entity['icon']}",
+                        "state_topic": f"homeassistant/{entity['domain']}/{vin}_{entity['id']}/state",
                         "device": device,
-                        "unique_id": f"volvoAAOS2mqtt_{vin}_{device_tracker['id']}",
-                        "json_attributes_topic": f"homeassistant/device_tracker/{vin}_{device_tracker['id']}/attributes"
+                        "unique_id": f"volvoAAOS2mqtt_{vin}_{entity['id']}"
                     }
-            mqtt_client.publish(
-                f"homeassistant/device_tracker/volvoAAOS2mqtt/{vin}_{device_tracker['id']}/config",
-                json.dumps(config),
-            )
+            if entity.get('unit'):
+                config["unit_of_measurement"] = entity["unit"]
 
-        for button in supported_buttons:
-            command_topic = f"homeassistant/button/{vin}_{button['id']}/command"
-            config = {
-                        "name": button['name'],
-                        "object_id": f"volvo_{vin}_{button['id']}",
-                        "schema": "state",
-                        "icon": f"mdi:{button['icon']}",
-                        "state_topic": f"homeassistant/button/{vin}_{button['id']}/state",
-                        "command_topic": command_topic,
-                        "device": device,
-                        "unique_id": f"volvoAAOS2mqtt_{vin}_{button['id']}",
-                    }
-            mqtt_client.publish(
-                f"homeassistant/button/volvoAAOS2mqtt/{vin}_{button['id']}/config",
-                json.dumps(config),
-            )
-            subscribed_topics.append(command_topic)
-            mqtt_client.subscribe(command_topic)
+            if entity.get('domain') == "device_tracker":
+                config["json_attributes_topic"] = f"homeassistant/{entity['domain']}/{vin}_{entity['id']}/attributes"
 
-        for lock in supported_locks:
-            command_topic = f"homeassistant/lock/{vin}_{lock['id']}/command"
-            config = {
-                        "name": lock['name'],
-                        "object_id": f"volvo_{vin}_{lock['id']}",
-                        "schema": "state",
-                        "icon": f"mdi:{lock['icon']}",
-                        "state_topic": f"homeassistant/lock/{vin}_{lock['id']}/state",
-                        "command_topic": command_topic,
-                        "optimistic": False,
-                        "device": device,
-                        "unique_id": f"volvoAAOS2mqtt_{vin}_{lock['id']}",
-                    }
-            mqtt_client.publish(
-                f"homeassistant/lock/volvoAAOS2mqtt/{vin}_{lock['id']}/config",
-                json.dumps(config),
-            )
-            subscribed_topics.append(command_topic)
-            mqtt_client.subscribe(command_topic)
-
-        for switch in supported_switches:
-            command_topic = f"homeassistant/switch/{vin}_{switch['id']}/command"
-            config = {
-                        "name": switch['name'],
-                        "object_id": f"volvo_{vin}_{switch['id']}",
-                        "schema": "state",
-                        "icon": f"mdi:{switch['icon']}",
-                        "state_topic": f"homeassistant/switch/{vin}_{switch['id']}/state",
-                        "command_topic": command_topic,
-                        "optimistic": False,
-                        "device": device,
-                        "unique_id": f"volvoAAOS2mqtt_{vin}_{switch['id']}",
-                    }
-            mqtt_client.publish(
-                f"homeassistant/switch/volvoAAOS2mqtt/{vin}_{switch['id']}/config",
-                json.dumps(config),
-            )
-            subscribed_topics.append(command_topic)
-            mqtt_client.subscribe(command_topic)
-
-        for sensor in supported_sensors:
-            config = {
-                        "name": sensor['name'],
-                        "object_id": f"volvo_{vin}_{sensor['id']}",
-                        "schema": "state",
-                        "icon": f"mdi:{sensor['icon']}",
-                        "state_topic": f"homeassistant/sensor/{vin}_{sensor['id']}/state",
-                        "device": device,
-                        "unique_id": f"volvoAAOS2mqtt_{vin}_{sensor['id']}",
-                    }
-            if "unit" in sensor:
-                config["unit_of_measurement"] = sensor["unit"]
+            if entity.get('domain') in ["switch", "lock", "button"]:
+                command_topic = f"homeassistant/{entity['domain']}/{vin}_{entity['id']}/command"
+                config["command_topic"] = command_topic
+                subscribed_topics.append(command_topic)
+                mqtt_client.subscribe(command_topic)
 
             mqtt_client.publish(
-                f"homeassistant/sensor/volvoAAOS2mqtt/{vin}_{sensor['id']}/config",
+                f"homeassistant/{entity['domain']}/volvoAAOS2mqtt/{vin}_{entity['id']}/config",
                 json.dumps(config),
             )
     time.sleep(2)

src/util.py

@@ -0,0 +1,17 @@
+def keys_exists(element, *keys):
+    """"
+    Check if *keys (nested) exists in `element` (dict).
+    Thanks stackoverflow: https://stackoverflow.com/questions/43491287/elegant-way-to-check-if-a-nested-key-exists-in-a-dict
+    """
+    if not isinstance(element, dict):
+        raise AttributeError('keys_exists() expects dict as first argument.')
+    if len(keys) == 0:
+        raise AttributeError('keys_exists() expects at least two arguments, one given.')
+
+    _element = element
+    for key in keys:
+        try:
+            _element = _element[key]
+        except KeyError:
+            return False
+    return True

src/volvo.py

@@ -3,15 +3,16 @@ from datetime import datetime, timedelta
 import mqtt
 from config import settings
 from babel.dates import format_datetime
-from const import charging_system_states, CLIMATE_START_URL, \
+from util import keys_exists
+from const import charging_system_states, charging_connection_states, CLIMATE_START_URL, \
     OAUTH_URL, VEHICLES_URL, VEHICLE_DETAILS_URL, RECHARGE_STATE_URL, \
-    WINDOWS_STATE_URL, LOCK_STATE_URL
+    WINDOWS_STATE_URL, LOCK_STATE_URL, TYRE_STATE_URL, supported_entities, BATTERY_CHARGE_STATE_URL
 
 session = requests.Session()
 session.headers = {
-                "vcc-api-key": settings["volvoData"]["vccapikey"],
-                "content-type": "application/json",
-                "accept": "*/*"
+    "vcc-api-key": settings["volvoData"]["vccapikey"],
+    "content-type": "application/json",
+    "accept": "*/*"
 }
 
 token_expires_at: datetime
@@ -23,20 +24,23 @@ window_cached_api_response = {}
 window_api_last_update = {}
 door_cached_api_response = {}
 door_api_last_update = {}
+tyre_cached_api_response = {}
+tyre_api_last_update = {}
+supported_endpoints = {}
 
 
 def authorize():
     headers = {
-                "authorization": "Basic aDRZZjBiOlU4WWtTYlZsNnh3c2c1WVFxWmZyZ1ZtSWFEcGhPc3kxUENhVXNpY1F0bzNUUjVrd2FKc2U0QVpkZ2ZJZmNMeXc=",
-                "content-type": "application/x-www-form-urlencoded",
-                "accept": "application/json"
+        "authorization": "Basic aDRZZjBiOlU4WWtTYlZsNnh3c2c1WVFxWmZyZ1ZtSWFEcGhPc3kxUENhVXNpY1F0bzNUUjVrd2FKc2U0QVpkZ2ZJZmNMeXc=",
+        "content-type": "application/x-www-form-urlencoded",
+        "accept": "application/json"
     }
 
     body = {
-            "username": settings.volvoData["username"],
-            "password": settings.volvoData["password"],
-            "grant_type": "password",
-            "scope": "openid email profile care_by_volvo:financial_information:invoice:read care_by_volvo:financial_information:payment_method care_by_volvo:subscription:read customer:attributes customer:attributes:write order:attributes vehicle:attributes tsp_customer_api:all conve:brake_status conve:climatization_start_stop conve:command_accessibility conve:commands conve:diagnostics_engine_status conve:diagnostics_workshop conve:doors_status conve:engine_status conve:environment conve:fuel_status conve:honk_flash conve:lock conve:lock_status conve:navigation conve:odometer_status conve:trip_statistics conve:tyre_status conve:unlock conve:vehicle_relation conve:warnings conve:windows_status energy:battery_charge_level energy:charging_connection_status energy:charging_system_status energy:electric_range energy:estimated_charging_time energy:recharge_status vehicle:attributes"
+        "username": settings.volvoData["username"],
+        "password": settings.volvoData["password"],
+        "grant_type": "password",
+        "scope": "openid email profile care_by_volvo:financial_information:invoice:read care_by_volvo:financial_information:payment_method care_by_volvo:subscription:read customer:attributes customer:attributes:write order:attributes vehicle:attributes tsp_customer_api:all conve:brake_status conve:climatization_start_stop conve:command_accessibility conve:commands conve:diagnostics_engine_status conve:diagnostics_workshop conve:doors_status conve:engine_status conve:environment conve:fuel_status conve:honk_flash conve:lock conve:lock_status conve:navigation conve:odometer_status conve:trip_statistics conve:tyre_status conve:unlock conve:vehicle_relation conve:warnings conve:windows_status energy:battery_charge_level energy:charging_connection_status energy:charging_system_status energy:electric_range energy:estimated_charging_time energy:recharge_status vehicle:attributes"
     }
     auth = requests.post(OAUTH_URL, data=body, headers=headers)
     if auth.status_code == 200:
@@ -48,6 +52,7 @@ def authorize():
         refresh_token = data["refresh_token"]
 
         get_vehicles()
+        check_supported_endpoints()
     else:
         message = auth.json()
         raise Exception(message["error_description"])
@@ -57,14 +62,14 @@ def refresh_auth():
     print("Refreshing credentials")
     global refresh_token
     headers = {
-                "authorization": "Basic aDRZZjBiOlU4WWtTYlZsNnh3c2c1WVFxWmZyZ1ZtSWFEcGhPc3kxUENhVXNpY1F0bzNUUjVrd2FKc2U0QVpkZ2ZJZmNMeXc=",
-                "content-type": "application/x-www-form-urlencoded",
-                "accept": "application/json"
+        "authorization": "Basic aDRZZjBiOlU4WWtTYlZsNnh3c2c1WVFxWmZyZ1ZtSWFEcGhPc3kxUENhVXNpY1F0bzNUUjVrd2FKc2U0QVpkZ2ZJZmNMeXc=",
+        "content-type": "application/x-www-form-urlencoded",
+        "accept": "application/json"
     }
 
     body = {
-            "grant_type": "refresh_token",
-            "refresh_token": refresh_token
+        "grant_type": "refresh_token",
+        "refresh_token": refresh_token
     }
     auth = requests.post(OAUTH_URL, data=body, headers=headers)
     if auth.status_code == 200:
@@ -112,19 +117,19 @@ def get_vehicle_details(vin):
             if settings["debug"]:
                 print(response.text)
         device = {
-                            "identifiers": [f"volvoAAOS2mqtt_{vin}"],
-                            "manufacturer": "Volvo",
-                            "model": data['descriptions']['model'],
-                            "name": f"{data['descriptions']['model']} ({data['modelYear']}) - {vin}",
-                 }
+            "identifiers": [f"volvoAAOS2mqtt_{vin}"],
+            "manufacturer": "Volvo",
+            "model": data['descriptions']['model'],
+            "name": f"{data['descriptions']['model']} ({data['modelYear']}) - {vin}",
+        }
     elif response.status_code == 500 and not settings.volvoData["vin"]:
         # Workaround for some cars that are not returning vehicle details
         device = {
-                            "identifiers": [f"volvoAAOS2mqtt_{vin}"],
-                            "manufacturer": "Volvo",
-                            "model": vin,
-                            "name": f"Volvo - {vin}",
-                 }
+            "identifiers": [f"volvoAAOS2mqtt_{vin}"],
+            "manufacturer": "Volvo",
+            "model": vin,
+            "name": f"Volvo - {vin}",
+        }
     else:
         raise Exception("Getting vehicle details failed. Status Code: " + str(response.status_code) +
                         ". Error: " + response.text)
@@ -132,6 +137,28 @@ def get_vehicle_details(vin):
     return device
 
 
+def check_supported_endpoints():
+    global supported_endpoints
+    for vin in vins:
+        supported_endpoints[vin] = []
+        for entity in supported_entities:
+            if entity["id"] == "battery_charge_level" and entity["url"] == BATTERY_CHARGE_STATE_URL \
+                    and any("battery_charge_level" in d["id"] for d in supported_endpoints[vin]):
+                # If battery charge level could be found in recharge-api, skip the second battery charge sensor
+                continue
+
+            if entity.get('url'):
+                state = api_call(entity["url"], "GET", vin, entity["id"])
+            else:
+                state = ""
+
+            if state is not None:
+                print("Success! " + entity["name"] + " is supported by your vehicle.")
+                supported_endpoints[vin].append(entity)
+            else:
+                print("Failed, " + entity["name"] + " is unfortunately not supported by your vehicle.")
+
+
 def initialize_climate(vins):
     for vin in vins:
         mqtt.assumed_climate_state[vin] = "OFF"
@@ -157,6 +184,9 @@ def api_call(url, method, vin, sensor_id=None, force_update=False):
     elif url == LOCK_STATE_URL:
         # Minimize API calls for door state
         response = pull_door_api(url, method, vin, force_update)
+    elif url == TYRE_STATE_URL:
+        # Minimize API calls for tyre state
+        response = pull_tyre_api(url, method, vin, force_update)
     elif method == "GET":
         print("Starting " + method + " call against " + url)
         response = session.get(url.format(vin), timeout=15)
@@ -175,18 +205,34 @@ def api_call(url, method, vin, sensor_id=None, force_update=False):
     else:
         if url == CLIMATE_START_URL and response.status_code == 503:
             print("Car in use, cannot start pre climatization")
-            mqtt.assumed_climate_state = "OFF"
+            mqtt.assumed_climate_state[vin] = "OFF"
             mqtt.update_car_data()
         else:
             print("API Call failed. Status Code: " + str(response.status_code) + ". Error: " + response.text)
         return ""
-    state = parse_api_data(data, sensor_id)
-    if not state:
-        return ""
-    else:
-        return state
+    return parse_api_data(data, sensor_id)
 
 
+def pull_tyre_api(url, method, vin, force_update=False):
+    global tyre_cached_api_response, tyre_api_last_update
+    if not vin in tyre_cached_api_response or force_update:
+        # No API Data for vin cached, get fresh data from API
+        print("Starting " + method + " call against " + url)
+        response = session.get(url.format(vin), timeout=15)
+        tyre_cached_api_response[vin] = response
+        tyre_api_last_update[vin] = datetime.now()
+    else:
+        if (datetime.now() - tyre_api_last_update[vin]).total_seconds() >= settings["updateInterval"]:
+            # Old Data in Cache, updating
+            print("Starting " + method + " call against " + url)
+            response = session.get(url.format(vin), timeout=15)
+            tyre_cached_api_response[vin] = response
+            tyre_api_last_update[vin] = datetime.now()
+        else:
+            # Data is up do date, returning cached data
+            response = tyre_cached_api_response[vin]
+    return response
+
 
 def pull_door_api(url, method, vin, force_update=False):
     global door_cached_api_response, door_api_last_update
@@ -252,66 +298,80 @@ def pull_recharge_api(url, method, vin, force_update=False):
 
 
 def parse_api_data(data, sensor_id=None):
+    data = data["data"]
     if sensor_id == "battery_charge_level":
-        return data["data"].get("batteryChargeLevel").get("value")
+        return data["batteryChargeLevel"]["value"] if keys_exists(data, "batteryChargeLevel") else None
     elif sensor_id == "electric_range":
-        return data["data"].get("electricRange").get("value")
+        return data["electricRange"]["value"] if keys_exists(data, "electricRange") else None
     elif sensor_id == "charging_system_status":
-        if "chargingSystemStatus" in data["data"]:
-            return charging_system_states[data["data"].get("chargingSystemStatus").get("value")]
-        else:
-            return ""
+        return charging_system_states[data["chargingSystemStatus"]["value"]] if keys_exists(data, "chargingSystemStatus") else None
+    elif sensor_id == "charging_connection_status":
+        return charging_connection_states[data["chargingConnectionStatus"]["value"]] if keys_exists(data, "chargingConnectionStatus") else None
     elif sensor_id == "estimated_charging_time":
-        if "chargingSystemStatus" in data["data"]:
-            charging_system_state = charging_system_states[data["data"]["chargingSystemStatus"]["value"]]
+        if keys_exists(data, "chargingSystemStatus"):
+            charging_system_state = charging_system_states[data["chargingSystemStatus"]["value"]]
             if charging_system_state == "Charging":
-                return data["data"]["estimatedChargingTime"]["value"]
+                return data["estimatedChargingTime"]["value"] if keys_exists(data, "estimatedChargingTime") else ""
             else:
                 return 0
         else:
-            return ""
+            return None
     elif sensor_id == "estimated_charging_finish_time":
-        if "chargingSystemStatus" in data["data"]:
-            charging_system_state = charging_system_states[data["data"].get("chargingSystemStatus").get("value")]
+        if keys_exists(data, "chargingSystemStatus"):
+            charging_system_state = charging_system_states[data["chargingSystemStatus"]["value"]]
             if charging_system_state == "Charging":
-                charging_time = int(data["data"].get("estimatedChargingTime").get("value"))
+                charging_time = int(data["estimatedChargingTime"]["value"] if keys_exists(data, "estimatedChargingTime")
+                                    else 0)
                 charging_finished = datetime.now() + timedelta(minutes=charging_time)
                 return format_datetime(charging_finished, format="medium", locale=settings["babelLocale"])
             else:
-                return None
+                return ""
         else:
             return None
     elif sensor_id == "lock_status":
-        return data["data"].get("carLocked").get("value")
+        return data["carLocked"]["value"] if keys_exists(data, "carLocked") else None
     elif sensor_id == "odometer":
-        return data["data"].get("odometer").get("value")
+        return int(data["odometer"]["value"]) * 10 if keys_exists(data, "odometer") else None
     elif sensor_id == "window_front_left":
-        return data["data"].get("frontLeftWindowOpen").get("value")
+        return data["frontLeftWindowOpen"]["value"] if keys_exists(data, "frontLeftWindowOpen") else None
     elif sensor_id == "window_front_right":
-        return data["data"].get("frontRightWindowOpen").get("value")
+        return data["frontRightWindowOpen"]["value"] if keys_exists(data, "frontRightWindowOpen") else None
     elif sensor_id == "window_rear_left":
-        return data["data"].get("rearLeftWindowOpen").get("value")
+        return data["rearLeftWindowOpen"]["value"] if keys_exists(data, "rearLeftWindowOpen") else None
     elif sensor_id == "window_rear_right":
-        return data["data"].get("rearRightWindowOpen").get("value")
+        return data["rearRightWindowOpen"]["value"] if keys_exists(data, "rearRightWindowOpen") else None
     elif sensor_id == "door_front_left":
-        return data["data"].get("frontLeftDoorOpen").get("value")
+        return data["frontLeftDoorOpen"]["value"] if keys_exists(data, "frontLeftDoorOpen") else None
     elif sensor_id == "door_front_right":
-        return data["data"].get("frontRightDoorOpen").get("value")
+        return data["frontRightDoorOpen"]["value"] if keys_exists(data, "frontRightDoorOpen") else None
     elif sensor_id == "door_rear_left":
-        return data["data"].get("rearLeftDoorOpen").get("value")
+        return data["rearLeftDoorOpen"]["value"] if keys_exists(data, "rearLeftDoorOpen") else None
     elif sensor_id == "door_rear_right":
-        return data["data"].get("rearRightDoorOpen").get("value")
+        return data["rearRightDoorOpen"]["value"] if keys_exists(data, "rearRightDoorOpen") else None
     elif sensor_id == "tailgate":
-        return data["data"].get("tailGateOpen").get("value")
+        return data["tailGateOpen"]["value"] if keys_exists(data, "tailGateOpen") else None
     elif sensor_id == "engine_hood":
-        return data["data"].get("hoodOpen").get("value")
+        return data["hoodOpen"]["value"] if keys_exists(data, "hoodOpen") else None
     elif sensor_id == "tank_lid":
-        return data["data"].get("tankLidOpen").get("value")
+        return data["tankLidOpen"]["value"] if keys_exists(data, "tankLidOpen") else None
+    elif sensor_id == "tyre_front_left":
+        return data["frontLeftTyrePressure"]["value"] if keys_exists(data, "frontLeftTyrePressure") else None
+    elif sensor_id == "tyre_front_right":
+        return data["frontRightTyrePressure"]["value"] if keys_exists(data, "frontRightTyrePressure") else None
+    elif sensor_id == "tyre_rear_left":
+        return data["rearLeftTyrePressure"]["value"] if keys_exists(data, "rearLeftTyrePressure") else None
+    elif sensor_id == "tyre_rear_right":
+        return data["rearRightTyrePressure"]["value"] if keys_exists(data, "rearRightTyrePressure") else None
+    elif sensor_id == "engine_state":
+        return data["engineRunning"]["value"] if keys_exists(data, "engineRunning") else None
     elif sensor_id == "location":
         coordinates = {}
-        if "geometry" in data["data"]:
-            raw_data = data["data"].get("geometry").get("coordinates")
-            coordinates = {"longitude": raw_data[0], "latitude": raw_data[1], "gps_accuracy": 1}
+        if keys_exists(data, "geometry"):
+            raw_data = data["geometry"]
+            if keys_exists(raw_data, "coordinates"):
+                coordinates = {"longitude": raw_data["coordinates"][0],
+                               "latitude": raw_data["coordinates"][1],
+                               "gps_accuracy": 1}
         return coordinates
     else:
-        return ""
+        return None