Bump version

Added docker-compose.yml example

.env.dist

@@ -0,0 +1,5 @@
+CONF_updateInterval=300
+CONF_babelLocale='de'
+CONF_mqtt='@json {"broker": "mqtt", "username": "", "password": ""}'
+CONF_volvoData='@json {"username": "", "password": "", "vin": "",   "vccapikey": ""}'
+TZ='Europe/Berlin'

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: Dielee
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Version info**
+The version you are using and the method you are using (Docker container/HA Addon/Cloned repo)
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.gitignore

@@ -1,3 +1,4 @@
 .idea
 venv
-src/settings.dev.json
+src/settings.dev.json
+.env

README.md

@@ -5,11 +5,14 @@ Maybe this component works also with other Volvo cars. Please try out the native
 
 ## Confirmed working with
 - XC40 BEV (2023)
+- XC40 BEV (2022)
 - V60 T8 PHEV (2023)
 - C40 PHEV (2023)
 - 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!
 
@@ -19,7 +22,15 @@ Please let me know if your car works with this addon so I can expand the list!
 - Sensor "Battery Charge Level"
 - Sensor "Electric Range"
 - Sensor "Charging System Status"
+- Sensor "Charging Connection Status"
 - Sensor "Estimated Charging Finish Time"
+- Sensor "Door Lock Status"
+- Sensor "Engine Status"
+- Sensor "Window Lock Status"
+- Sensor "Odometer"
+- Sensor "Tire Status"
+- Sensor "Fuel Status"
+- Car Device Tracker
 - Multiple cars
 
 NOTE: Energy status currently available only for cars in the Europe / Middle East / Africa regions. [source](https://developer.volvocars.com/apis/energy/v1/overview/#availability)
@@ -30,7 +41,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": "", "odometerMultiplier": 1}' -e TZ='Europe/Berlin' --name volvo2mqtt ghcr.io/dielee/volvo2mqtt:latest`
 
 <b>HA Add-On:</b><br>
 
@@ -43,7 +54,7 @@ Here is what every option means:
 | `CONF_updateInterval`     | `int`     | **required** | Update intervall in seconds.                                     |
 | `CONF_babelLocale`        | `string`  | **required** | Select your country from this [list](https://www.ibm.com/docs/en/radfws/9.7?topic=overview-locales-code-pages-supported). "Locale name" is the column you need!                                        |
 | `CONF_mqtt`               | `json`    | **required** | Broker = Mqtt Broker IP / Username and Passwort are optional!   |
-| `CONF_volvoData`          | `json`    | **required** | Username and password are REQUIRED. Car vin can be a single vin or a list of multiple vins like `["vin1", "vin2"]`. If no vin is provided, <b>ALL</b> of your vehicles will be used. Vccapi key is REQUIRED. Get your Vccapi key from [here](https://developer.volvocars.com/account/).                                   |
+| `CONF_volvoData`          | `json`    | **required** | Username and password are REQUIRED. Car vin can be a single vin or a list of multiple vins like `["vin1", "vin2"]`. If no vin is provided, <b>ALL</b> of your vehicles will be used. Vccapi key is REQUIRED. Get your Vccapi key from [here](https://developer.volvocars.com/account/). Odometer Multiplier is sometimes 10, sometimes 1. Try what's right for your car. If you leave it empty, the multiplier will be 1.                                 |
 | `CONF_debug`              | `string`  |              | Debug option (true/false) - optional! |
 | `TZ`                 | `string`  |              | Container timezone eg "Europe/Berlin" |
 

docker-compose.yml

@@ -0,0 +1,24 @@
+version: '3'
+services:
+  app:
+    build: .
+    env_file:
+      - .env
+    #    environment:
+    #      CONF_updateInterval: 300
+    #      CONF_babelLocale: 'de'
+    #      CONF_mqtt: '@json {"broker": "mqtt", "username": "", "password": ""}'
+    #      CONF_volvoData: '@json {"username": "", "password": "", "vin": "",   "vccapikey": ""}'
+    #      TZ: 'Europe/Berlin'
+    links:
+      - mqtt
+    depends_on:
+      - mqtt
+
+  mqtt:
+    container_name: mqtt
+    image: eclipse-mosquitto
+    expose:
+      - 1883
+    command: [ "/usr/sbin/mosquitto", "-c", "/mosquitto-no-auth.conf" ]
+

src/config.yaml

@@ -1,6 +1,6 @@
 name: "Volvo2Mqtt"
 description: "Volvo AAOS MQTT bridge"
-version: "1.2.0"
+version: "1.4.0"
 slug: "volvo2mqtt"
 init: false
 url: "https://github.com/Dielee/volvo2mqtt"
@@ -18,6 +18,7 @@ options:
     password: null
     vin: ""
     vccapikey: null
+    odometerMultiplier: 1
 schema:
   updateInterval: int(10,)
   babelLocale: str
@@ -31,6 +32,7 @@ schema:
     password: str
     vin: str?
     vccapikey: str
+    odometerMultiplier: int(1,)
 arch:
   - aarch64
   - amd64

src/const.py

@@ -1,6 +1,6 @@
 from config import settings
 
-VERSION = "v1.2.0"
+VERSION = "v1.4.0"
 
 OAUTH_URL = "https://volvoid.eu.volvocars.com/as/token.oauth2"
 VEHICLES_URL = "https://api.volvocars.com/connected-vehicle/v1/vehicles"
@@ -14,43 +14,46 @@ 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"
+FUEL_STATE_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/fuel"
 
 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": "Tire Front Left", "domain": "sensor", "id": "tyre_front_left", "icon": "car-tire-alert", "url": TYRE_STATE_URL},
+                        {"name": "Tire Front Right", "domain": "sensor", "id": "tyre_front_right", "icon": "car-tire-alert", "url": TYRE_STATE_URL},
+                        {"name": "Tire Rear Left", "domain": "sensor", "id": "tyre_rear_left", "icon": "car-tire-alert", "url": TYRE_STATE_URL},
+                        {"name": "Tire 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},
+                        {"name": "Fuel Level", "domain": "sensor", "id": "fuel_level", "unit": "liters", "icon": "fuel", "url": FUEL_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/main.py

@@ -2,6 +2,7 @@ from volvo import authorize
 from mqtt import update_loop, connect
 from const import VERSION
 
+
 if __name__ == '__main__':
     print("Starting volvo2mqtt version " + VERSION)
     authorize()

src/mqtt.py

@@ -7,16 +7,14 @@ 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
 subscribed_topics = []
 assumed_climate_state = {}
 last_data_update = None
-climate_timer: Timer
+climate_timer = {}
 
 
 def connect():
@@ -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[vin] = Timer(30 * 60, volvo.disable_climate, (vin, ))
+            climate_timer[vin].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[vin].is_alive():
+                climate_timer[vin].cancel()
+            update_car_data()
+    elif "lock_status" in msg.topic:
+        if payload == "LOCK":
+            volvo.api_call(CAR_LOCK_URL, "POST", vin)
+            update_car_data(True)
+        elif payload == "UNLOCK":
+            volvo.api_call(CAR_UNLOCK_URL, "POST", vin)
+            update_car_data(True)
+    elif "update_data" in msg.topic:
+        if payload == "PRESS":
+            update_car_data(True)
 
 
 def update_loop():
@@ -90,137 +92,57 @@ 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": 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": 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": 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": 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": 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),
+                retain=True
             )
     time.sleep(2)

src/translations/en.yaml

@@ -13,4 +13,4 @@ configuration:
     description: Broker is your mqtt broker IP eg "192.168.0.1". Mqtt username and password are optional.
   volvoData:
     name: Volvo APP credentials
-    description: You have to enter your Volvo app credentials. The username is normally your email, and the password is the password you use for your Volvo app. The vin can stay empty. The Add-On will use any vin inside your Volvo account. VCCAPI key is required and comes from your Volvo developer account. Take a look at the GitHub repo for more information!
+    description: You have to enter your Volvo app credentials. The username is normally your email, and the password is the password you use for your Volvo app. The vin can stay empty. The Add-On will use any vin inside your Volvo account. VCCAPI key is required and comes from your Volvo developer account. Odometer multiplier is sometimes 10, sometimes 1. Leave it empty if you don't know what's right. Take a look at the GitHub repo for more information!

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,40 +3,37 @@ 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
 refresh_token = None
 vins = []
-recharge_cached_api_response = {}
-recharge_api_last_update = {}
-window_cached_api_response = {}
-window_api_last_update = {}
-door_cached_api_response = {}
-door_api_last_update = {}
+supported_endpoints = {}
+cached_requests = {}
 
 
 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 +45,7 @@ def authorize():
         refresh_token = data["refresh_token"]
 
         get_vehicles()
+        check_supported_endpoints()
     else:
         message = auth.json()
         raise Exception(message["error_description"])
@@ -57,14 +55,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 +110,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 +130,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"
@@ -150,19 +170,42 @@ def api_call(url, method, vin, sensor_id=None, force_update=False):
 
     if url == RECHARGE_STATE_URL:
         # Minimize API calls for recharge state
-        response = pull_recharge_api(url, method, vin, force_update)
+        response = cached_request(url, method, vin, force_update)
+        if response is None:
+            # Exception caught while getting data from volvo api, doing nothing
+            return None
     elif url == WINDOWS_STATE_URL:
         # Minimize API calls for window state
-        response = pull_window_api(url, method, vin, force_update)
+        response = cached_request(url, method, vin, force_update)
+        if response is None:
+            # Exception caught while getting data from volvo api, doing nothing
+            return ""
     elif url == LOCK_STATE_URL:
         # Minimize API calls for door state
-        response = pull_door_api(url, method, vin, force_update)
+        response = cached_request(url, method, vin, force_update)
+        if response is None:
+            # Exception caught while getting data from volvo api, doing nothing
+            return ""
+    elif url == TYRE_STATE_URL:
+        # Minimize API calls for tyre state
+        response = cached_request(url, method, vin, force_update)
+        if response is None:
+            # Exception caught while getting data from volvo api, doing nothing
+            return ""
     elif method == "GET":
         print("Starting " + method + " call against " + url)
-        response = session.get(url.format(vin), timeout=15)
+        try:
+            response = session.get(url.format(vin), timeout=15)
+        except requests.exceptions.RequestException as e:
+            print("Error getting data: " + str(e))
+            return ""
     elif method == "POST":
         print("Starting " + method + " call against " + url)
-        response = session.post(url.format(vin), timeout=20)
+        try:
+            response = session.post(url.format(vin), timeout=20)
+        except requests.exceptions.RequestException as e:
+            print("Error getting data: " + str(e))
+            return ""
     else:
         print("Unkown method posted: " + method + ". Returning nothing")
         return ""
@@ -175,7 +218,7 @@ 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)
@@ -183,139 +226,123 @@ def api_call(url, method, vin, sensor_id=None, force_update=False):
     return parse_api_data(data, sensor_id)
 
 
-def pull_door_api(url, method, vin, force_update=False):
-    global door_cached_api_response, door_api_last_update
-    if not vin in door_cached_api_response or force_update:
-        # No API Data for vin cached, get fresh data from API
+def cached_request(url, method, vin, force_update=False):
+    global cached_requests
+    if not keys_exists(cached_requests, vin + "_" + url):
+        # No API Data cached, get fresh data from API
         print("Starting " + method + " call against " + url)
-        response = session.get(url.format(vin), timeout=15)
-        door_cached_api_response[vin] = response
-        door_api_last_update[vin] = datetime.now()
-    else:
-        if (datetime.now() - door_api_last_update[vin]).total_seconds() >= settings["updateInterval"]:
-            # Old Data in Cache, updating
-            print("Starting " + method + " call against " + url)
+        try:
             response = session.get(url.format(vin), timeout=15)
-            door_cached_api_response[vin] = response
-            door_api_last_update[vin] = datetime.now()
+        except requests.exceptions.RequestException as e:
+            print("Error getting data: " + str(e))
+            return None
+
+        data = {"response": response, "last_update": datetime.now()}
+        cached_requests[vin + "_" + url] = data
+    else:
+        if (datetime.now() - cached_requests[vin + "_" + url]["last_update"]).total_seconds() >= settings["updateInterval"] \
+                or (force_update and (datetime.now() - cached_requests[vin + "_" + url]["last_update"]).total_seconds() >= 2):
+            # Old Data in Cache, or force mode active, updating
+            print("Starting " + method + " call against " + url)
+            try:
+                response = session.get(url.format(vin), timeout=15)
+            except requests.exceptions.RequestException as e:
+                print("Error getting data: " + str(e))
+                return None
+            data = {"response": response, "last_update": datetime.now()}
+            cached_requests[vin + "_" + url] = data
         else:
             # Data is up do date, returning cached data
-            response = door_cached_api_response[vin]
-    return response
-
-
-def pull_window_api(url, method, vin, force_update=False):
-    global window_cached_api_response, window_api_last_update
-    if not vin in window_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)
-        window_cached_api_response[vin] = response
-        window_api_last_update[vin] = datetime.now()
-    else:
-        if (datetime.now() - window_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)
-            window_cached_api_response[vin] = response
-            window_api_last_update[vin] = datetime.now()
-        else:
-            # Data is up do date, returning cached data
-            response = window_cached_api_response[vin]
-    return response
-
-
-def pull_recharge_api(url, method, vin, force_update=False):
-    global recharge_cached_api_response, recharge_api_last_update
-    if not vin in recharge_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)
-        recharge_cached_api_response[vin] = response
-        recharge_api_last_update[vin] = datetime.now()
-    else:
-        if (datetime.now() - recharge_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)
-            recharge_cached_api_response[vin] = response
-            recharge_api_last_update[vin] = datetime.now()
-        else:
-            # Data is up do date, returning cached data
-            response = recharge_cached_api_response[vin]
+            response = cached_requests[vin + "_" + url]["response"]
     return response
 
 
 def parse_api_data(data, sensor_id=None):
+    data = data["data"]
     if sensor_id == "battery_charge_level":
-        if "batteryChargeLevel" in data["data"]:
-            return data["data"]["batteryChargeLevel"]["value"]
-        else:
-            return ""
+        return data["batteryChargeLevel"]["value"] if keys_exists(data, "batteryChargeLevel") else None
     elif sensor_id == "electric_range":
-        if "electricRange" in data["data"]:
-            return data["data"]["electricRange"]["value"]
-        else:
-            return ""
+        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"]["chargingSystemStatus"]["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"]["chargingSystemStatus"]["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"]["estimatedChargingTime"]["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"]["carLocked"]["value"]
+        return data["carLocked"]["value"] if keys_exists(data, "carLocked") else None
     elif sensor_id == "odometer":
-        return data["data"]["odometer"]["value"]
+        multiplier = 1
+        if keys_exists(settings["volvoData"], "odometerMultiplier"):
+            multiplier = settings["volvoData"]["odometerMultiplier"]
+            if isinstance(multiplier, str):
+                multiplier = 1
+            elif multiplier < 1:
+                multiplier = 1
+        return int(data["odometer"]["value"]) * multiplier if keys_exists(data, "odometer") else None
     elif sensor_id == "window_front_left":
-        return data["data"]["frontLeftWindowOpen"]["value"]
+        return data["frontLeftWindowOpen"]["value"] if keys_exists(data, "frontLeftWindowOpen") else None
     elif sensor_id == "window_front_right":
-        return data["data"]["frontRightWindowOpen"]["value"]
+        return data["frontRightWindowOpen"]["value"] if keys_exists(data, "frontRightWindowOpen") else None
     elif sensor_id == "window_rear_left":
-        return data["data"]["rearLeftWindowOpen"]["value"]
+        return data["rearLeftWindowOpen"]["value"] if keys_exists(data, "rearLeftWindowOpen") else None
     elif sensor_id == "window_rear_right":
-        return data["data"]["rearRightWindowOpen"]["value"]
+        return data["rearRightWindowOpen"]["value"] if keys_exists(data, "rearRightWindowOpen") else None
     elif sensor_id == "door_front_left":
-        return data["data"]["frontLeftDoorOpen"]["value"]
+        return data["frontLeftDoorOpen"]["value"] if keys_exists(data, "frontLeftDoorOpen") else None
     elif sensor_id == "door_front_right":
-        return data["data"]["frontRightDoorOpen"]["value"]
+        return data["frontRightDoorOpen"]["value"] if keys_exists(data, "frontRightDoorOpen") else None
     elif sensor_id == "door_rear_left":
-        return data["data"]["rearLeftDoorOpen"]["value"]
+        return data["rearLeftDoorOpen"]["value"] if keys_exists(data, "rearLeftDoorOpen") else None
     elif sensor_id == "door_rear_right":
-        return data["data"]["rearRightDoorOpen"]["value"]
+        return data["rearRightDoorOpen"]["value"] if keys_exists(data, "rearRightDoorOpen") else None
     elif sensor_id == "tailgate":
-        return data["data"]["tailGateOpen"]["value"]
+        return data["tailGateOpen"]["value"] if keys_exists(data, "tailGateOpen") else None
     elif sensor_id == "engine_hood":
-        return data["data"]["hoodOpen"]["value"]
+        return data["hoodOpen"]["value"] if keys_exists(data, "hoodOpen") else None
     elif sensor_id == "tank_lid":
-        if "tankLidOpen" in data["data"]:
-            return data["data"]["tankLidOpen"]["value"]
-        else:
-            return ""
+        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 == "fuel_level":
+        return data["fuelAmount"]["value"] if keys_exists(data, "fuelAmount") else None
     elif sensor_id == "location":
         coordinates = {}
-        if "geometry" in data["data"]:
-            raw_data = data["data"]["geometry"]["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