Change version for addon

.github/workflows/build_image.yml

@@ -27,20 +27,20 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3  
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
       - name: Log in to the Container registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
@@ -52,7 +52,7 @@ jobs:
             type=semver,pattern={{major}}
             type=sha
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v2
         with:
           context: .
           platforms: linux/amd64,linux/arm/v7,linux/arm/v6,linux/arm/v8

README.md

@@ -26,7 +26,6 @@ If you like my work:<br>
 - XC40 BEV (2022)
 - XC40 PHEV (2021)
 - V60 T8 PHEV (2023)
-- V60 T6 PHEV (2025)
 - C40 BEV (2023)
 - C40 BEV (2022)
 - C40 BEV (2024)
@@ -41,7 +40,6 @@ If you like my work:<br>
 - V90 PHEV T8 (2019)*
 - V90 PHEV T6 (2024)
 - V90 B5 Mildhybrid (2023)
-- EX40 BEV (2025)
 
 *only partly working
 
@@ -52,10 +50,9 @@ Please let me know if your car works with this addon so I can expand the list!<b
 - Lock/unlock car
 - Start/stop climate
 - Sensor "Battery Charge Level"
-- Sensor "Battery Capacity"
 - Sensor "Electric Range"
 - Sensor "Charging System Status"
-- Sensor "Charging Connection Status"
+- Sensor "Charging Connection Status" (partly broken since 2.10 car update)
 - Sensor "Estimated Charging Finish Time"
 - Sensor "Door Lock Status (All doors, tank lid, and engine hood)"
 - Sensor "Window Lock Status (All windows and sunroof - Thanks to @navet)"
@@ -89,36 +86,8 @@ The following steps are required for authentication in exactly this order:
 ```etc ...```
 4. Now, open your mailbox and copy your OTP Code
 5. Open HomeAssistant and search for the entity ID ```text.volvo_otp```
-6. Paste your OTP into the text entity and **<ins>press Enter</ins>**<br>
+6. Paste your OTP into the text entity and press Enter
-   6a. (optional) If your OTP cannot be safed, try to paste your OTP code via MQTT to the following topic: `volvoAAOS2mqtt/otp_code` <p>
+7. If everything has worked, your addon is now authenticated. In the future, OTP authentication only needs to be done when updating, not when restarting the container.
-       <details>
-             <summary>OTP Post Script</summary>
-             <div>
-                <p>
-                1. Safe the following script in your script section <br>
-                2. Go to https://yourHAUrl/developer-tools/service<br>
-                3. Search for "Post Volvo OTP"<br>
-                4. Tick "OTP" and fill in your OTP<br>
-                5. Run this service<br>
-             </div>
-       
-            alias: Post Volvo OTP
-            sequence:
-              - service: mqtt.publish
-                metadata: {}
-                data:
-                  topic: volvoAAOS2mqtt/otp_code
-                  payload: "{{ otp }}"
-            mode: single
-            fields:
-              otp:
-                selector:
-                  text: null
-                name: OTP
-                description: Volvo OTP
-   
-   </details>
-8. If everything has worked, your addon is now authenticated. In the future, OTP authentication only needs to be done when updating, not when restarting the container.
 
 ## Setup
 <b>Docker:</b>
@@ -126,7 +95,7 @@ The following steps are required for authentication in exactly this order:
 Just install this addon with the following command.
 Please note to fill in your settings inside the environment variables.
 
-`docker run -d --pull=always -e CONF_updateInterval=300 -e CONF_babelLocale='de' -e CONF_mqtt='@json {"broker": "", "username": "", "password": "", "port": 1883}' -e CONF_volvoData='@json {"username": "", "password": "", "vin": "", "vccapikey": ["key1", "key2"]}' -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": "", "port": 1883}' -e CONF_volvoData='@json {"username": "", "password": "", "vin": "", "vccapikey": ["key1", "key2"], "odometerMultiplier": 1, "averageSpeedDivider": 1, "averageFuelConsumptionMultiplier": 1}' -e TZ='Europe/Berlin' --name volvo2mqtt ghcr.io/dielee/volvo2mqtt:latest`
 
 <b>HA Add-On:</b><br>
 
@@ -146,6 +115,9 @@ Here is what every option means:
 | `CONF_volvoData`          | `json`    | `password`                            | **required** | Your password to login into the Volvo App.
 | `CONF_volvoData`          | `json`    | `vin`                                 | optional     | A single VIN like "VIN1" or a list of VINs like "["VIN1", "VIN2"]". Leave this empty if you don't know your VIN. The addon will use every car that is tied to your account.
 | `CONF_volvoData`          | `json`    | `vccapikey`                           | **required** | VCCAPIKEY linked with your volvo developer account. Get your Vccapi key from [here](https://developer.volvocars.com/account/). <b>Starting version 1.8.0, it is possible to define multiple keys, like this: `["vccapikey1", "vccapikey2", "vccapikey3", "etc..."]`</b>
+| `CONF_volvoData`          | `json`    | `odometerMultiplier`                  | optional     | The multiplier value for the odometer value, as the volvo api delivers inconsistent data. For some cars this setting is 10, for some 1. Try what's right for your car. If you leave it empty, the multiplier will be 1.
+| `CONF_volvoData`          | `json`    | `averageSpeedDivider`                 | optional     | The divider value for the average speed value, as the volvo api delivers inconsistent data. For some cars this setting is 10, for some 1. Try what's right for your car. If you leave it empty, the divider will be 1.
+| `CONF_volvoData`          | `json`    | `averageFuelConsumptionMultiplier`    | optional     | The multiplier value for the average fuel consumption value, as the volvo api delivers inconsistent data. For some cars this setting is 10, for some 1. Try what's right for your car. If you leave it empty, the multiplier will be 1.
 | `CONF_debug`              | `string`  |                                       | optional     | Debug option (true/false). Normally you don't need this. |
 | `TZ`                      | `string`  |                                       | **required** | Container timezone eg "Europe/Berlin" from [here](https://docs.diladele.com/docker/timezones.html)|
 

requirements.txt

@@ -1,4 +1,4 @@
-requests~=2.32.0
+requests~=2.31.0
 dynaconf~=3.1.12
 paho-mqtt~=1.6.1
 Babel~=2.12.1

src/CHANGELOG.md

@@ -1,79 +1,3 @@
-## v1.10.1
-### 🚀 Features:
-
-- Optimize logging for vcc-api-key check #238
-
-## v1.10.0
-### 🚀 Features:
-
-- Remove unused multiplier options
-
-### 🐛 Bug Fixes:
-
-- Support new statistic keys #237
-
-## v1.9.7
-### 🐛 Bug Fixes:
-
-- Fix EX30 battery state #230
-
-## v1.9.6
-### 🐛 Bug Fixes:
-
-- Fixed interior and exterior Images #219
-- Take care of broken token files #220
-
-## v1.9.5
-### 🚀 Features:
-
-- Added "retain" states to survive HA reboot
-
-## v1.9.4
-### 🐛 Bug Fixes:
-
-- Fix backend state API url
-
-## v1.9.3
-### 🐛 Bug Fixes:
-
-- Ignore retained OTP messages #193
-
-## v1.9.2
-### 🐛 Bug Fixes:
-
-- Try to fix OTP Input
-- Fix `SyntaxWarning: invalid escape sequence '\d'` #196 
-
-## v1.9.1
-### 🚀 Features:
-
-- The token file now survives an HA addon update/restart
-
-### 🐛 Bug Fixes:
-
-- Extend OTP retry time to 120 seconds
-
-## v1.9.0
-### ⚠️ Breaking change 
-### 🚀 Features:
-
-- Add "Battery Capacity" sensor. Thanks to @gurtjun!
-- OTP Auth
-        This addon uses the same OTP authentication as the Volvo app, now. 
-        The following steps are required for authentication in exactly this order:
-        
-        1. Setup volvo2Mqtt, either via Docker, or via HA addon (take a look at the "Setup" section)
-        2. Fill in your settings and start volvo2Mqtt
-        3. Your log will show the following lines
-        Waiting for otp code... Please check your mailbox and post your otp code to the following mqtt topic "volvoAAOS2mqtt/otp_code". Retry 0/15
-        Waiting for otp code... Please check your mailbox and post your otp code to the following mqtt topic "volvoAAOS2mqtt/otp_code". Retry 1/15
-        etc ...
-        4. Now, open your mailbox and copy your OTP Code
-        5. Open HomeAssistant and search for the entity ID text.volvo_otp
-        6. Paste your OTP into the text entity and press Enter
-        7. If everything has worked, your addon is now authenticated. In the future, OTP authentication only needs to be done when updating, not when restarting the container.
-
-
 ## v1.8.27
 ### 🚀 Features:
 

src/Dockerfile

@@ -1,9 +1,6 @@
 ARG BUILD_FROM
 FROM $BUILD_FROM
 
-# Add community packets
-RUN echo -e "https://nl.alpinelinux.org/alpine/latest-stable/main\nhttps://nl.alpinelinux.org/alpine/latest-stable/community" > /etc/apk/repositories
-
 # Install requirements for add-on
 RUN apk add --no-cache python3 bash py3-pip
 
@@ -21,4 +18,4 @@ COPY / .
 RUN chmod a+x /volvoAAOS2mqtt/run.sh
 
 # command to run on container start
-CMD [ "/volvoAAOS2mqtt/run.sh" ]
+CMD [ "/volvoAAOS2mqtt/run.sh" ]

src/config.yaml

@@ -1,6 +1,6 @@
 name: "Volvo2Mqtt"
 description: "Volvo AAOS MQTT bridge"
-version: "1.10.1"
+version: "1.9.0"
 slug: "volvo2mqtt"
 init: false
 url: "https://github.com/Dielee/volvo2mqtt"
@@ -47,6 +47,9 @@ schema:
     vin: str?
     vccapikey:
         - match(^\b\w{32}\b$)
+    odometerMultiplier: int(1,)
+    averageSpeedDivider: int(1,)
+    averageFuelConsumptionMultiplier: int(1,)
 arch:
   - aarch64
   - amd64

src/const.py

@@ -1,6 +1,6 @@
 from config import settings
 
-VERSION = "v1.10.1"
+VERSION = "v1.9.0"
 
 OAUTH_TOKEN_URL = "https://volvoid.eu.volvocars.com/as/token.oauth2"
 OAUTH_AUTH_URL = "https://volvoid.eu.volvocars.com/as/authorization.oauth2"
@@ -22,7 +22,7 @@ STATISTICS_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/st
 ENGINE_DIAGNOSTICS_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/engine"
 VEHICLE_DIAGNOSTICS_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/diagnostics"
 WARNINGS_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/warnings"
-API_BACKEND_STATUS = "https://public-developer-portal-bff.weu-prod.ecpaz.volvocars.biz/api/v1/backend-status"
+API_BACKEND_STATUS = "https://oip-dev-bff.euwest1.production.volvo.care/api/v1/backend-status"
 
 LENGTH_KILOMETERS = "km"
 SPEED_KILOMETERS_PER_HOUR = "km/h"
@@ -75,24 +75,23 @@ icon_states = {
     "door_rear_right": {"ON": "car-door", "OFF": "car-door-lock"},
     "engine_state": {"ON": "engine-outline", "OFF": "engine-off-outline"},
     "battery_charge_level": [
-                    {"from": float('inf'), "to": 100, "icon": "battery"},
+                    {"from": 100, "to": 100, "icon": "battery"},
-                    {"from": 100, "to": 90, "icon": "battery-90"},
+                    {"from": 99, "to": 90, "icon": "battery-90"},
-                    {"from": 90, "to": 80, "icon": "battery-80"},
+                    {"from": 89, "to": 80, "icon": "battery-80"},
-                    {"from": 80, "to": 70, "icon": "battery-70"},
+                    {"from": 79, "to": 70, "icon": "battery-70"},
-                    {"from": 70, "to": 60, "icon": "battery-60"},
+                    {"from": 69, "to": 60, "icon": "battery-60"},
-                    {"from": 60, "to": 50, "icon": "battery-50"},
+                    {"from": 59, "to": 50, "icon": "battery-50"},
-                    {"from": 50, "to": 40, "icon": "battery-40"},
+                    {"from": 49, "to": 40, "icon": "battery-40"},
-                    {"from": 40, "to": 30, "icon": "battery-30"},
+                    {"from": 39, "to": 30, "icon": "battery-30"},
-                    {"from": 30, "to": 20, "icon": "battery-20"},
+                    {"from": 29, "to": 20, "icon": "battery-20"},
-                    {"from": 20, "to": 10, "icon": "battery-10"},
+                    {"from": 19, "to": 10, "icon": "battery-10"},
-                    {"from": 10, "to": 0, "icon": "battery-alert-variant-outline"},
+                    {"from": 9, "to": 0, "icon": "battery-alert-variant-outline"},
     ]
 }
 
 supported_entities = [
                         {"name": "Battery Charge Level", "domain": "sensor", "device_class": "battery", "id": "battery_charge_level", "unit": "%", "icon": "car-battery", "url": RECHARGE_STATE_URL, "state_class": "measurement"},
                         {"name": "Battery Charge Level", "domain": "sensor", "device_class": "battery", "id": "battery_charge_level", "unit": "%", "icon": "car-battery", "url": FUEL_BATTERY_STATE_URL, "state_class": "measurement"},
-                        {"name": "Battery Capacity", "domain": "sensor", "device_class": "energy_storage", "id": "battery_capacity", "unit": ENERGY_KILO_WATT_HOUR, "icon": "car-battery", "url": VEHICLE_DETAILS_URL, "state_class": "measurement"},
                         {"name": "Electric Range", "domain": "sensor", "id": "electric_range", "unit": LENGTH_KILOMETERS if not units.get(settings["babelLocale"]) else units[settings["babelLocale"]]["electric_range"]["unit"], "icon": "map-marker-distance", "url": RECHARGE_STATE_URL, "state_class": "measurement"},
                         {"name": "Estimated Charging Time", "domain": "sensor", "id": "estimated_charging_time", "unit": TIME_MINUTES, "icon": "timer-sync-outline", "url": RECHARGE_STATE_URL, "state_class": "measurement"},
                         {"name": "Charging System Status", "domain": "sensor", "id": "charging_system_status", "icon": "ev-station", "url": RECHARGE_STATE_URL},
@@ -139,5 +138,5 @@ supported_entities = [
 ]
 
 old_entity_ids = ["months_to_service", "service_warning_trigger", "distance_to_empty"]
-otp_max_loops = 24
+otp_max_loops = 15
 otp_mqtt_topic = "volvoAAOS2mqtt/otp_code"

src/mqtt.py

@@ -5,7 +5,6 @@ import json
 import volvo
 import util
 import os
-import requests
 from threading import Thread, Timer
 from datetime import datetime
 from babel.dates import format_datetime
@@ -48,51 +47,38 @@ def connect():
 
 
 def create_otp_input():
-    state_topic = otp_mqtt_topic + "/state"
     config = {
         "name": "Volvo OTP",
         "object_id": f"volvo_otp",
         "schema": "state",
         "command_topic": otp_mqtt_topic,
-        "state_topic": state_topic,
+        "unique_id": f"volvoAAOS2mqtt_otp",
-        "unique_id": "volvoAAOS2mqtt_otp",
+        "pattern": "\d{6}",
-        "pattern": r"\d{6}",
+        "icon": "mdi:two-factor-authentication"
-        "icon": "mdi:two-factor-authentication",
-        "mode": "text"
     }
 
     mqtt_client.publish(
-        "homeassistant/text/volvoAAOS2mqtt/volvo_otp/config",
+        f"homeassistant/text/volvoAAOS2mqtt/volvo_otp/config",
         json.dumps(config),
         retain=True
     )
 
-    mqtt_client.publish(
+def delete_otp_input():
-        state_topic,
+    topic = "homeassistant/text/volvoAAOS2mqtt/volvo_otp/config"
-        "000000",
+    mqtt_client.publish(topic, payload="", retain=True)
-        retain=True
-    )
-
-def set_otp_state():
-    mqtt_client.publish(
-        otp_mqtt_topic + "/state",
-        otp_code,
-        retain=True
-    )
 
 
 def send_car_images(vin, data, device):
     if util.keys_exists(data, "images"):
         for entity in [{"name": "Exterior Image", "id": "exterior_image"},
                        {"name": "Interior Image", "id": "interior_image"}]:
-            image_topic = f"homeassistant/image/{vin}_{entity['id']}/image_topic"
+            url_topic = f"homeassistant/image/{vin}_{entity['id']}/image_url"
             config = {
                 "name": entity["name"],
                 "object_id": f"volvo_{vin}_{entity['id']}",
                 "schema": "state",
                 "icon": "mdi:image-area",
-                "content_type": "image/png",
+                "url_topic": url_topic,
-                "image_topic": image_topic,
                 "device": device,
                 "unique_id": f"volvoAAOS2mqtt_{vin}_{entity['id']}",
                 "availability_topic": availability_topic
@@ -104,41 +90,19 @@ def send_car_images(vin, data, device):
                 retain=True
             )
 
-            headers = {"User-Agent": "(Windows NT 10.0; Win64; x64)",
-                       "sec-ch-ua-platform": "\"Windows\"", "sec-fetch-dest": "document", "Accept-Encoding": "gzip, deflate, br, zstd",
-                       "sec-fetch-mode": "navigate", "sec-fetch-site": "none", "sec-fetch-user": "?1", "upgrade-insecure-requests": "1"}
-
-            # Post exterior image
             if entity["id"] == "exterior_image":
-                if not os.path.exists("exterior_image.png"):
+                mqtt_client.publish(
-                    response = requests.get(data["images"]["exteriorImageUrl"], headers=headers)
+                    url_topic,
-                    if response.status_code == 200:
+                    data["images"]["exteriorImageUrl"],
-                        with open("exterior_image.png", 'wb') as image:
+                    retain=True
-                            image.write(response.content)
+                )
-
-                if os.path.exists("exterior_image.png"):
-                    ext_image = open("exterior_image.png", mode="rb").read()
-                    mqtt_client.publish(
-                        image_topic,
-                        ext_image,
-                        retain=True
-                    )
 
             if entity["id"] == "interior_image":
-                # Post interior Image
+                mqtt_client.publish(
-                if not os.path.exists("interior_image.png"):
+                    url_topic,
-                    response = requests.get(data["images"]["internalImageUrl"], headers=headers)
+                    data["images"]["internalImageUrl"],
-                    if response.status_code == 200:
+                    retain=True
-                        with open("interior_image.png", 'wb') as image:
+                )
-                            image.write(response.content)
-
-                if os.path.exists("interior_image.png"):
-                    int_image = open("interior_image.png", mode="rb").read()
-                    mqtt_client.publish(
-                        image_topic,
-                        int_image,
-                        retain=True
-                    )
 
 
 def on_connect(client, userdata, flags, rc):
@@ -155,12 +119,8 @@ def on_disconnect(client, userdata, rc):
 def on_message(client, userdata, msg):
     payload = msg.payload.decode("UTF-8")
     if msg.topic == otp_mqtt_topic:
-        if msg.retain == 0:
+        global otp_code
-            global otp_code
+        otp_code = payload
-            otp_code = payload
-            set_otp_state()
-        else:
-            logging.warning("Found retained OTP, this can't work! Please clean retained messages!")
         return None
     else:
         try:
@@ -340,8 +300,7 @@ def update_car_data(force_update=False, overwrite={}):
             elif entity["id"] == "warnings":
                 mqtt_client.publish(
                     f"homeassistant/{entity['domain']}/{vin}_{entity['id']}/attributes",
-                    json.dumps(state),
+                    json.dumps(state)
-                    retain=True
                 )
                 if state:
                     state = sum(value == "FAILURE" for value in state.values())
@@ -355,8 +314,7 @@ def update_car_data(force_update=False, overwrite={}):
             if state or state == 0:
                 mqtt_client.publish(
                     topic,
-                    json.dumps(state) if isinstance(state, dict) or isinstance(state, list) else state,
+                    json.dumps(state) if isinstance(state, dict) or isinstance(state, list) else state
-                    retain=True
                 )
                 update_ha_device(entity, vin, state)
 
@@ -467,11 +425,11 @@ def create_ha_devices():
 
 
 def send_heartbeat():
-    mqtt_client.publish(availability_topic, "online", retain=True)
+    mqtt_client.publish(availability_topic, "online")
 
 
 def send_offline():
-    mqtt_client.publish(availability_topic, "offline", retain=True)
+    mqtt_client.publish(availability_topic, "offline")
 
 
 def delete_old_entities():

src/util.py

@@ -42,22 +42,14 @@ def get_volvo_app_version():
     else:
         return "5.37.0"
 
-def get_token_path():
+def save_to_json(data):
-    token_path = ".token"
+    with open('.token', 'w', encoding='utf-8') as f:
-    if os.environ.get("IS_HA_ADDON"):
-        check_existing_folder("/addons/volvo2mqtt/token/")
-        token_path = "/addons/volvo2mqtt/token/.token"
-
-    return token_path
-
-def save_to_json(data, token_path):
-    with open(token_path, 'w', encoding='utf-8') as f:
         json.dump(data, f, ensure_ascii=False, indent=4)
 
 def get_icon_between(icon_list, state):
     icon = None
     for s in icon_list:
-        if s["to"] <= state < s["from"]:
+        if s["to"] <= state <= s["from"]:
             icon = s["icon"]
     return icon
 
@@ -65,7 +57,7 @@ def get_icon_between(icon_list, state):
 def setup_logging():
     log_location = "volvo2mqtt.log"
     if os.environ.get("IS_HA_ADDON"):
-        check_existing_folder("/addons/volvo2mqtt/log/")
+        check_existing_folder()
         log_location = "/addons/volvo2mqtt/log/volvo2mqtt.log"
 
     logging.Formatter.converter = lambda *args: datetime.now(tz=TZ).timetuple()
@@ -98,8 +90,8 @@ def setup_logging():
             logger.setLevel(logging.ERROR)
 
 
-def check_existing_folder(path):
+def check_existing_folder():
-    Path(path).mkdir(parents=True, exist_ok=True)
+    Path("/addons/volvo2mqtt/log/").mkdir(parents=True, exist_ok=True)
 
 
 def keys_exists(element, *keys):

src/volvo.py

@@ -35,18 +35,12 @@ backend_status = ""
 
 def authorize(renew_tokenfile=False):
     global refresh_token
-
+    if os.path.isfile(".token") and not renew_tokenfile:
-    token_path = util.get_token_path()
-    if os.path.isfile(token_path) and not renew_tokenfile:
         logging.info("Using login from token file")
-        f = open(token_path)
+        f = open('.token')
-        try:
+        data = json.load(f)
-            data = json.load(f)
+        refresh_token = data["refresh_token"]
-            refresh_token = data["refresh_token"]
+        refresh_auth()
-            refresh_auth()
-        except ValueError:
-            logging.warning("Detected corrupted token file, restarting auth process")
-            authorize(True)
     else:
         logging.info("Starting login with OTP")
         auth_session = requests.session()
@@ -97,7 +91,7 @@ def authorize(renew_tokenfile=False):
             token_expires_at = datetime.now(util.TZ) + timedelta(seconds=(token_data["expires_in"] - 30))
             refresh_token = token_data["refresh_token"]
 
-            util.save_to_json(token_data, token_path)
+            util.save_to_json(token_data)
         else:
             message = auth.json()
             raise Exception(message["details"][0]["userMessage"])
@@ -160,6 +154,7 @@ def send_otp(auth_session, data):
     if not mqtt.otp_code:
         raise Exception ("No OTP found, exting...")
 
+    mqtt.delete_otp_input()
     auth = auth_session.post(next_url, data=json.dumps(body))
     if auth.status_code == 200:
         return auth.json()
@@ -189,9 +184,8 @@ def refresh_auth():
         return None
 
     if auth.status_code == 200:
-        token_path = util.get_token_path()
         data = auth.json()
-        util.save_to_json(data, token_path)
+        util.save_to_json(data)
         session.headers.update({"authorization": "Bearer " + data["access_token"]})
 
         global token_expires_at
@@ -311,17 +305,9 @@ def check_vcc_api_key(test_key, extended_until=None):
                 logging.warning("VCCAPIKEY " + test_key + " is extended and will be reusable at: "
                                 + format_datetime(extended_until, format="medium", locale=settings["babelLocale"]))
         else:
-            if "error" in data:
-                logging.warning("VCCAPIKEY " + test_key + " isn't working! " + data["error"]["message"])
-            else:
-                logging.warning("VCCAPIKEY " + test_key + " isn't working! Statuscode " + str(response.status_code) +
-                                " Message: " + response.text)
-    else:
-        if "error" in data:
             logging.warning("VCCAPIKEY " + test_key + " isn't working! " + data["error"]["message"])
-        else:
+    else:
-            logging.warning("VCCAPIKEY " + test_key + " isn't working! Statuscode " + str(response.status_code) +
+        logging.warning("VCCAPIKEY " + test_key + " isn't working! " + data["error"]["message"])
-                            " Message: " + response.text)
     return True, extended_until
 
 
@@ -559,10 +545,9 @@ def cached_request(url, method, vin, force_update=False, key_change=False):
 def parse_api_data(data, sensor_id=None):
     if sensor_id != "api_backend_status":
         data = data["data"]
+
     if sensor_id == "battery_charge_level":
         return data["batteryChargeLevel"]["value"] if util.keys_exists(data, "batteryChargeLevel") else None
-    elif sensor_id == "battery_capacity":
-        return data["batteryCapacityKWH"] if util.keys_exists(data, "batteryCapacityKWH") else None
     elif sensor_id == "electric_range":
         return util.convert_metric_values(data["electricRange"]["value"]) \
             if util.keys_exists(data, "electricRange") else None
@@ -595,7 +580,14 @@ def parse_api_data(data, sensor_id=None):
     elif sensor_id == "lock_status":
         return data["centralLock"]["value"] if util.keys_exists(data, "centralLock") else None
     elif sensor_id == "odometer":
-        return util.convert_metric_values(int(data["odometer"]["value"])) \
+        multiplier = 1
+        if util.keys_exists(settings["volvoData"], "odometerMultiplier"):
+            multiplier = settings["volvoData"]["odometerMultiplier"]
+            if isinstance(multiplier, str):
+                multiplier = 1
+            elif multiplier < 1:
+                multiplier = 1
+        return util.convert_metric_values(int(data["odometer"]["value"]) * multiplier) \
             if util.keys_exists(data, "odometer") else None
     elif sensor_id == "window_front_left":
         return window_states[data["frontLeftWindow"]["value"]] if util.keys_exists(data, "frontLeftWindow") \
@@ -643,25 +635,30 @@ def parse_api_data(data, sensor_id=None):
                 return fuel_amount
         return None
     elif sensor_id == "average_fuel_consumption":
-        average_fuel_con = 0
         if util.keys_exists(data, "averageFuelConsumption"):
             average_fuel_con = float(data["averageFuelConsumption"]["value"])
-        elif util.keys_exists(data, "averageFuelConsumptionAutomatic"):
+            if average_fuel_con > 0:
-            average_fuel_con = float(data["averageFuelConsumptionAutomatic"]["value"])
+                multiplier = 1
-
+                if util.keys_exists(settings["volvoData"], "averageFuelConsumptionMultiplier"):
-        if average_fuel_con > 0:
+                    multiplier = settings["volvoData"]["averageFuelConsumptionMultiplier"]
-            return average_fuel_con
+                    if isinstance(multiplier, str):
+                        multiplier = 1
+                    elif multiplier < 1:
+                        multiplier = 1
+                return average_fuel_con * multiplier
         return None
     elif sensor_id == "average_speed":
-        average_speed = 0
         if util.keys_exists(data, "averageSpeed"):
             average_speed = float(data["averageSpeed"]["value"])
-        elif util.keys_exists(data, "averageSpeedAutomatic"):
+            if average_speed > 1:
-            average_speed = float(data["averageSpeedAutomatic"]["value"])
+                divider = 1
-
+                if util.keys_exists(settings["volvoData"], "averageSpeedDivider"):
-        if average_speed != 0:
+                    divider = settings["volvoData"]["averageSpeedDivider"]
-            return util.convert_metric_values(average_speed)
+                    if isinstance(divider, str):
-
+                        divider = 1
+                    elif divider < 1:
+                        divider = 1
+                return util.convert_metric_values(average_speed / divider)
         return None
     elif sensor_id == "location":
         coordinates = {}
@@ -700,15 +697,7 @@ def parse_api_data(data, sensor_id=None):
     elif sensor_id == "service_warning_status":
         return data["serviceWarning"]["value"] if util.keys_exists(data, "serviceWarning") else None
     elif sensor_id == "average_energy_consumption":
-        average_energy_con = 0
+        return data["averageEnergyConsumption"]["value"] if util.keys_exists(data, "averageEnergyConsumption") else None
-        if util.keys_exists(data, "averageEnergyConsumption"):
-            average_energy_con = data["averageEnergyConsumption"]["value"]
-        elif util.keys_exists(data, "averageEnergyConsumptionAutomatic"):
-            average_energy_con = data["averageEnergyConsumptionAutomatic"]["value"]
-
-        if average_energy_con != 0:
-            return average_energy_con
-        return None
     elif sensor_id == "washer_fluid_warning":
         return data["washerFluidLevelWarning"]["value"] if util.keys_exists(data, "washerFluidLevelWarning") else None
     elif sensor_id == "warnings":