fix: full patch - reconnect_delay, keepalive, clean_session, QoS1

Patches for paho-mqtt rc=7 at startup (MQTT_ERR_CONN_LOST): 1. reconnect_delay_set(1, 30) - auto-reconnect with backoff 2. keepalive=120 - prevents timeout during long OTP startup 3. subscribe(otp_topic) in on_connect - no race condition 4. time.sleep(0.05) - prevents TCP socket buffer overflow 5. clean_session=False - queued messages survive reconnect 6. qos=1 for discovery configs - PUBACK confirms delivery
Move to base python
2026-07-22 02:13:01 +02:00 · 2026-06-24 17:05:49 +02:00 · 2026-05-15 09:30:54 +02:00 · 2026-05-15 09:29:01 +02:00 · 2026-05-15 09:10:56 +02:00 · 2026-05-15 09:09:26 +02:00
11 changed files with 613 additions and 316 deletions
@@ -1,4 +1,5 @@
 # Volvo2Mqtt
+
 ![Supports aarch64 Architecture][aarch64-shield]
 ![Supports amd64 Architecture][amd64-shield]
 ![Supports armhf Architecture][armhf-shield]
@@ -21,12 +22,14 @@ If you like my work:<br>
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/U7U8MFXCF)

 ## Confirmed working with
+- EX30 BEV (2024)
 - XC40 BEV (2024)
 - XC40 BEV (2023)
 - XC40 BEV (2022)
 - XC40 PHEV (2021)
 - V60 T8 PHEV (2023)
 - V60 T6 PHEV (2025)
+- V60 CC B5 Mildhybrid (2024)
 - C40 BEV (2023)
 - C40 BEV (2022)
 - C40 BEV (2024)
@@ -126,7 +129,17 @@ 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`
+<pre>
+<code>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
+</code>
+</pre>

 <b>HA Add-On:</b><br>

@@ -138,14 +151,15 @@ 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`    | `broker`                              | **required** | Your MQTT Broker IP. Eg. 192.168.0.5.
+| `CONF_mqtt`               | `json`    | `broker`                              | **required** | Your MQTT Broker IP. Eg. 192.168.0.5. |
 | `CONF_mqtt`               | `json`    | `port`                                | 1883         | Your MQTT Broker Port. If no value is given, port 1883 will be used.  |
-| `CONF_mqtt`               | `json`    | `username`                            | optional     | MQTT Username for your broker.
-| `CONF_mqtt`               | `json`    | `password`                            | optional     | MQTT Password for your broker.
-| `CONF_volvoData`          | `json`    | `username`                            | **required** | Normally your email address to login into the Volvo App.
-| `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_mqtt`               | `json`    | `username`                            | optional     | MQTT Username for your broker. |
+| `CONF_mqtt`               | `json`    | `password`                            | optional     | MQTT Password for your broker. |
+| `CONF_mqtt`               | `json`    | `logging`                             | optional     | Enable MQTT logging (true/false). Default don't enable MQTT log. |
+| `CONF_volvoData`          | `json`    | `username`                            | **required** | Normally your email address to login into the Volvo App. |
+| `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_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)|

@@ -157,6 +171,6 @@ Here is what every option means:
 [i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
 [releases]: https://github.com/Dielee/volvo2mqtt/releases
 [releases-shield]: https://img.shields.io/github/release/Dielee/volvo2mqtt.svg
-[maintenance-shield]: https://img.shields.io/maintenance/yes/2024.svg
+[maintenance-shield]: https://img.shields.io/maintenance/yes/2026.svg
 [commits-shield]: https://img.shields.io/github/commit-activity/y/Dielee/volvo2mqtt.svg
 [commits]: https://github.com/Dielee/volvo2mqtt/commits/main
@@ -1,6 +1,6 @@
 requests~=2.32.0
-dynaconf~=3.1.12
-paho-mqtt~=1.6.1
-Babel~=2.12.1
-pytz~=2023.3
+dynaconf~=3.2.13
+paho-mqtt~=2.1.0
+Babel~=2.18.0
+pytz~=2026.1.post1
 google_play_scraper~=1.2.6
@@ -1,5 +1,107 @@
-## v1.10.0
+## v1.13.5
+
+### 🐛 Bug Fixes:
+
+- Add build.yaml for homeassistant version > 2026.04.X
+
+## v1.13.4
+
+### 🐛 Bug Fixes:
+
+- Fix `AttributeError: module 'paho.mqtt.client' has no attribute 'CallbackAPIVersion'` when paho-mqtt < 2.0 is installed
+
+## v1.13.3
+
+### 🐛 Bug Fixes:
+
+- Bump pypi packages
+
+## v1.13.2
+
+### 🐛 Bug Fixes:
+
+- Fix KeyError: 'authorizeResponse' in auth flow #318
+
+## v1.13.1
+
+### 🐛 Bug Fixes:
+
+- Fix missing charging system state `error` #314
+- Move `object_id` to `default_entity_id` for mqtt entities according to #312
+
+## v1.13.0
+
 ### 🚀 Features:
+
+- Move energy api to v2 (https://developer.volvocars.com/apis/energy/v2/release-notes/)
+
+## v1.12.2
+
+### 🚀 Features:
+
+- Add more logging for refresh process
+- Update refresh token, if volvo API returns a new one
+
+## v1.12.1
+
+### 🐛 Bug Fixes:
+
+- Fix `trip_speed` and `trip_distance` unit for `en_US` and `en_GB` #301
+
+## v1.12.0
+
+### 🚀 Features:
+
+- Some minor corrections and more checking for exceptions #267
+- Better logging, indicate URL used on API errors, check exceptions in more places to dont kill threads, add option for mqtt logging
+- Dont force token renew on 5xx errors
+- Indicate payload on error message to understand better issue #270
+- Better checking on received update_interval #270 
+- Add TA trip statistics #283
+
+Thanks to @luka6000 and @ivanfmartinez for your PRs!
+
+## v1.10.6
+
+### 🐛 Bug Fixes:
+
+- Fix missing refresh_token and API changes by volvo. Thanks to @esusxunil.
+
+## v1.10.5
+
+### 🐛 Bug Fixes:
+
+- Fix interior and exterior images if more than one car is in use
+
+## v1.10.4
+
+### 🐛 Bug Fixes:
+
+- re-fix bug if app needs to be re-authenticated with OTP while runtime
+
+## v1.10.3
+
+### 🐛 Bug Fixes:
+
+- Add more info logging for credential refresh process
+- Fix bug if app needs to be re-authenticated with OTP while runtime
+
+## v1.10.2
+
+### 🐛 Bug Fixes:
+
+- Remove unused multiplier options #239
+
+## v1.10.1
+
+### 🚀 Features:
+
+- Optimize logging for vcc-api-key check #238
+
+## v1.10.0
+
+### 🚀 Features:
+
 - Remove unused multiplier options

 ### 🐛 Bug Fixes:
@@ -7,38 +109,45 @@
 - 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 
+- Fix `SyntaxWarning: invalid escape sequence '\d'` #196

 ## v1.9.1
+
 ### 🚀 Features:

 - The token file now survives an HA addon update/restart
@@ -48,14 +157,16 @@
 - Extend OTP retry time to 120 seconds

 ## v1.9.0
-### ⚠️ Breaking change 
+
+### ⚠️ 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:
-        
+  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
@@ -67,61 +178,70 @@
        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:

 - Add state caching for "diagnostics" endpoint

 ## v1.8.26
+
 ### 🚀 Features:

 - Add option to disable updates #160 (Set the update interval to -1)

 ## v1.8.25
+
 ### 🚀 Features:

 - Fix INTERNAL_SERVER_ERROR #165

 ## v1.8.24
+
 ### 🚀 Features:

 - Add option for dynamic interval settings #160
 - Add warnings endpoint #151

 ## v1.8.23
+
 ### 🚀 Features:

 - Add new charging system states #152

 ## v1.8.22
+
 ### 🚀 Features:

 - Change units to HA default #148

 ## v1.8.21
+
 ### 🐛 Bug Fixes:

 - Try to fix addon build #146

 ## v1.8.20
+
 ### 🐛 Bug Fixes:

 - Fix Addon crash if icon state is `UNKOWN`
 - Add `UNSPECIFIED` state for windows

-
 ## v1.8.19
+
 ### 🐛 Bug Fixes:

- Fix Estimated Charging Time not changing to zero #133 
+- Fix Estimated Charging Time not changing to zero #133

 ## v1.8.18
+
 ### 🐛 Bug Fixes:

 - Fix Backend State Sensor returning `null`

 ## v1.8.17
+
 ### 🚀 Features:

 - Move vehicle and vehicle details to v2 endpoint
@@ -131,6 +251,7 @@
 - Fix Battery Charge Level icon update

 ## v1.8.16
+
 ### 🚀 Features:

 - Add `Average energy consumption`, `Distance to empty battery` and `Washer fluid level` sensors
@@ -138,18 +259,21 @@
 - Use cached requests for fuel endpoint

 ## v1.8.15
+
 ### 🚀 Features:

 - Move `batteryChargeLevel` to the new v2 fuel endpoint
 - Add api backend status sensor

 ## v1.8.14
+
 ### 🐛 Bug Fixes:

 - Fix distance to empty sensor #127
 - Remove unused service warning trigger sensor

 ## v1.8.13
+
 ### 🐛 Bug Fixes:

 - Add "Time to Service" sensor #125<p>
@@ -157,62 +281,73 @@
  "Time to Service" contains this information now.

 ## v1.8.12
+
 ### 🐛 Bug Fixes:

 - Fix `AJAR` state for windows
 - Fix deprecation from `currentThread` to `current_thread`

 ## v1.8.11
+
 ### 🐛 Bug Fixes:

 - Remove old code from checks for running engine sensor
 - Move battery charge level sensor from v2 to v1, as v2 returns 404

 ## v1.8.10
+
 ### 🐛 Bug Fixes:

 - Add `AJAR` state for sunroof #123

 ## v1.8.9
+
 ### 🐛 Bug Fixes:

 - Fix api changes from volvo #121

 ## v1.8.8
+
 ### 🐛 Bug Fixes:

 - Fix json decode error, if volvo API returns a simple string #104

 ## v1.8.7
+
 ### 🚀 Features:

- Add option to disable log completely #96 
+- Add option to disable log completely #96

 ### 🐛 Bug Fixes:

 - Fix regex error for some mailaddresses #97

 ## v1.8.6
+
 ### 🚀 Features:

 - Add option to use multiple docker containers (with different logins) #93

 ## v1.8.5
+
 ### 🚀 Features:

 - Allow phone number as username #91

 ## v1.8.4
+
 ### 🚀 Features:

 - Optimize Addon configuration #90

 ## v1.8.3
+
 ### 🚀 Features:

- Add `device_class: battery` for battery state sensors from BEV and PHEV 
+- Add `device_class: battery` for battery state sensors from BEV and PHEV

 ## v1.8.2
+
 ### 🚀 Features:

 - Add `updateInterval` limit to prevent abuse (60 Seconds)
@@ -220,17 +355,19 @@
 - Optimize vcc api key change behaviour

 ## v1.8.1
+
 ### 🐛 Bug Fixes:

 - Fix app crash if `debug` is not set #86

 ## v1.8.0
+
 ### 🚀 Features:

 - <b>Breaking change: The `vccapikey` setting is now a list. It is possible to
  add multiple VCCAPIKEYs. This will be helpful if you are extending your 10.000 call limit sometimes.
  Change your vccapikey config like this:
-  
+
  Old:
  ```
    "vccapikey": "vccapikey1" 
@@ -245,24 +382,28 @@
      - etc.
  ```
  More information about this feature [here](https://github.com/Dielee/volvo2mqtt/issues/84).
-    </b>
+  </b>

 ## v1.7.10
+
 ### 🐛 Bug Fixes:

 - Fix application startup if using `en_US` or `en_GB` as locale

 ## v1.7.9
+
 ### 🚀 Features:

 - Added vehicle diagnostics sensors #75. Thanks to @aerrow5!

 ## v1.7.8
+
 ### 🐛 Bug Fixes:

- Fix "Estimated Charging Finish Time" Sensor  
+- Fix "Estimated Charging Finish Time" Sensor

 ## v1.7.7
+
 ### 🚀 Features:

 - Added long term statistics for some sensors #68. Thanks to @bogdanbujdea!
@@ -270,44 +411,54 @@
 - Perpare for scheduler option (not yet ready)

 ## v1.7.6
+
 ### 🚀 Features:

- Added support for interior and exterior images via the new [MQTT Image](https://www.home-assistant.io/integrations/image.mqtt/) entity. #62
+- Added support for interior and exterior images via the
+  new [MQTT Image](https://www.home-assistant.io/integrations/image.mqtt/) entity. #62

 <b>NOTE: This feature is only available using homeassistant version 2023.7.1 or greater.</b>

 ## v1.7.5
+
 ### 🚀 Features:

 - Added support for `LOCKING` and `UNLOCKING` state (Lock entity)

 ## v1.7.4
+
 ### 🐛 Bug Fixes:

 - Fixed undocumented charging connection state `CONNECTION_STATUS_FAULT` '#57

 ## v1.7.3
+
 ### 🐛 Bug Fixes:

 - Fixed API changes from Volvo #53

-<b>ATTENTION: Volvo optimized their API. Maybe you have to set your odometer multiplier to 1. 
+<b>ATTENTION: Volvo optimized their API. Maybe you have to set your odometer multiplier to 1.
 Also check all the other multipliers!</b>
+
 ## v1.7.2
+
 ### 🐛 Bug Fixes:

 - Fixed "Engine State" can be "true" or "false", not "RUNNING" or "STOPPED" #47

 ## v1.7.1
+
 ### 🚀 Features:

 - Moved "Engine State" from "sensor" to the "binary_sensor" domain
 - Improved HA Add-On security level to 7

-<b>NOTE: The old "sensor" entity will be not deleted automatically. If you want to clean up your mqtt device, just delete it and restart the volvo2mqtt addon.
+<b>NOTE: The old "sensor" entity will be not deleted automatically. If you want to clean up your mqtt device, just
+delete it and restart the volvo2mqtt addon.
 </b>

 ## v1.7.0
+
 ### 🚀 Features:

 - Added MQTT autodiscovery for HA Add-On users
@@ -320,21 +471,25 @@ Also check all the other multipliers!</b>
 ![image](https://i.imgur.com/GBamhFn.png)</b>

 ## v1.6.5
+
 ### 🐛 Bug Fixes:

 - Fixed missing key in unit mappings for `en_US` and `en_GB` mapping

 ## v1.6.4
+
 ### 🚀 Features:

- Added dynamic icons for lock, battery and window state #43 
+- Added dynamic icons for lock, battery and window state #43

 ## v1.6.3
+
 ### 🚀 Features:

 - Moved data source for "Distance to empty" from extended api to connected api

 ## v1.6.2
+
 ### 🚀 Features:

 - Moved print statements to logger
@@ -342,17 +497,19 @@ Also check all the other multipliers!</b>
 - The full HA Addon log can now be found at your addon smb share `\\<Your HA IP>\addons\volvo2mqtt\log\volvo2mqtt.log`

 ## v1.6.1
+
 ### 🚀 Features:

- Added "Washer Fluid Level" and "Distance to Empty" sensors #37 
+- Added "Washer Fluid Level" and "Distance to Empty" sensors #37
 - Expanded climate control for better state sync with HA

 ### 🐛 Bug Fixes:

 - Fixed wrong return values for not working endpoints
- Fixed app crash on credential renewal timeout #39 
+- Fixed app crash on credential renewal timeout #39

 ## v1.6.0
+
 ### 🚀 Features:

 - Added conversion from metric to imperial system for `en_US` and `en_GB` locale
@@ -0,0 +1,6 @@
+build_from:
+  amd64: ghcr.io/home-assistant/base-python:latest
+  aarch64: ghcr.io/home-assistant/base-python:latest
+  armv7: ghcr.io/home-assistant/base-python:latest
+  armhf: ghcr.io/home-assistant/base-python:latest
+  i386: ghcr.io/home-assistant/base-python:latest
@@ -1,6 +1,6 @@
 name: "Volvo2Mqtt"
 description: "Volvo AAOS MQTT bridge"
-version: "1.10.0"
+version: "1.13.5"
 slug: "volvo2mqtt"
 init: false
 url: "https://github.com/Dielee/volvo2mqtt"
@@ -21,15 +21,13 @@ options:
    port: "auto_port"
    username: "auto_user"
    password: "auto_password"
+    logging: false
  volvoData:
    username: null
    password: null
    vin: ""
    vccapikey:
        - null
-    odometerMultiplier: 1
-    averageSpeedDivider: 1
-    averageFuelConsumptionMultiplier: 1
 schema:
  updateInterval: int(60,)
  babelLocale: str
@@ -41,6 +39,7 @@ schema:
    port: str
    username: str?
    password: str?
+    logging: bool
  volvoData:
    username: match(^([a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+)|(\+\d{5,20})$)
    password: str
@@ -1,6 +1,6 @@
 from config import settings

-VERSION = "v1.10.0"
+VERSION = "v1.13.5"

 OAUTH_TOKEN_URL = "https://volvoid.eu.volvocars.com/as/token.oauth2"
 OAUTH_AUTH_URL = "https://volvoid.eu.volvocars.com/as/authorization.oauth2"
@@ -12,7 +12,7 @@ CLIMATE_STOP_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/
 LOCK_STATE_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/doors"
 CAR_LOCK_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/commands/lock"
 CAR_UNLOCK_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/commands/unlock"
-RECHARGE_STATE_URL = "https://api.volvocars.com/energy/v1/vehicles/{0}/recharge-status"
+RECHARGE_STATE_URL = "https://api.volvocars.com/energy/v2/vehicles/{0}/state"
 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"
@@ -41,7 +41,9 @@ units = {
                "odometer": {"unit": LENGTH_MILES},
                "average_speed": {"unit": SPEED_MILES_PER_HOUR},
                "distance_to_empty": {"unit": LENGTH_MILES},
-                "distance_to_service": {"unit": LENGTH_MILES}
+                "distance_to_service": {"unit": LENGTH_MILES},
+                "trip_distance": {"unit": LENGTH_MILES},
+                "trip_speed": {"unit": SPEED_MILES_PER_HOUR}
            },
            "en_US": {
                "divider": 1.60934,
@@ -49,19 +51,21 @@ units = {
                "odometer": {"unit": LENGTH_MILES},
                "average_speed": {"unit": SPEED_MILES_PER_HOUR},
                "distance_to_empty": {"unit": LENGTH_MILES},
-                "distance_to_service": {"unit": LENGTH_MILES}
+                "distance_to_service": {"unit": LENGTH_MILES},
+                "trip_distance": {"unit": LENGTH_MILES},
+                "trip_speed": {"unit": SPEED_MILES_PER_HOUR}
            }
        }

 availability_topic = "volvoAAOS2mqtt/availability"

-charging_system_states = {"CHARGING_SYSTEM_CHARGING": "Charging", "CHARGING_SYSTEM_IDLE": "Idle",
-                          "CHARGING_SYSTEM_FAULT": "Fault", "CHARGING_SYSTEM_UNSPECIFIED": "Unspecified",
-                          "CHARGING_SYSTEM_DONE": "Done", "CHARGING_SYSTEM_SCHEDULED": "Scheduled"}
+charging_system_states = {"CHARGING": "Charging", "IDLE": "Idle",
+                          "FAULT": "Fault", "UNSPECIFIED": "Unspecified",
+                          "DONE": "Done", "SCHEDULED": "Scheduled", "ERROR": "Error",
+                          "DISCHARGING": "Discharging"}

-charging_connection_states = {"CONNECTION_STATUS_DISCONNECTED": "Disconnected", "CONNECTION_STATUS_UNSPECIFIED": "Unspecified",
-                              "CONNECTION_STATUS_CONNECTED_DC": "Connected DC", "CONNECTION_STATUS_CONNECTED_AC": "Connected AC",
-                              "CONNECTION_STATUS_FAULT": "Fault"}
+charging_connection_states = {"DISCONNECTED": "Disconnected", "UNSPECIFIED": "Unspecified",
+                              "FAULT": "Fault", "CONNECTED": "Connected"}

 window_states = {"CLOSED": "OFF", "OPEN": "ON", "UNSPECIFIED": "UNKNOWN", "AJAR": "ON"}
 door_states = {"CLOSED": "OFF", "OPEN": "ON", "UNSPECIFIED": "UNKNOWN", "AJAR": "ON"}
@@ -123,8 +127,8 @@ supported_entities = [
                        {"name": "Tire Rear Right", "domain": "sensor", "id": "tyre_rear_right", "icon": "car-tire-alert", "url": TYRE_STATE_URL},
                        {"name": "Engine State", "domain": "binary_sensor", "device_class": "running", "id": "engine_state", "icon": "engine", "url": ENGINE_STATE_URL},
                        {"name": "Fuel Level", "domain": "sensor", "id": "fuel_level", "unit": VOLUME_LITERS, "icon": "fuel", "url": FUEL_BATTERY_STATE_URL, "state_class": "measurement"},
-                        {"name": "Average Fuel Consumption", "domain": "sensor", "id": "average_fuel_consumption", "unit": VOLUME_LITERS, "icon": "fuel", "url": STATISTICS_URL},
-                        {"name": "Average Energy Consumption", "domain": "sensor", "id": "average_energy_consumption", "unit": ENERGY_KILO_WATT_HOUR, "icon": "car-electric", "url": STATISTICS_URL},
+                        {"name": "Average Fuel Consumption", "domain": "sensor", "id": "average_fuel_consumption", "unit": VOLUME_LITERS, "icon": "fuel", "url": STATISTICS_URL, "state_class": "measurement"},
+                        {"name": "Average Energy Consumption", "domain": "sensor", "id": "average_energy_consumption", "unit": ENERGY_KILO_WATT_HOUR, "icon": "car-electric", "url": STATISTICS_URL, "state_class": "measurement"},
                        {"name": "Distance to Empty Tank", "domain": "sensor", "id": "distance_to_empty_tank", "unit": LENGTH_KILOMETERS if not units.get(settings["babelLocale"]) else units[settings["babelLocale"]]["distance_to_empty"]["unit"], "icon": "map-marker-distance", "url": STATISTICS_URL, "state_class": "measurement"},
                        {"name": "Distance to Empty Battery", "domain": "sensor", "id": "distance_to_empty_battery", "unit": LENGTH_KILOMETERS if not units.get(settings["babelLocale"]) else units[settings["babelLocale"]]["distance_to_empty"]["unit"], "icon": "map-marker-distance", "url": STATISTICS_URL, "state_class": "measurement"},
                        {"name": "Average Speed", "domain": "sensor", "id": "average_speed", "unit": SPEED_KILOMETERS_PER_HOUR if not units.get(settings["babelLocale"]) else units[settings["babelLocale"]]["average_speed"]["unit"], "icon": "speedometer", "url": STATISTICS_URL, "state_class": "measurement"},
@@ -136,8 +140,12 @@ supported_entities = [
                        {"name": "API Backend status", "domain": "sensor", "id": "api_backend_status", "icon": "alert"},
                        {"name": "Update Interval", "domain": "number", "id": "update_interval", "unit": "seconds", "icon": "timer", "min": -1, "max": 600, "mode": "box"},
                        {"name": "Warnings", "domain": "sensor", "id": "warnings", "icon": "alert", "url": WARNINGS_URL}
+                        ,{"name": "Trip Fuel Consumption", "domain": "sensor", "id": "trip_fuel_consumption", "unit": VOLUME_LITERS, "icon": "fuel", "url": STATISTICS_URL}
+                        ,{"name": "Trip distance", "domain": "sensor", "id": "trip_distance", "unit": LENGTH_KILOMETERS if not units.get(settings["babelLocale"]) else units[settings["babelLocale"]]["trip_distance"]["unit"], "icon": "counter", "url": STATISTICS_URL, "state_class":"measurement"}
+                        ,{"name": "Trip Energy Consumption", "domain": "sensor", "id": "trip_energy_consumption", "unit": ENERGY_KILO_WATT_HOUR, "icon": "car-electric", "url": STATISTICS_URL}
+                        ,{"name": "Trip Speed", "domain": "sensor", "id": "trip_speed", "unit": SPEED_KILOMETERS_PER_HOUR if not units.get(settings["babelLocale"]) else units[settings["babelLocale"]]["trip_speed"]["unit"], "icon": "speedometer", "url": STATISTICS_URL, "state_class": "measurement"}
 ]

 old_entity_ids = ["months_to_service", "service_warning_trigger", "distance_to_empty"]
 otp_max_loops = 24
-otp_mqtt_topic = "volvoAAOS2mqtt/otp_code"
+otp_mqtt_topic = "volvoAAOS2mqtt/otp_code"
@@ -6,6 +6,7 @@ import volvo
 import util
 import os
 import requests
+import threading
 from threading import Thread, Timer
 from datetime import datetime
 from babel.dates import format_datetime
@@ -24,8 +25,22 @@ active_schedules = {}
 otp_code = None

 def connect():
-    client = mqtt.Client("volvoAAOS2mqtt") if os.environ.get("IS_HA_ADDON") \
-        else mqtt.Client("volvoAAOS2mqtt_" + settings.volvoData["username"].replace("+", ""))
+    client_id = "volvoAAOS2mqtt" if os.environ.get("IS_HA_ADDON") \
+        else "volvoAAOS2mqtt_" + settings.volvoData["username"].replace("+", "")
+    try:
+        client = mqtt.Client(mqtt.CallbackAPIVersion.VERSION1, client_id, clean_session=False)
+    except AttributeError:
+        # paho-mqtt < 2.0 does not have CallbackAPIVersion
+        client = mqtt.Client(client_id)
+
+    if "logging" in settings["mqtt"] and settings["mqtt"]["logging"]:
+        mqtt_logger = logging.getLogger("mqtt")
+        client.enable_logger(mqtt_logger)
+    
+    client.on_message = safe_on_message
+    client.on_disconnect = on_disconnect
+    client.on_connect = on_connect
+    client.reconnect_delay_set(min_delay=1, max_delay=30)

    client.will_set(availability_topic, "offline", 0, False)
    if settings["mqtt"]["username"] and settings["mqtt"]["password"]:
@@ -36,12 +51,9 @@ def connect():
        if isinstance(conf_port, int):
            if conf_port > 0:
                port = settings["mqtt"]["port"]
-    client.connect(settings["mqtt"]["broker"], port)
+    client.connect(settings["mqtt"]["broker"], port, 120)
+    
    client.loop_start()
-    client.subscribe("volvoAAOS2mqtt/otp_code")
-    client.on_message = on_message
-    client.on_disconnect = on_disconnect
-    client.on_connect = on_connect

    global mqtt_client
    mqtt_client = client
@@ -51,7 +63,7 @@ def create_otp_input():
    state_topic = otp_mqtt_topic + "/state"
    config = {
        "name": "Volvo OTP",
-        "object_id": f"volvo_otp",
+        "default_entity_id": "volvo_otp",
        "schema": "state",
        "command_topic": otp_mqtt_topic,
        "state_topic": state_topic,
@@ -88,7 +100,7 @@ def send_car_images(vin, data, device):
            image_topic = f"homeassistant/image/{vin}_{entity['id']}/image_topic"
            config = {
                "name": entity["name"],
-                "object_id": f"volvo_{vin}_{entity['id']}",
+                "default_entity_id": f"volvo_{vin}_{entity['id']}",
                "schema": "state",
                "icon": "mdi:image-area",
                "content_type": "image/png",
@@ -108,50 +120,48 @@ def send_car_images(vin, data, device):
                       "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"):
-                    response = requests.get(data["images"]["exteriorImageUrl"], headers=headers)
-                    if response.status_code == 200:
-                        with open("exterior_image.png", 'wb') as image:
-                            image.write(response.content)
+            # Post Images
+            if not os.path.exists(f'{entity["id"]}_{vin}.png'):
+                data_path = "exteriorImageUrl" if entity["id"] == "exterior_image" else "internalImageUrl"
+                response = requests.get(data["images"][data_path], headers=headers)
+                if response.status_code == 200:
+                    with open(f'{entity["id"]}_{vin}.png', 'wb') as image:
+                        image.write(response.content)
+                else:
+                    logging.warning("Error getting car images: " + str(response.status_code) + " Message: " + response.text)

-                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
-                if not os.path.exists("interior_image.png"):
-                    response = requests.get(data["images"]["internalImageUrl"], headers=headers)
-                    if response.status_code == 200:
-                        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
-                    )
+            if os.path.exists(f'{entity["id"]}_{vin}.png'):
+                ext_image = open(f'{entity["id"]}_{vin}.png', mode="rb").read()
+                mqtt_client.publish(
+                    image_topic,
+                    ext_image,
+                    retain=True
+                )


 def on_connect(client, userdata, flags, rc):
+    # set a better name for the mqtt_loop Thread
+    threading.current_thread().name = 'mqtt_thread'
+    logging.info("MQTT connected")
+    
    send_heartbeat()
+    mqtt_client.subscribe("volvoAAOS2mqtt/otp_code")
    if len(subscribed_topics) > 0:
        for topic in subscribed_topics:
            mqtt_client.subscribe(topic)


 def on_disconnect(client, userdata, rc):
-    logging.warning("MQTT disconnected, reconnecting automatically")
+    logging.warning(f"MQTT disconnected, reconnecting automatically rc={rc}")


+def safe_on_message(client, userdata, msg):
+    try:
+        on_message(client, userdata, msg)
+    except Exception as error:
+        logging.error(f"Exception {error} processing received message on topic {msg.topic}")
+        return None
+        
 def on_message(client, userdata, msg):
    payload = msg.payload.decode("UTF-8")
    if msg.topic == otp_mqtt_topic:
@@ -166,40 +176,56 @@ def on_message(client, userdata, msg):
        try:
            vin = msg.topic.split('/')[2].split('_')[0]
        except IndexError:
-            logging.error("Error - Cannot get vin from MQTT topic!")
+            logging.error(f"Error - Cannot get vin from MQTT topic : {msg.topic}!")
            return None

    if "climate_status" in msg.topic:
        if payload == "ON":
            start_climate(vin)
+            return None
        elif payload == "OFF":
            stop_climate(vin)
+            return None
+        return None
    elif "lock_status" in msg.topic:
        if payload == "LOCK":
            lock_car(vin)
+            return None
        elif payload == "UNLOCK":
            unlock_car(vin)
+            return None
+        return None
    elif "update_data" in msg.topic:
        if payload == "PRESS":
            update_car_data(True)
+            return None
+        return None
    elif "update_interval" in msg.topic:
-        update_interval = int(payload)
-        if update_interval >= 60 or update_interval == -1:
-            settings.update({"updateInterval": int(update_interval)})
-        else:
-            logging.warning("Interval " + str(update_interval) + " seconds is to low. Doing nothing!")
-        update_car_data()
+        try:
+            update_interval = int(payload)
+            if update_interval >= 60 or update_interval == -1:
+               settings.update({"updateInterval": int(update_interval)})
+            else:
+                logging.warning(f"Interval {update_interval} seconds is to low. Doing nothing!")
+            update_car_data()
+            return None
+        except ValueError as error:
+            logging.error(f"Unable to change update_interval {error} payload={payload}")
+            return None
    elif "schedule" in msg.topic:
        try:
            d = json.loads(payload)
        except ValueError as e:
-            logging.error("Can't set timer. Error: " + str(e))
+            logging.error(f"Can't set timer. Error: {e}, payload={payload}")
            return None

        if d["mode"] == "timer":
            start_climate_timer(d, vin)
+            return None
        else:
            logging.warning("No schedule mode found, doing nothing")
+            return None
+    return None


 def start_climate_timer(d, vin):
@@ -211,13 +237,13 @@ def start_climate_timer(d, vin):
        start_datetime = local_datetime.replace(hour=hour, minute=minute, second=0)
        timer_seconds = (start_datetime - local_datetime).total_seconds()
    except Exception as e:
-        logging.error("Error creating climate timer: " + str(e))
+        logging.error(f"Error creating climate timer: {e}")
        return None

    if timer_seconds > 0:
        Timer(timer_seconds, activate_climate_timer, (vin, start_datetime.isoformat(),)).start()
        active_schedules[vin]["timers"].append(start_datetime.isoformat())
-        logging.debug("Climate timer set to " + str(start_datetime))
+        logging.debug(f"Climate timer set to {start_datetime}")
        update_car_data()
    else:
        logging.warning("Timer can not be set. Unusable start time entered")
@@ -225,28 +251,28 @@ def start_climate_timer(d, vin):

 def unlock_car(vin):
    # Start the api call in another thread for HA performance
-    Thread(target=volvo.api_call, args=(CAR_UNLOCK_URL, "POST", vin)).start()
+    Thread(target=volvo.api_call, args=(CAR_UNLOCK_URL, "POST", vin), name="unlock_car_thread").start()

    # Force set unlocking state
    update_car_data(False, {"entity_id": "lock_status", "vin": vin, "state": "UNLOCKING"})
    # Fetch API lock state until unlocking finished
-    Thread(target=volvo.check_lock_status, args=(vin, "LOCKED")).start()
+    Thread(target=volvo.check_lock_status, args=(vin, "LOCKED"), name="check_lock_status_thread").start()


 def lock_car(vin):
    # Start the api call in another thread for HA performance
-    Thread(target=volvo.api_call, args=(CAR_LOCK_URL, "POST", vin)).start()
+    Thread(target=volvo.api_call, args=(CAR_LOCK_URL, "POST", vin), name="lock_car_thread").start()

    # Force set locking state
    update_car_data(False, {"entity_id": "lock_status", "vin": vin, "state": "LOCKING"})
    # Fetch API lock state until locking finished
-    Thread(target=volvo.check_lock_status, args=(vin, "UNLOCKED")).start()
+    Thread(target=volvo.check_lock_status, args=(vin, "UNLOCKED"), name="check_lock_status_thread").start()


 def stop_climate(vin):
    global assumed_climate_state, climate_timer, engine_status
    # Start the api call in another thread for HA performance
-    Thread(target=volvo.api_call, args=(CLIMATE_STOP_URL, "POST", vin)).start()
+    Thread(target=volvo.api_call, args=(CLIMATE_STOP_URL, "POST", vin), name="stop_climate_thread").start()

    # Stop door check thread if running
    if engine_status[vin].is_alive():
@@ -270,10 +296,10 @@ def activate_climate_timer(vin, start_time):
 def start_climate(vin):
    global assumed_climate_state, climate_timer, engine_status
    # Start the api call in another thread for HA performance
-    Thread(target=volvo.api_call, args=(CLIMATE_START_URL, "POST", vin)).start()
+    Thread(target=volvo.api_call, args=(CLIMATE_START_URL, "POST", vin), name="start_climate_thread").start()

    # Start door check thread to turn off climate if driver door is opened
-    check_engine_thread = Thread(target=volvo.check_engine_status, args=(vin,))
+    check_engine_thread = Thread(target=volvo.check_engine_status, args=(vin,), name="check_engine_status_thread")
    check_engine_thread.start()
    engine_status[vin] = check_engine_thread

@@ -291,9 +317,12 @@ def update_loop():
    while True:
        if settings["updateInterval"] > 0:
            logging.info("Sending mqtt update...")
-            send_heartbeat()
-            update_car_data()
-            logging.info("Mqtt update done. Next run in " + str(settings["updateInterval"]) + " seconds.")
+            try:
+                send_heartbeat()
+                update_car_data()
+                logging.info(f"Mqtt update done. Next run in {settings['updateInterval']} seconds.")
+            except Exception as error:
+                logging.info(f"Exception {error} in Mqtt update. Next run in {settings['updateInterval']} seconds.")
            time.sleep(settings["updateInterval"])
        else:
            logging.info("Data update is disabled, doing nothing for 30 seconds")
@@ -352,6 +381,7 @@ def update_car_data(force_update=False, overwrite={}):
            else:
                topic = f"homeassistant/{entity['domain']}/{vin}_{entity['id']}/state"

+            logging.info(f"update_car_data {topic} {state}")
            if state or state == 0:
                mqtt_client.publish(
                    topic,
@@ -381,7 +411,7 @@ def update_ha_device(entity, vin, state):
    logging.debug("Updating icon to " + icon + " for " + entity["id"])
    config = {
        "name": entity['name'],
-        "object_id": f"volvo_{vin}_{entity['id']}",
+        "default_entity_id": f"volvo_{vin}_{entity['id']}",
        "schema": "state",
        "icon": f"mdi:{icon}" if icon else f"mdi:{entity['icon']}",
        "state_topic": f"homeassistant/{entity['domain']}/{vin}_{entity['id']}/state",
@@ -410,6 +440,7 @@ def update_ha_device(entity, vin, state):
    mqtt_client.publish(
        f"homeassistant/{entity['domain']}/volvoAAOS2mqtt/{vin}_{entity['id']}/config",
        json.dumps(config),
+        qos=1,
        retain=True
    )

@@ -422,7 +453,7 @@ def create_ha_devices():
        for entity in volvo.supported_endpoints[vin]:
            config = {
                "name": entity['name'],
-                "object_id": f"volvo_{vin}_{entity['id']}",
+                "default_entity_id": f"volvo_{vin}_{entity['id']}",
                "schema": "state",
                "icon": f"mdi:{entity['icon']}",
                "state_topic": f"homeassistant/{entity['domain']}/{vin}_{entity['id']}/state",
@@ -460,8 +491,10 @@ def create_ha_devices():
            mqtt_client.publish(
                f"homeassistant/{entity['domain']}/volvoAAOS2mqtt/{vin}_{entity['id']}/config",
                json.dumps(config),
+                qos=1,
                retain=True
            )
+            time.sleep(0.05)
    time.sleep(2)
    send_heartbeat()

@@ -8,15 +8,13 @@
    "broker": "",
    "port": 1883,
    "username": "",
-    "password": ""
+    "password": "",
+    "logging": false
  },
  "volvoData": {
    "username": "",
    "password": "",
    "vin": "",
-	"vccapikey": [],
-    "odometerMultiplier": "",
-    "averageSpeedDivider": "",
-    "averageFuelConsumptionMultiplier": ""
+	  "vccapikey": []
  }
 }
@@ -19,4 +19,4 @@ configuration:
    description: Leave the settings as they are if you are using the MQTT Mosquitto Addon. If not, take a look at the readme from volvo2mqtt.
  volvoData:
    name: Volvo configuration options
-    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. This setting works as list, so it is possible to define multiple VCCAPI keys. Odometer multiplier is sometimes 10, sometimes 1. The same is applicable for average speed divider and average fuel consumption. Leave it as it is if you don't know what's right. 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. This setting works as list, so it is possible to define multiple VCCAPI keys. Take a look at the GitHub repo for more information!
@@ -71,7 +71,7 @@ def setup_logging():
    logging.Formatter.converter = lambda *args: datetime.now(tz=TZ).timetuple()
    file_log_handler = logging.handlers.RotatingFileHandler(log_location, maxBytes=1000000, backupCount=1)
    formatter = logging.Formatter(
-        '%(asctime)s volvo2mqtt [%(process)d] - %(levelname)s: %(message)s',
+        '%(asctime)s volvo2mqtt [%(threadName)s] [%(process)d] - %(levelname)s: %(message)s',
        '%b %d %H:%M:%S')
    file_log_handler.setFormatter(formatter)

@@ -47,6 +47,11 @@ def authorize(renew_tokenfile=False):
        except ValueError:
            logging.warning("Detected corrupted token file, restarting auth process")
            authorize(True)
+            return
+        except KeyError:
+            logging.warning("Token file missing refresh_token, restarting auth process")
+            authorize(True)
+            return
    else:
        logging.info("Starting login with OTP")
        auth_session = requests.session()
@@ -105,11 +110,11 @@ def authorize(renew_tokenfile=False):
    get_vcc_api_keys()
    get_vehicles()
    check_supported_endpoints()
-    Thread(target=backend_status_loop).start()
+    Thread(target=backend_status_loop,name="backend_status_thread").start()

 def continue_auth(auth_session, data):
-    next_url = data["_links"]["continueAuthentication"]["href"] + "?action=continueAuthentication"
-    auth = auth_session.get(next_url)
+    next_url = data["_links"]["continueAuthentication"]["href"].replace("http://", "https://") + "?action=continueAuthentication"
+    auth = auth_session.post(next_url, data="{}")

    if auth.status_code == 200:
        return auth.json()
@@ -131,7 +136,7 @@ def get_token(auth_session, data):


 def check_username_password(auth_session, data):
-    next_url = data["_links"]["checkUsernamePassword"]["href"] + "?action=checkUsernamePassword"
+    next_url = data["_links"]["checkUsernamePassword"]["href"].replace("http://", "https://") + "?action=checkUsernamePassword"
    body = {"username": settings.volvoData["username"],
             "password": settings.volvoData["password"]}
    auth = auth_session.post(next_url, data=json.dumps(body))
@@ -145,7 +150,7 @@ def check_username_password(auth_session, data):

 def send_otp(auth_session, data):
    mqtt.create_otp_input()
-    next_url = data["_links"]["checkOtp"]["href"] + "?action=checkOtp"
+    next_url = data["_links"]["checkOtp"]["href"].replace("http://", "https://") + "?action=checkOtp"
    body = {"otp": ""}

    for i in range(otp_max_loops):
@@ -161,6 +166,7 @@ def send_otp(auth_session, data):
        raise Exception ("No OTP found, exting...")

    auth = auth_session.post(next_url, data=json.dumps(body))
+    mqtt.otp_code = None
    if auth.status_code == 200:
        return auth.json()
    else:
@@ -169,8 +175,9 @@ def send_otp(auth_session, data):


 def refresh_auth():
-    logging.info("Refreshing credentials")
    global refresh_token
+    logging.info("Refreshing credentials with token " + refresh_token)
+
    headers = {
        "authorization": "Basic aDRZZjBiOlU4WWtTYlZsNnh3c2c1WVFxWmZyZ1ZtSWFEcGhPc3kxUENhVXNpY1F0bzNUUjVrd2FKc2U0QVpkZ2ZJZmNMeXc=",
        "content-type": "application/x-www-form-urlencoded",
@@ -190,15 +197,38 @@ def refresh_auth():

    if auth.status_code == 200:
        token_path = util.get_token_path()
-        data = auth.json()
-        util.save_to_json(data, token_path)
-        session.headers.update({"authorization": "Bearer " + data["access_token"]})
+        if os.path.exists(token_path):
+            with open(token_path) as f:
+                data = json.load(f)
+
+        refresh_data = auth.json()
+
+        if not "refresh_token" in refresh_data:
+            f = open(token_path)
+            try:
+                data = json.load(f)
+                refresh_data["refresh_token"] = data["refresh_token"]
+            except ValueError:
+                raise Exception("Cannot refresh token!")
+        else:
+            logging.info("New refresh token found, updating!")
+
+        util.save_to_json(refresh_data, token_path)
+        session.headers.update({"authorization": "Bearer " + refresh_data["access_token"]})

        global token_expires_at
        token_expires_at = datetime.now(util.TZ) + timedelta(seconds=(data["expires_in"] - 30))
        refresh_token = data["refresh_token"]
+        return None
+    elif int(auth.status_code / 100) == 5:
+        # Server error try again later
+        logging.warning("Refreshing credentials failed!: " + str(auth.status_code) + " Message: " + auth.text)
+        return None
    else:
+        # TODO check other codes that dont have to force the renew_tokenfile
+        logging.warning("Refreshing credentials failed!: " + str(auth.status_code) + " Message: " + auth.text)
        authorize(renew_tokenfile=True)
+        return None


 def get_vehicles():
@@ -311,9 +341,17 @@ 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:
-            logging.warning("VCCAPIKEY " + test_key + " isn't working! " + data["error"]["message"])
+            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:
-        logging.warning("VCCAPIKEY " + test_key + " isn't working! " + data["error"]["message"])
+        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)
    return True, extended_until


@@ -424,31 +462,44 @@ def check_engine_status(vin):
            mqtt.assumed_climate_state[vin] = "OFF"
            mqtt.update_car_data()
            break
+
        time.sleep(5)
+    return None


 def backend_status_loop():
+    logging.debug("backend_status_loop started")
    while True:
-        get_backend_status()
-        # Update every hour
-        time.sleep(3600)
+        last_status = get_backend_status()
+        # Update every hour when not error, 10 minutes when got server error
+        time.sleep(3600 if not last_status.startswith("APIERR_") else 600)


 def get_backend_status():
    global backend_status
-    response = session.get(API_BACKEND_STATUS, timeout=15)
    try:
-        data = response.json()
-        if util.keys_exists(data, "message"):
-            if data["message"]:
-                backend_status = data["message"]
+        response = session.get(API_BACKEND_STATUS, timeout=15)
+        try:
+            data = response.json()
+            if util.keys_exists(data, "message"):
+                if data["message"]:
+                    backend_status = data["message"]
+                else:
+                    backend_status = "NO_WARNING"
            else:
                backend_status = "NO_WARNING"
-        else:
-            backend_status = "NO_WARNING"

-    except JSONDecodeError as e:
-        backend_status = "NO_WARNING"
+        except JSONDecodeError as e:
+            logging.error(f"Invalid json response from API Backend Status - {response} - {e}")
+            backend_status = "APIERR_INVALID_JSON_RESPONSE"
+            
+    except requests.exceptions.ReadTimeout as e:
+        logging.error(f"API Backend Status - timeout - {e}")
+        backend_status = "APIERR_TIMEOUT"
+    except requests.exceptions.RequestException as e:
+        logging.error(f"API Backend Status - Error - {e}")
+        backend_status = "APIERR_REQUEST_ERROR"
+        
    return backend_status


@@ -464,28 +515,28 @@ def api_call(url, method, vin, sensor_id=None, force_update=False, key_change=Fa
            # Exception caught while getting data from volvo api, doing nothing
            return None
    elif method == "GET":
-        logging.debug("Starting " + method + " call against " + url)
+        logging.debug(f"Starting {method} call against {url}")
        try:
            response = session.get(url.format(vin), timeout=15)
        except requests.exceptions.RequestException as e:
-            logging.error("Error getting data: " + str(e))
+            logging.error(f"Error getting data: {e} from {url}")
            return None
    elif method == "POST":
-        logging.debug("Starting " + method + " call against " + url)
+        logging.debug(f"Starting {method} call against {url}")
        try:
            response = session.post(url.format(vin), timeout=20)
        except requests.exceptions.RequestException as e:
-            logging.error("Error getting data: " + str(e))
+            logging.error(f"Error getting data from {url} : {e}")
            return None
    else:
-        logging.error("Unkown method posted: " + method + ". Returning nothing")
+        logging.error(f"Unkown method posted: {method}. Returning nothing")
        return None

-    logging.debug("Response status code: " + str(response.status_code))
+    logging.debug(f"Response status code: {response.status_code}")
    try:
        data = response.json()
    except JSONDecodeError as e:
-        logging.error("Fetched json decode error, Volvo API seems to return garbage. Skipping update. Error: " + str(e))
+        logging.error(f"Fetched json decode error, Volvo API seems to return garbage. Skipping update. Error: {e}")
        return None

    if response.status_code == 200:
@@ -508,9 +559,9 @@ def api_call(url, method, vin, sensor_id=None, force_update=False, key_change=Fa
                api_call(url, method, vin, sensor_id, force_update, True)
            else:
                logging.error(
-                    "API Call failed. Status Code: " + str(response.status_code) + ". Error: " + response.text)
+                    f"API Call failed to {url}. Status Code: {response.status_code}. Error: {response.text}")
        else:
-            logging.error("API Call failed. Status Code: " + str(response.status_code) + ". Error: " + response.text)
+            logging.error(f"API Call failed to {url}. Status Code: {response.status_code}. Error: {response.text}")
        return None


@@ -518,11 +569,11 @@ def cached_request(url, method, vin, force_update=False, key_change=False):
    global cached_requests
    if not util.keys_exists(cached_requests, vin + "_" + url):
        # No API Data cached, get fresh data from API
-        logging.debug("Starting " + method + " call against " + url)
+        logging.debug(f"Starting {method} call against {url}")
        try:
            response = session.get(url.format(vin), timeout=15)
        except requests.exceptions.RequestException as e:
-            logging.error("Error getting data: " + str(e))
+            logging.error(f"Error getting data from {url}: {e}")
            return None

        data = {"response": response, "last_update": datetime.now(util.TZ)}
@@ -534,11 +585,11 @@ def cached_request(url, method, vin, force_update=False, key_change=False):
                                                      "last_update"]).total_seconds() >= 2) \
                or key_change:
            # Old Data in Cache, or force mode active, updating
-            logging.debug("Starting " + method + " call against " + url)
+            logging.debug(f"Starting {method} call against {url}")
            try:
                response = session.get(url.format(vin), timeout=15)
            except requests.exceptions.RequestException as e:
-                logging.error("Error getting data: " + str(e))
+                logging.error(f"Error getting data from {url} : {e}")
                return None
            data = {"response": response, "last_update": datetime.now(util.TZ)}
            cached_requests[vin + "_" + url] = data
@@ -549,171 +600,202 @@ 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
-    elif sensor_id == "charging_system_status":
-        return charging_system_states[data["chargingSystemStatus"]["value"]] \
-            if util.keys_exists(data, "chargingSystemStatus") else None
-    elif sensor_id == "charging_connection_status":
-        return charging_connection_states[data["chargingConnectionStatus"]["value"]] \
-            if util.keys_exists(data, "chargingConnectionStatus") else None
-    elif sensor_id == "estimated_charging_time":
-        if util.keys_exists(data, "chargingSystemStatus"):
-            charging_system_state = charging_system_states[data["chargingSystemStatus"]["value"]]
-            if charging_system_state == "Charging":
-                return data["estimatedChargingTime"]["value"] if util.keys_exists(data, "estimatedChargingTime") else ""
+    if sensor_id in ["battery_charge_level", "electric_range", "charging_system_status",
+                     "charging_connection_status", "estimated_charging_time", "estimated_charging_finish_time"]:
+
+        if sensor_id == "battery_charge_level":
+            return data["batteryChargeLevel"]["value"] if util.keys_exists(data, "batteryChargeLevel") else None
+        elif sensor_id == "electric_range":
+            return util.convert_metric_values(data["electricRange"]["value"]) \
+                if util.keys_exists(data, "electricRange") else None
+        elif sensor_id == "charging_system_status":
+            return charging_system_states[data["chargingStatus"]["value"]] \
+                if util.keys_exists(data, "chargingStatus") else None
+        elif sensor_id == "charging_connection_status":
+            return charging_connection_states[data["chargerConnectionStatus"]["value"]] \
+                if util.keys_exists(data, "chargerConnectionStatus") else None
+        elif sensor_id == "estimated_charging_time":
+            if util.keys_exists(data, "chargingStatus"):
+                charging_system_state = charging_system_states[data["chargingStatus"]["value"]]
+                if charging_system_state == "Charging":
+                    return data["estimatedChargingTimeToTargetBatteryChargeLevel"]["value"] if util.keys_exists(data,
+                                                                                      "estimatedChargingTimeToTargetBatteryChargeLevel") else ""
+                else:
+                    return 0
+            return None
+        elif sensor_id == "estimated_charging_finish_time":
+            if util.keys_exists(data, "estimatedChargingTimeToTargetBatteryChargeLevel"):
+                charging_system_state = charging_system_states[data["chargingStatus"]["value"]]
+                if charging_system_state == "Charging":
+                    charging_time = int(
+                        data["estimatedChargingTimeToTargetBatteryChargeLevel"]["value"] if util.keys_exists(data, "estimatedChargingTimeToTargetBatteryChargeLevel")
+                        else 0)
+                    charging_finished = datetime.now(util.TZ) + timedelta(minutes=charging_time)
+                    return format_datetime(charging_finished, format="medium", locale=settings["babelLocale"])
+                else:
+                    return ""
+            return None
+        return None
+    else:
+        if sensor_id != "api_backend_status":
+            data = data["data"]
+
+        if sensor_id == "lock_status":
+            return data["centralLock"]["value"] if util.keys_exists(data, "centralLock") else None
+        elif sensor_id == "battery_capacity":
+            return data["batteryCapacityKWH"] if util.keys_exists(data, "batteryCapacityKWH") else None
+        elif sensor_id == "odometer":
+            return util.convert_metric_values(int(data["odometer"]["value"])) \
+                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") \
+                else None
+        elif sensor_id == "window_front_right":
+            return window_states[data["frontRightWindow"]["value"]] if util.keys_exists(data, "frontRightWindow") \
+                else None
+        elif sensor_id == "window_rear_left":
+            return window_states[data["rearLeftWindow"]["value"]] if util.keys_exists(data, "rearLeftWindow") \
+                else None
+        elif sensor_id == "window_rear_right":
+            return window_states[data["rearRightWindow"]["value"]] if util.keys_exists(data, "rearRightWindow") \
+                else None
+        elif sensor_id == "door_front_left":
+            return door_states[data["frontLeftDoor"]["value"]] if util.keys_exists(data, "frontLeftDoor") else None
+        elif sensor_id == "door_front_right":
+            return door_states[data["frontRightDoor"]["value"]] \
+                if util.keys_exists(data, "frontRightDoor") else None
+        elif sensor_id == "door_rear_left":
+            return door_states[data["rearLeftDoor"]["value"]] if util.keys_exists(data, "rearLeftDoor") else None
+        elif sensor_id == "door_rear_right":
+            return door_states[data["rearRightDoor"]["value"]] if util.keys_exists(data, "rearRightDoor") else None
+        elif sensor_id == "tailgate":
+            return door_states[data["tailgate"]["value"]] if util.keys_exists(data, "tailgate") else None
+        elif sensor_id == "sunroof":
+            return door_states[data["sunroof"]["value"]] if util.keys_exists(data, "sunroof") else None
+        elif sensor_id == "engine_hood":
+            return door_states[data["hood"]["value"]] if util.keys_exists(data, "hood") else None
+        elif sensor_id == "tank_lid":
+            return door_states[data["tankLid"]["value"]] if util.keys_exists(data, "tankLid") else None
+        elif sensor_id == "tyre_front_left":
+            return data["frontLeft"]["value"] if util.keys_exists(data, "frontLeft") else None
+        elif sensor_id == "tyre_front_right":
+            return data["frontRight"]["value"] if util.keys_exists(data, "frontRight") else None
+        elif sensor_id == "tyre_rear_left":
+            return data["rearLeft"]["value"] if util.keys_exists(data, "rearLeft") else None
+        elif sensor_id == "tyre_rear_right":
+            return data["rearRight"]["value"] if util.keys_exists(data, "rearRight") else None
+        elif sensor_id == "engine_state":
+            return engine_states[data["engineStatus"]["value"]] if util.keys_exists(data, "engineStatus") else None
+        elif sensor_id == "fuel_level":
+            if util.keys_exists(data, "fuelAmount"):
+                fuel_amount = float(data["fuelAmount"]["value"])
+                if fuel_amount > 0:
+                    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"):
+                average_fuel_con = float(data["averageFuelConsumptionAutomatic"]["value"])
+
+            if average_fuel_con > 0:
+                return average_fuel_con
+            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"):
+                average_speed = float(data["averageSpeedAutomatic"]["value"])
+
+            if average_speed != 0:
+                return util.convert_metric_values(average_speed)
+
+            return None
+        elif sensor_id == "location":
+            coordinates = {}
+            if util.keys_exists(data, "geometry"):
+                raw_data = data["geometry"]
+                if util.keys_exists(raw_data, "coordinates"):
+                    coordinates = {"longitude": raw_data["coordinates"][0],
+                                   "latitude": raw_data["coordinates"][1],
+                                   "gps_accuracy": 1}
+            return coordinates
+        elif sensor_id == "distance_to_empty_tank":
+            if util.keys_exists(data, "distanceToEmptyTank"):
+                distance_to_empty = int(data["distanceToEmptyTank"]["value"])
+                if distance_to_empty > 0:
+                    return util.convert_metric_values(data["distanceToEmptyTank"]["value"])
+            return None
+        elif sensor_id == "distance_to_empty_battery":
+            if util.keys_exists(data, "distanceToEmptyBattery"):
+                distance_to_empty = int(data["distanceToEmptyBattery"]["value"])
+                if distance_to_empty > 0:
+                    return util.convert_metric_values(data["distanceToEmptyBattery"]["value"])
+            return None
+        elif sensor_id == "hours_to_service":
+            return data["engineHoursToService"]["value"] if util.keys_exists(data, "engineHoursToService") else None
+        elif sensor_id == "km_to_service":
+            if util.keys_exists(data, "distanceToService"):
+                km_to_service = int(data["distanceToService"]["value"])
+                if km_to_service > 0:
+                    return util.convert_metric_values(data["distanceToService"]["value"])
+            return None
+        elif sensor_id == "time_to_service":
+            if util.keys_exists(data, "timeToService"):
+                return str(data["timeToService"]["value"]) + " " + data["timeToService"]["unit"]
            else:
-                return 0
-        return None
-    elif sensor_id == "estimated_charging_finish_time":
-        if util.keys_exists(data, "chargingSystemStatus"):
-            charging_system_state = charging_system_states[data["chargingSystemStatus"]["value"]]
-            if charging_system_state == "Charging":
-                charging_time = int(
-                    data["estimatedChargingTime"]["value"] if util.keys_exists(data, "estimatedChargingTime")
-                    else 0)
-                charging_finished = datetime.now(util.TZ) + timedelta(minutes=charging_time)
-                return format_datetime(charging_finished, format="medium", locale=settings["babelLocale"])
-            else:
-                return ""
-        return 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"])) \
-            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") \
-            else None
-    elif sensor_id == "window_front_right":
-        return window_states[data["frontRightWindow"]["value"]] if util.keys_exists(data, "frontRightWindow") \
-            else None
-    elif sensor_id == "window_rear_left":
-        return window_states[data["rearLeftWindow"]["value"]] if util.keys_exists(data, "rearLeftWindow") \
-            else None
-    elif sensor_id == "window_rear_right":
-        return window_states[data["rearRightWindow"]["value"]] if util.keys_exists(data, "rearRightWindow") \
-            else None
-    elif sensor_id == "door_front_left":
-        return door_states[data["frontLeftDoor"]["value"]] if util.keys_exists(data, "frontLeftDoor") else None
-    elif sensor_id == "door_front_right":
-        return door_states[data["frontRightDoor"]["value"]] \
-            if util.keys_exists(data, "frontRightDoor") else None
-    elif sensor_id == "door_rear_left":
-        return door_states[data["rearLeftDoor"]["value"]] if util.keys_exists(data, "rearLeftDoor") else None
-    elif sensor_id == "door_rear_right":
-        return door_states[data["rearRightDoor"]["value"]] if util.keys_exists(data, "rearRightDoor") else None
-    elif sensor_id == "tailgate":
-        return door_states[data["tailgate"]["value"]] if util.keys_exists(data, "tailgate") else None
-    elif sensor_id == "sunroof":
-        return door_states[data["sunroof"]["value"]] if util.keys_exists(data, "sunroof") else None
-    elif sensor_id == "engine_hood":
-        return door_states[data["hood"]["value"]] if util.keys_exists(data, "hood") else None
-    elif sensor_id == "tank_lid":
-        return door_states[data["tankLid"]["value"]] if util.keys_exists(data, "tankLid") else None
-    elif sensor_id == "tyre_front_left":
-        return data["frontLeft"]["value"] if util.keys_exists(data, "frontLeft") else None
-    elif sensor_id == "tyre_front_right":
-        return data["frontRight"]["value"] if util.keys_exists(data, "frontRight") else None
-    elif sensor_id == "tyre_rear_left":
-        return data["rearLeft"]["value"] if util.keys_exists(data, "rearLeft") else None
-    elif sensor_id == "tyre_rear_right":
-        return data["rearRight"]["value"] if util.keys_exists(data, "rearRight") else None
-    elif sensor_id == "engine_state":
-        return engine_states[data["engineStatus"]["value"]] if util.keys_exists(data, "engineStatus") else None
-    elif sensor_id == "fuel_level":
-        if util.keys_exists(data, "fuelAmount"):
-            fuel_amount = float(data["fuelAmount"]["value"])
-            if fuel_amount > 0:
-                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"):
-            average_fuel_con = float(data["averageFuelConsumptionAutomatic"]["value"])
+                return 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
+            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_fuel_con > 0:
-            return average_fuel_con
-        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"):
-            average_speed = float(data["averageSpeedAutomatic"]["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":
+            warnings = 0
+            cleaned_data = {}
+            for key, dicts in data.items():
+                contains_data = sum(value == "NO_WARNING" or value == "FAILURE" for value in dicts.values())
+                if contains_data:
+                    warnings = warnings + 1
+                    cleaned_data[key] = dicts["value"]

-        if average_speed != 0:
-            return util.convert_metric_values(average_speed)
-
-        return None
-    elif sensor_id == "location":
-        coordinates = {}
-        if util.keys_exists(data, "geometry"):
-            raw_data = data["geometry"]
-            if util.keys_exists(raw_data, "coordinates"):
-                coordinates = {"longitude": raw_data["coordinates"][0],
-                               "latitude": raw_data["coordinates"][1],
-                               "gps_accuracy": 1}
-        return coordinates
-    elif sensor_id == "distance_to_empty_tank":
-        if util.keys_exists(data, "distanceToEmptyTank"):
-            distance_to_empty = int(data["distanceToEmptyTank"]["value"])
-            if distance_to_empty > 0:
-                return util.convert_metric_values(data["distanceToEmptyTank"]["value"])
-        return None
-    elif sensor_id == "distance_to_empty_battery":
-        if util.keys_exists(data, "distanceToEmptyBattery"):
-            distance_to_empty = int(data["distanceToEmptyBattery"]["value"])
-            if distance_to_empty > 0:
-                return util.convert_metric_values(data["distanceToEmptyBattery"]["value"])
-        return None
-    elif sensor_id == "hours_to_service":
-        return data["engineHoursToService"]["value"] if util.keys_exists(data, "engineHoursToService") else None
-    elif sensor_id == "km_to_service":
-        if util.keys_exists(data, "distanceToService"):
-            km_to_service = int(data["distanceToService"]["value"])
-            if km_to_service > 0:
-                return util.convert_metric_values(data["distanceToService"]["value"])
-        return None
-    elif sensor_id == "time_to_service":
-        if util.keys_exists(data, "timeToService"):
-            return str(data["timeToService"]["value"]) + " " + data["timeToService"]["unit"]
+            return cleaned_data if warnings > 0 else None
+        elif sensor_id == "trip_fuel_consumption":
+            trip_fuel_con = 0
+            if util.keys_exists(data, "averageFuelConsumptionAutomatic"):
+                trip_fuel_con = float(data["averageFuelConsumptionAutomatic"]["value"])
+            if trip_fuel_con > 0:
+                return trip_fuel_con
+            return None
+        elif sensor_id == "trip_distance":
+            return util.convert_metric_values(int(data["tripMeterAutomatic"]["value"])) \
+                if util.keys_exists(data, "tripMeterAutomatic") else None
+        elif sensor_id == "trip_energy_consumption":
+            trip_energy_con = 0
+            if util.keys_exists(data, "averageEnergyConsumptionAutomatic"):
+                trip_energy_con = data["averageEnergyConsumptionAutomatic"]["value"]
+            if trip_energy_con != 0:
+                return trip_energy_con
+            return None
+        elif sensor_id == "trip_speed":
+            trip_speed = 0
+            if util.keys_exists(data, "averageSpeedAutomatic"):
+                trip_speed = float(data["averageSpeedAutomatic"]["value"])
+            if trip_speed != 0:
+                return util.convert_metric_values(trip_speed)
+            return None
        else:
            return 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
-        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":
-        warnings = 0
-        cleaned_data = {}
-        for key, dicts in data.items():
-            contains_data = sum(value == "NO_WARNING" or value == "FAILURE" for value in dicts.values())
-            if contains_data:
-                warnings = warnings + 1
-                cleaned_data[key] = dicts["value"]
-
-        return cleaned_data if warnings > 0 else None
-    else:
-        return None
Author	SHA1	Message	Date
jarvis	bf6568d945	fix: full patch - reconnect_delay, keepalive, clean_session, QoS1 Patches for paho-mqtt rc=7 at startup (MQTT_ERR_CONN_LOST): 1. reconnect_delay_set(1, 30) - auto-reconnect with backoff 2. keepalive=120 - prevents timeout during long OTP startup 3. subscribe(otp_topic) in on_connect - no race condition 4. time.sleep(0.05) - prevents TCP socket buffer overflow 5. clean_session=False - queued messages survive reconnect 6. qos=1 for discovery configs - PUBACK confirms delivery	2026-06-24 17:05:49 +02:00
linus	f8b6f9cf53	Move to base python	2026-05-15 09:30:54 +02:00
linus	7c32ca59be	Add build.yaml for homeassistant version > 2026.04.X	2026-05-15 09:29:01 +02:00
linus	67948b0900	Bump version	2026-05-15 09:10:56 +02:00
bazza2000 GitHub Barry Jarman Copilot	48663d2e0d	Fix AttributeError for paho-mqtt < 2.0 compatibility (#321 ) When paho-mqtt < 2.0 is installed (e.g. in cached Docker layers), mqtt.CallbackAPIVersion does not exist, causing an immediate crash on startup with: AttributeError: module 'paho.mqtt.client' has no attribute 'CallbackAPIVersion' Add try/except fallback so the addon works with both paho-mqtt 1.x and 2.x, eliminating the crash and allowing the addon to start correctly. Co-authored-by: Barry Jarman <bazza@Barrys-Mac-mini.local> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>	2026-05-15 09:09:26 +02:00
linus	76cfa21db7	Bump pypi packages	2026-03-23 07:57:37 +01:00
linus	9d11dff24b	Fix #318	2026-03-23 07:47:15 +01:00
bazza2000andGitHub	3a4160451c	Fix: use POST for continueAuthentication endpoint (#317 ) Volvo's PingFederate auth API now requires a POST request for the continueAuthentication step after OTP verification. Using GET returns the same OTP_VERIFIED state in a loop, never progressing to COMPLETED, which causes a KeyError on 'authorizeResponse'. Changing auth_session.get() to auth_session.post() with an empty JSON body causes the API to return COMPLETED with the expected authorizeResponse.	2026-03-23 07:43:53 +01:00
linus	515e1a8d27	Bump addon version	2026-01-02 18:17:31 +01:00
linus	4961f7bfad	Move readme to 2026 maintenance	2026-01-02 18:16:30 +01:00
linus	a68216bdd5	Move `object_id` to `default_entity_id` for mqtt entities according to #312	2026-01-02 18:12:47 +01:00
linus	98d8dd7e65	Fix missing charging system state	2026-01-02 18:06:30 +01:00
linus	7acfdea1d8	Move energy api to v2	2025-11-16 08:36:30 +01:00
linus	f95348769b	Fix missing local refresh file while loading from filesystem	2025-11-12 14:04:52 +01:00
linus	4673f14a1c	Add more logging for refresh process // renew refresh token if returned from api	2025-08-23 11:25:38 +02:00
linus	1a2f35f1b5	Add more logging for refresh process // renew refresh token if returned from api	2025-08-23 11:22:37 +02:00
Gert-Andry KäärameesandGitHub	33ee258f3f	handle missing refresh_token key in token file (#306 )	2025-07-28 07:39:44 +02:00
Russell StephensandGitHub	54db72df94	Update README.md (#304 ) Improve readability and copy-paste functionality of docker command	2025-07-16 10:58:03 +02:00
linus	70b027fb70	Fix and unit for and	2025-07-13 20:03:27 +02:00
linus	1c07ec1b46	Make 1.12.0 ready.. version chaos	2025-07-12 17:51:17 +02:00
linus	2fa154e023	Make 1.2.0 ready	2025-07-12 17:49:51 +02:00
linus	ae5e3074ed	Add logging options for plugin	2025-07-12 17:45:25 +02:00
Luka GraandGitHub	f5a1e48e26	TA trip statistics (#283 ) Add separate sensors for TA statistics averageFuelConsumptionAutomatic.value averageEnergyConsumptionAutomatic.value averageSpeedAutomatic.value tripMeterAutomatic.value	2025-07-12 17:38:00 +02:00
Ivan F. Martinez GitHub Linus Dietz	ee9d3cdef9	Some minor corrections and more checking for exceptions (#267 ) * better logging, indicate URL used on API errors, check exceptions in more places to dont kill threads, add option for mqtt logging * dont force token renew on 5xx errors * indicate payload on error message to understand better issue #270 * better checking on received update_interval #270 --------- Co-authored-by: Linus Dietz <45101649+Dielee@users.noreply.github.com>	2025-07-12 17:37:46 +02:00
G JohanssonandGitHub	f1914e99c3	Remove not used addon settings (#266 )	2025-07-11 21:57:26 +02:00
wivakuandGitHub	7a63f4d00f	add long term statistics for fuel/energy consumption (#243 ) Similar to #68	2025-07-11 21:56:05 +02:00
Brian WongandGitHub	b644fe32fb	Update README.md (#286 ) added V60 CC	2025-07-11 21:55:20 +02:00
linus	d9e4aada80	Bump Version	2025-07-08 13:21:52 +02:00
Linus DietzandGitHub	178f6a88af	Update README.md	2025-07-08 13:18:00 +02:00
Linus DietzandGitHub	5ed7ef97ba	Update README.md	2025-07-08 13:17:09 +02:00
linus	db87aec408	Fix missing refresh token from reauth	2025-07-08 13:15:39 +02:00
Linus Dietz GitHub esusxunil	234f48ff5c	Update volvo.py (#295 ) Replaced HTTP with HTTPS in responses Co-authored-by: esusxunil <61476952+esusxunil@users.noreply.github.com>	2025-07-08 12:57:20 +02:00
Linus DietzandGitHub	c2e873d7fe	Update README.md	2025-01-02 11:08:30 +01:00
linus	d3d511477b	Rework image creation	2024-10-28 07:26:02 +01:00
linus	75db5da324	Fix re-auth with OTP while app runtime #251	2024-10-27 10:06:47 +01:00
Linus DietzandGitHub	fd4fc9e173	Add EX30	2024-10-27 09:43:39 +01:00
linus	75013509f4	Fix re-auth with OTP while app runtime #251	2024-10-26 18:27:29 +02:00
linus	1d8132d93a	Bump version	2024-10-16 07:41:57 +02:00
linus	fc529f313f	Remove unused multiplier options #239	2024-10-16 07:40:37 +02:00
linus	3f36368773	Optimize vcc api key check	2024-09-25 07:39:23 +02:00