Bump pypi packages

Fix #318
Fix: use POST for continueAuthentication endpoint (#317 )
2026-03-23 07:57:37 +01:00 · 2026-03-23 07:47:15 +01:00 · 2026-03-23 07:43:53 +01:00 · 2026-01-02 18:17:31 +01:00 · 2026-01-02 18:16:30 +01:00 · 2026-01-02 18:12:47 +01:00
13 changed files with 1184 additions and 369 deletions
@@ -27,20 +27,20 @@ jobs:

    steps:
      - name: Checkout repository
-        uses: actions/checkout@v3  
+        uses: actions/checkout@v4
      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
      - name: Log in to the Container registry
-        uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+        uses: docker/login-action@v3
        with:
          registry: ${{ env.REGISTRY }}
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}
      - name: Extract metadata (tags, labels) for Docker
        id: meta
-        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        uses: docker/metadata-action@v5
        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@v2
+        uses: docker/build-push-action@v5
        with:
          context: .
          platforms: linux/amd64,linux/arm/v7,linux/arm/v6,linux/arm/v8
@@ -1,4 +1,5 @@
 # Volvo2Mqtt
+
 ![Supports aarch64 Architecture][aarch64-shield]
 ![Supports amd64 Architecture][amd64-shield]
 ![Supports armhf Architecture][armhf-shield]
@@ -15,25 +16,35 @@ Maybe this component works also with other Volvo cars. Please try out the native

 Home Assistant thread can be found [here](https://community.home-assistant.io/t/volvo2mqtt-connect-your-aaos-volvo/585699).

+<b>Important note: The Volvo api currently ONLY works in these [countries](https://developer.volvocars.com/terms-and-conditions/apis-supported-locations/)</b>
+
 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)
 - XC90 T8 PHEV (2023)
 - XC60 PHEV (2024)
 - XC60 PHEV (2023)
 - XC60 PHEV (2022)
+- XC60 B5 Mildhybrid (2023)
 - XC90 PHEV T8 (2023)
 - XC90 PHEV T8 (2024)
 - XC90 B5 Mildhybrid (2024)
 - V90 PHEV T8 (2019)*
+- V90 PHEV T6 (2024)
+- V90 B5 Mildhybrid (2023)
+- EX40 BEV (2025)

 *only partly working

@@ -44,9 +55,10 @@ 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" (partly broken since 2.10 car update)
+- Sensor "Charging Connection Status"
 - 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)"
@@ -67,13 +79,67 @@ Please let me know if your car works with this addon so I can expand the list!<b

 NOTE: Energy status currently available only for cars in the Europe / Middle East / Africa regions. [source](https://developer.volvocars.com/apis/energy/v1/overview/#availability)

+## OTP Authentication
+
+As of version <b>v1.9.0</b>, this addon uses the same OTP authentication as the Volvo app. 
+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 below)
+2. Fill in your settings and start volvo2Mqtt
+3. Your log will show the following lines <br> 
+```Waiting for otp code... Please check your mailbox and post your otp code to the following mqtt topic "volvoAAOS2mqtt/otp_code". Retry 0/15```<br>
+```Waiting for otp code... Please check your mailbox and post your otp code to the following mqtt topic "volvoAAOS2mqtt/otp_code". Retry 1/15```<br>
+```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>
+   6a. (optional) If your OTP cannot be safed, try to paste your OTP code via MQTT to the following topic: `volvoAAOS2mqtt/otp_code` <p>
+       <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>

 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"], "odometerMultiplier": 1, "averageSpeedDivider": 1, "averageFuelConsumptionMultiplier": 1}' -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>

@@ -85,22 +151,19 @@ 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_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_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)|


-
 [aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
@@ -108,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/2023.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,5 +1,6 @@
-requests~=2.29.0
-dynaconf~=3.1.12
-paho-mqtt~=1.6.1
-Babel~=2.12.1
-pytz~=2023.3
+requests~=2.32.0
+dynaconf~=3.2.13
+paho-mqtt~=2.1.0
+Babel~=2.18.0
+pytz~=2026.1.post1
+google_play_scraper~=1.2.6
@@ -1,48 +1,341 @@
+## 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:
+
+- 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:
+
+- 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
+
+## v1.8.18
+
+### 🐛 Bug Fixes:
+
+- Fix Backend State Sensor returning `null`
+
+## v1.8.17
+
+### 🚀 Features:
+
+- Move vehicle and vehicle details to v2 endpoint
+
+### 🐛 Bug Fixes:
+
+- Fix Battery Charge Level icon update
+
+## v1.8.16
+
+### 🚀 Features:
+
+- Add `Average energy consumption`, `Distance to empty battery` and `Washer fluid level` sensors
+- Support force update for `Backend state` Sensor
+- 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>
+  <b>Breaking change: The "Months to Service" sensor will be automatically deleted.<br>
+  "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)
@@ -50,17 +343,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 some times.
+  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" 
@@ -75,24 +370,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!
@@ -100,44 +399,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
@@ -150,21 +459,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
@@ -172,17 +485,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
@@ -1,6 +1,9 @@
 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

@@ -11,11 +14,11 @@ WORKDIR /volvoAAOS2mqtt
 RUN wget --no-cache https://raw.githubusercontent.com/Dielee/volvo2mqtt/main/requirements.txt

 # install dependencies
-RUN pip install -r requirements.txt
+RUN pip install -r requirements.txt --break-system-packages

 # copy the content of the local src directory to the working directory
 COPY / .
 RUN chmod a+x /volvoAAOS2mqtt/run.sh

 # command to run on container start
-CMD [ "/volvoAAOS2mqtt/run.sh" ]
+CMD [ "/volvoAAOS2mqtt/run.sh" ]
@@ -4,8 +4,10 @@ profile volvo2mqtt flags=(attach_disconnected,mediate_deleted) {
  #include <abstractions/base>

  # Capabilities
+  capability,
  file,
  signal (send) set=(kill,term,int,hup,cont),
+  network,

  # S6-Overlay
  /init ix,
@@ -1,6 +1,6 @@
 name: "Volvo2Mqtt"
 description: "Volvo AAOS MQTT bridge"
-version: "1.8.10"
+version: "1.13.3"
 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,15 +39,13 @@ 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
    vin: str?
    vccapikey:
        - match(^\b\w{32}\b$)
-    odometerMultiplier: int(1,)
-    averageSpeedDivider: int(1,)
-    averageFuelConsumptionMultiplier: int(1,)
 arch:
  - aarch64
  - amd64
@@ -1,56 +1,73 @@
 from config import settings

-VERSION = "v1.8.10"
+VERSION = "v1.13.3"

-OAUTH_URL = "https://volvoid.eu.volvocars.com/as/token.oauth2"
-VEHICLES_URL = "https://api.volvocars.com/connected-vehicle/v1/vehicles"
-VEHICLE_DETAILS_URL = "https://api.volvocars.com/connected-vehicle/v1/vehicles/{0}"
+OAUTH_TOKEN_URL = "https://volvoid.eu.volvocars.com/as/token.oauth2"
+OAUTH_AUTH_URL = "https://volvoid.eu.volvocars.com/as/authorization.oauth2"
+VEHICLES_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles"
+VEHICLE_DETAILS_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}"
 WINDOWS_STATE_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/windows"
 CLIMATE_START_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/commands/climatization-start"
 CLIMATE_STOP_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/commands/climatization-stop"
 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"
 ENGINE_STATE_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/engine-status"
-BATTERY_CHARGE_STATE_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/battery-charge-level"
-FUEL_STATE_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/fuel"
+FUEL_BATTERY_STATE_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/fuel"
 STATISTICS_URL = "https://api.volvocars.com/connected-vehicle/v2/vehicles/{0}/statistics"
 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"
+
+LENGTH_KILOMETERS = "km"
+SPEED_KILOMETERS_PER_HOUR = "km/h"
+TIME_MINUTES = "min"
+LENGTH_MILES = "mi"
+SPEED_MILES_PER_HOUR = "mph"
+VOLUME_LITERS = "L"
+ENERGY_KILO_WATT_HOUR = "kWh"
+TIME_HOURS = "h"
+TIME_MONTHS = "m"

 units = {
            "en_GB": {
                "divider": 1.60934,
-                "electric_range": {"unit": "mi"},
-                "odometer": {"unit": "mi"},
-                "average_speed": {"unit": "mph"},
-                "distance_to_empty": {"unit": "mi"},
-                "distance_to_service": {"unit": "mi"}
+                "electric_range": {"unit": LENGTH_MILES},
+                "odometer": {"unit": LENGTH_MILES},
+                "average_speed": {"unit": SPEED_MILES_PER_HOUR},
+                "distance_to_empty": {"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,
-                "electric_range": {"unit": "mi"},
-                "odometer": {"unit": "mi"},
-                "average_speed": {"unit": "mph"},
-                "distance_to_empty": {"unit": "mi"},
-                "distance_to_service": {"unit": "mi"}
+                "electric_range": {"unit": LENGTH_MILES},
+                "odometer": {"unit": LENGTH_MILES},
+                "average_speed": {"unit": SPEED_MILES_PER_HOUR},
+                "distance_to_empty": {"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_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"}
+window_states = {"CLOSED": "OFF", "OPEN": "ON", "UNSPECIFIED": "UNKNOWN", "AJAR": "ON"}
 door_states = {"CLOSED": "OFF", "OPEN": "ON", "UNSPECIFIED": "UNKNOWN", "AJAR": "ON"}
 engine_states = {"RUNNING": "ON", "STOPPED": "OFF", "true": "ON", "false": "OFF"}

@@ -62,29 +79,30 @@ 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": 100, "to": 100, "icon": "battery"},
-                    {"from": 99, "to": 90, "icon": "battery-90"},
-                    {"from": 89, "to": 80, "icon": "battery-80"},
-                    {"from": 79, "to": 70, "icon": "battery-70"},
-                    {"from": 69, "to": 60, "icon": "battery-60"},
-                    {"from": 59, "to": 50, "icon": "battery-50"},
-                    {"from": 49, "to": 40, "icon": "battery-40"},
-                    {"from": 39, "to": 30, "icon": "battery-30"},
-                    {"from": 29, "to": 20, "icon": "battery-20"},
-                    {"from": 19, "to": 10, "icon": "battery-10"},
-                    {"from": 9, "to": 0, "icon": "battery-alert-variant-outline"},
+                    {"from": float('inf'), "to": 100, "icon": "battery"},
+                    {"from": 100, "to": 90, "icon": "battery-90"},
+                    {"from": 90, "to": 80, "icon": "battery-80"},
+                    {"from": 80, "to": 70, "icon": "battery-70"},
+                    {"from": 70, "to": 60, "icon": "battery-60"},
+                    {"from": 60, "to": 50, "icon": "battery-50"},
+                    {"from": 50, "to": 40, "icon": "battery-40"},
+                    {"from": 40, "to": 30, "icon": "battery-30"},
+                    {"from": 30, "to": 20, "icon": "battery-20"},
+                    {"from": 20, "to": 10, "icon": "battery-10"},
+                    {"from": 10, "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": BATTERY_CHARGE_STATE_URL, "state_class": "measurement"},
-                        {"name": "Electric Range", "domain": "sensor", "id": "electric_range", "unit": "km" 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": "minutes", "icon": "timer-sync-outline", "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},
                        {"name": "Charging Connection Status", "domain": "sensor", "id": "charging_connection_status", "icon": "ev-plug-ccs2", "url": RECHARGE_STATE_URL},
                        {"name": "Estimated Charging Finish Time", "domain": "sensor", "id": "estimated_charging_finish_time", "icon": "timer-sync-outline", "url": RECHARGE_STATE_URL},
-                        {"name": "Odometer", "domain": "sensor", "id": "odometer", "unit": "km" if not units.get(settings["babelLocale"]) else units[settings["babelLocale"]]["odometer"]["unit"], "icon": "counter", "url": ODOMETER_STATE_URL, "state_class":"total_increasing"},
+                        {"name": "Odometer", "domain": "sensor", "id": "odometer", "unit": LENGTH_KILOMETERS if not units.get(settings["babelLocale"]) else units[settings["babelLocale"]]["odometer"]["unit"], "icon": "counter", "url": ODOMETER_STATE_URL, "state_class":"total_increasing"},
                        {"name": "Last Data Update", "domain": "sensor", "id": "last_data_update", "icon": "timer", "url": ""},
                        {"name": "Active schedules", "domain": "sensor", "id": "active_schedules", "icon": "timer", "url": ""},
                        {"name": "Window Front Left", "domain": "binary_sensor", "device_class": "window", "id": "window_front_left", "icon": "car-door-lock", "url": WINDOWS_STATE_URL},
@@ -108,13 +126,26 @@ supported_entities = [
                        {"name": "Tire Rear Left", "domain": "sensor", "id": "tyre_rear_left", "icon": "car-tire-alert", "url": TYRE_STATE_URL},
                        {"name": "Tire Rear Right", "domain": "sensor", "id": "tyre_rear_right", "icon": "car-tire-alert", "url": TYRE_STATE_URL},
                        {"name": "Engine State", "domain": "binary_sensor", "device_class": "running", "id": "engine_state", "icon": "engine", "url": ENGINE_STATE_URL},
-                        {"name": "Fuel Level", "domain": "sensor", "id": "fuel_level", "unit": "liters", "icon": "fuel", "url": FUEL_STATE_URL, "state_class": "measurement"},
-                        {"name": "Average Fuel Consumption", "domain": "sensor", "id": "average_fuel_consumption", "unit": "liters", "icon": "fuel", "url": STATISTICS_URL},
-                        {"name": "Distance to Empty", "domain": "sensor", "id": "distance_to_empty", "unit": "km" 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": "km/h" if not units.get(settings["babelLocale"]) else units[settings["babelLocale"]]["average_speed"]["unit"], "icon": "speedometer", "url": STATISTICS_URL, "state_class": "measurement"},
-                        {"name": "Hours to Service", "domain": "sensor", "id": "hours_to_service", "unit": "hour", "icon": "wrench-clock", "url": VEHICLE_DIAGNOSTICS_URL},
-                        {"name": "Distance to Service", "domain": "sensor", "id": "km_to_service", "unit": "km" if not units.get(settings["babelLocale"]) else units[settings["babelLocale"]]["distance_to_service"]["unit"], "icon": "wrench-clock", "url": VEHICLE_DIAGNOSTICS_URL},
-                        {"name": "Months to Service", "domain": "sensor", "id": "months_to_service", "unit": "month", "icon": "wrench-clock", "url": VEHICLE_DIAGNOSTICS_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, "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"},
+                        {"name": "Hours to Service", "domain": "sensor", "id": "hours_to_service", "unit": TIME_HOURS, "icon": "wrench-clock", "url": VEHICLE_DIAGNOSTICS_URL},
+                        {"name": "Distance to Service", "domain": "sensor", "id": "km_to_service", "unit": LENGTH_KILOMETERS if not units.get(settings["babelLocale"]) else units[settings["babelLocale"]]["distance_to_service"]["unit"], "icon": "wrench-clock", "url": VEHICLE_DIAGNOSTICS_URL},
+                        {"name": "Time to Service", "domain": "sensor", "id": "time_to_service", "icon": "wrench-clock", "url": VEHICLE_DIAGNOSTICS_URL},
                        {"name": "Service warning status", "domain": "sensor", "id": "service_warning_status", "icon": "alert-outline", "url": VEHICLE_DIAGNOSTICS_URL},
-                        {"name": "Service warning trigger", "domain": "sensor", "id": "service_warning_trigger", "icon": "alert-outline", "url": VEHICLE_DIAGNOSTICS_URL}
+                        {"name": "Washer Fluid Level warning", "domain": "sensor", "id": "washer_fluid_warning", "icon": "alert-outline", "url": VEHICLE_DIAGNOSTICS_URL},
+                        {"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"
@@ -5,13 +5,14 @@ import json
 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
 from config import settings
 from const import CLIMATE_START_URL, CLIMATE_STOP_URL, CAR_LOCK_URL, \
-            CAR_UNLOCK_URL, availability_topic, icon_states
-
+    CAR_UNLOCK_URL, availability_topic, icon_states, old_entity_ids, otp_mqtt_topic

 mqtt_client: mqtt.Client
 subscribed_topics = []
@@ -21,11 +22,20 @@ climate_timer = {}
 engine_status = {}
 devices = {}
 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 = mqtt.Client(mqtt.CallbackAPIVersion.VERSION1, "volvoAAOS2mqtt") \
+                if os.environ.get("IS_HA_ADDON") \
+                else mqtt.Client(mqtt.CallbackAPIVersion.VERSION1, "volvoAAOS2mqtt_" + settings.volvoData["username"].replace("+", ""))
+
+    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.will_set(availability_topic, "offline", 0, False)
    if settings["mqtt"]["username"] and settings["mqtt"]["password"]:
@@ -37,26 +47,60 @@ def connect():
            if conf_port > 0:
                port = settings["mqtt"]["port"]
    client.connect(settings["mqtt"]["broker"], port)
+    
    client.loop_start()
-    client.on_message = on_message
-    client.on_disconnect = on_disconnect
-    client.on_connect = on_connect
+    client.subscribe("volvoAAOS2mqtt/otp_code")

    global mqtt_client
    mqtt_client = client


+def create_otp_input():
+    state_topic = otp_mqtt_topic + "/state"
+    config = {
+        "name": "Volvo OTP",
+        "default_entity_id": "volvo_otp",
+        "schema": "state",
+        "command_topic": otp_mqtt_topic,
+        "state_topic": state_topic,
+        "unique_id": "volvoAAOS2mqtt_otp",
+        "pattern": r"\d{6}",
+        "icon": "mdi:two-factor-authentication",
+        "mode": "text"
+    }
+
+    mqtt_client.publish(
+        "homeassistant/text/volvoAAOS2mqtt/volvo_otp/config",
+        json.dumps(config),
+        retain=True
+    )
+
+    mqtt_client.publish(
+        state_topic,
+        "000000",
+        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"}]:
-            url_topic = f"homeassistant/image/{vin}_{entity['id']}/image_url"
+            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",
-                "url_topic": url_topic,
+                "content_type": "image/png",
+                "image_topic": image_topic,
                "device": device,
                "unique_id": f"volvoAAOS2mqtt_{vin}_{entity['id']}",
                "availability_topic": availability_topic
@@ -68,64 +112,115 @@ def send_car_images(vin, data, device):
                retain=True
            )

-            if entity["id"] == "exterior_image":
-                mqtt_client.publish(
-                    url_topic,
-                    data["images"]["exteriorDefaultUrl"],
-                    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"}

-            if entity["id"] == "interior_image":
+            # 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(f'{entity["id"]}_{vin}.png'):
+                ext_image = open(f'{entity["id"]}_{vin}.png', mode="rb").read()
                mqtt_client.publish(
-                    url_topic,
-                    data["images"]["interiorDefaultUrl"],
+                    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()
    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")
+def on_disconnect(client, userdata, rc):
+    logging.warning(f"MQTT disconnected, reconnecting automatically rc={rc}")


-def on_message(client, userdata, msg):
+def safe_on_message(client, userdata, msg):
    try:
-        vin = msg.topic.split('/')[2].split('_')[0]
-    except IndexError:
-        logging.error("Error - Cannot get vin from MQTT topic!")
+        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:
+        if msg.retain == 0:
+            global otp_code
+            otp_code = payload
+            set_otp_state()
+        else:
+            logging.warning("Found retained OTP, this can't work! Please clean retained messages!")
+        return None
+    else:
+        try:
+            vin = msg.topic.split('/')[2].split('_')[0]
+        except IndexError:
+            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:
+        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):
@@ -137,13 +232,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()
+        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")
@@ -151,28 +246,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():
@@ -196,10 +291,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

@@ -215,11 +310,18 @@ def start_climate(vin):
 def update_loop():
    create_ha_devices()
    while True:
-        logging.info("Sending mqtt update...")
-        send_heartbeat()
-        update_car_data()
-        logging.info("Mqtt update done. Next run in " + str(settings["updateInterval"]) + " seconds.")
-        time.sleep(settings["updateInterval"])
+        if settings["updateInterval"] > 0:
+            logging.info("Sending mqtt update...")
+            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")
+            time.sleep(30)


 def update_car_data(force_update=False, overwrite={}):
@@ -227,7 +329,7 @@ def update_car_data(force_update=False, overwrite={}):
    last_data_update = format_datetime(datetime.now(util.TZ), format="medium", locale=settings["babelLocale"])
    for vin in volvo.vins:
        for entity in volvo.supported_endpoints[vin]:
-            if entity["domain"] == "button":
+            if entity["domain"] in ["button"]:
                continue

            ov_entity_id = ""
@@ -244,6 +346,13 @@ def update_car_data(force_update=False, overwrite={}):
                state = last_data_update
            elif entity["id"] == "active_schedules":
                state = active_schedules[vin]
+            elif entity["id"] == "update_interval":
+                state = settings["updateInterval"]
+            elif entity["id"] == "api_backend_status":
+                if force_update:
+                    state = volvo.get_backend_status()
+                else:
+                    state = volvo.backend_status
            else:
                if entity["id"] == ov_entity_id and vin == ov_vin:
                    state = ov_state
@@ -252,32 +361,52 @@ def update_car_data(force_update=False, overwrite={}):

            if entity["domain"] == "device_tracker" or entity["id"] == "active_schedules":
                topic = f"homeassistant/{entity['domain']}/{vin}_{entity['id']}/attributes"
+            elif entity["id"] == "warnings":
+                mqtt_client.publish(
+                    f"homeassistant/{entity['domain']}/{vin}_{entity['id']}/attributes",
+                    json.dumps(state),
+                    retain=True
+                )
+                if state:
+                    state = sum(value == "FAILURE" for value in state.values())
+                else:
+                    state = 0
+
+                topic = f"homeassistant/{entity['domain']}/{vin}_{entity['id']}/state"
            else:
                topic = f"homeassistant/{entity['domain']}/{vin}_{entity['id']}/state"

-            if state:
+            logging.info(f"update_car_data {topic} {state}")
+            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)


 def update_ha_device(entity, vin, state):
    icon_config = icon_states.get(entity["id"])
-    if icon_config and state:
-        if state.replace(".", "").isnumeric():
-            state = float(state)
-            icon = util.get_icon_between(icon_config, state)
+    try:
+        if icon_config and state:
+            logging.debug("Entity " + entity["id"] + " state " + str(state))
+            if isinstance(state, float):
+                icon = util.get_icon_between(icon_config, state)
+            elif state.replace(".", "").isnumeric():
+                state = float(state)
+                icon = util.get_icon_between(icon_config, state)
+            else:
+                icon = icon_config[state]
        else:
-            icon = icon_config[state]
-    else:
+            return None
+    except:
        return None

    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",
@@ -293,7 +422,7 @@ def update_ha_device(entity, vin, state):

    if entity.get("state_class"):
        config["state_class"] = entity["state_class"]
-        
+
    if entity.get("domain") == "device_tracker":
        config["json_attributes_topic"] = f"homeassistant/{entity['domain']}/{vin}_{entity['id']}/attributes"

@@ -317,15 +446,16 @@ def create_ha_devices():
        devices[vin] = device
        for entity in volvo.supported_endpoints[vin]:
            config = {
-                        "name": entity['name'],
-                        "object_id": f"volvo_{vin}_{entity['id']}",
-                        "schema": "state",
-                        "icon": f"mdi:{entity['icon']}",
-                        "state_topic": f"homeassistant/{entity['domain']}/{vin}_{entity['id']}/state",
-                        "device": device,
-                        "unique_id": f"volvoAAOS2mqtt_{vin}_{entity['id']}",
-                        "availability_topic": availability_topic
-                    }
+                "name": entity['name'],
+                "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",
+                "device": device,
+                "unique_id": f"volvoAAOS2mqtt_{vin}_{entity['id']}",
+                "availability_topic": availability_topic
+            }
+
            if entity.get("device_class"):
                config["device_class"] = entity["device_class"]

@@ -335,13 +465,20 @@ def create_ha_devices():
            if entity.get("state_class"):
                config["state_class"] = entity["state_class"]

-            if entity.get("domain") == "device_tracker" or entity.get("id") == "active_schedules":
+            if (entity.get("domain") == "device_tracker" or entity.get("id") == "active_schedules"
+                    or entity.get("id") == "warnings"):
                config["json_attributes_topic"] = f"homeassistant/{entity['domain']}/{vin}_{entity['id']}/attributes"
-            elif entity.get("domain") in ["switch", "lock", "button"]:
+
+            if entity.get("domain") in ["switch", "lock", "button", "number"]:
                command_topic = f"homeassistant/{entity['domain']}/{vin}_{entity['id']}/command"
                config["command_topic"] = command_topic
                subscribed_topics.append(command_topic)
                mqtt_client.subscribe(command_topic)
+
+                if entity["domain"] == "number":
+                    config["min"] = entity["min"]
+                    config["max"] = entity["max"]
+                    config["mode"] = entity["mode"]
            elif entity.get("domain") == "image":
                config["url_topic"] = f"homeassistant/{entity['domain']}/{vin}_{entity['id']}/image_url"

@@ -355,9 +492,15 @@ def create_ha_devices():


 def send_heartbeat():
-    mqtt_client.publish(availability_topic, "online")
+    mqtt_client.publish(availability_topic, "online", retain=True)


 def send_offline():
-    mqtt_client.publish(availability_topic, "offline")
+    mqtt_client.publish(availability_topic, "offline", retain=True)

+
+def delete_old_entities():
+    for vin in volvo.vins:
+        for entity in old_entity_ids:
+            topic = f"homeassistant/sensor/volvoAAOS2mqtt/{vin}_{entity}/config"
+            mqtt_client.publish(topic, payload="", retain=True)
@@ -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!
@@ -4,6 +4,8 @@ import os
 import re
 import sys
 import config
+import json
+from google_play_scraper import app
 from logging import handlers
 from datetime import datetime
 from const import units
@@ -28,11 +30,34 @@ class SensitiveDataFilter(logging.Filter):
            record.msg = re.sub(pattern, "<REDACTED>", record.msg)
        return True

+def get_volvo_app_version():
+    result = app(
+        'se.volvo.vcc',
+        lang='en',
+        country='us'
+    )
+
+    if "version" in result:
+        return result["version"]
+    else:
+        return "5.37.0"
+
+def get_token_path():
+    token_path = ".token"
+    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

@@ -40,13 +65,13 @@ def get_icon_between(icon_list, state):
 def setup_logging():
    log_location = "volvo2mqtt.log"
    if os.environ.get("IS_HA_ADDON"):
-        check_existing_folder()
+        check_existing_folder("/addons/volvo2mqtt/log/")
        log_location = "/addons/volvo2mqtt/log/volvo2mqtt.log"

    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)

@@ -73,8 +98,8 @@ def setup_logging():
            logger.setLevel(logging.ERROR)


-def check_existing_folder():
-    Path("/addons/volvo2mqtt/log/").mkdir(parents=True, exist_ok=True)
+def check_existing_folder(path):
+    Path(path).mkdir(parents=True, exist_ok=True)


 def keys_exists(element, *keys):
@@ -1,18 +1,21 @@
+import json
 import logging
 import requests
 import mqtt
 import util
 import time
 import re
-from threading import currentThread
+import os.path
+from threading import current_thread, Thread
 from datetime import datetime, timedelta
 from config import settings
 from babel.dates import format_datetime
 from json import JSONDecodeError
 from const import charging_system_states, charging_connection_states, door_states, window_states, \
-    OAUTH_URL, VEHICLES_URL, VEHICLE_DETAILS_URL, RECHARGE_STATE_URL, CLIMATE_START_URL, \
-    WINDOWS_STATE_URL, LOCK_STATE_URL, TYRE_STATE_URL, supported_entities, BATTERY_CHARGE_STATE_URL, \
-    STATISTICS_URL, ENGINE_DIAGNOSTICS_URL, engine_states
+    OAUTH_AUTH_URL, OAUTH_TOKEN_URL, VEHICLES_URL, VEHICLE_DETAILS_URL, RECHARGE_STATE_URL, CLIMATE_START_URL, \
+    WINDOWS_STATE_URL, LOCK_STATE_URL, TYRE_STATE_URL, supported_entities, FUEL_BATTERY_STATE_URL, \
+    STATISTICS_URL, ENGINE_DIAGNOSTICS_URL, VEHICLE_DIAGNOSTICS_URL, API_BACKEND_STATUS, WARNINGS_URL, engine_states, \
+    otp_max_loops

 session = requests.Session()
 session.headers = {
@@ -27,41 +30,154 @@ vins = []
 supported_endpoints = {}
 cached_requests = {}
 vcc_api_keys = []
+backend_status = ""


-def authorize():
-    headers = {
-        "authorization": "Basic aDRZZjBiOlU4WWtTYlZsNnh3c2c1WVFxWmZyZ1ZtSWFEcGhPc3kxUENhVXNpY1F0bzNUUjVrd2FKc2U0QVpkZ2ZJZmNMeXc=",
-        "content-type": "application/x-www-form-urlencoded",
-        "accept": "application/json"
-    }
+def authorize(renew_tokenfile=False):
+    global refresh_token
+
+    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)
+        try:
+            data = json.load(f)
+            refresh_token = data["refresh_token"]
+            refresh_auth()
+        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()
+        auth_session.headers = {
+            "authorization": "Basic aDRZZjBiOlU4WWtTYlZsNnh3c2c1WVFxWmZyZ1ZtSWFEcGhPc3kxUENhVXNpY1F0bzNUUjVrd2FKc2U0QVpkZ2ZJZmNMeXc=",
+            "User-Agent": "vca-android/" + util.get_volvo_app_version(),
+            "Accept-Encoding": "gzip",
+            "Content-Type": "application/json; charset=utf-8"
+        }
+
+        url_params = ("?client_id=h4Yf0b"
+                      "&response_type=code"
+                      "&acr_values=urn:volvoid:aal:bronze:2sv"
+                      "&response_mode=pi.flow"
+                      "&scope=openid email profile care_by_volvo:financial_information:invoice:read care_by_volvo:financial_information:payment_method care_by_volvo:subscription:read customer:attributes customer:attributes:write order:attributes vehicle:attributes tsp_customer_api:all conve:brake_status conve:climatization_start_stop conve:command_accessibility conve:commands conve:diagnostics_engine_status conve:diagnostics_workshop conve:doors_status conve:engine_status conve:environment conve:fuel_status conve:honk_flash conve:lock conve:lock_status conve:navigation conve:odometer_status conve:trip_statistics conve:tyre_status conve:unlock conve:vehicle_relation conve:warnings conve:windows_status energy:battery_charge_level energy:charging_connection_status energy:charging_system_status energy:electric_range energy:estimated_charging_time energy:recharge_status vehicle:attributes")
+
+        auth = auth_session.get(OAUTH_AUTH_URL + url_params)
+        if auth.status_code == 200:
+            response = auth.json()
+            auth_state = response["status"]
+
+            if auth_state == "USERNAME_PASSWORD_REQUIRED":
+                auth_session.headers.update({"x-xsrf-header": "PingFederate"})
+                response = check_username_password(auth_session, response)
+                auth_state = response["status"]
+
+                if auth_state == "OTP_REQUIRED":
+                    response = send_otp(auth_session, response)
+                    response = continue_auth(auth_session, response)
+                    token_data = get_token(auth_session, response)
+                else:
+                    raise Exception("Unkown auth state " + auth_state)
+            elif auth_state == "OTP_REQUIRED":
+                response = send_otp(auth_session, response)
+                response = continue_auth(auth_session, response)
+                token_data = get_token(auth_session, response)
+            elif auth_state == "OTP_VERIFIED":
+                response = continue_auth(auth_session, response)
+                token_data = get_token(auth_session, response)
+            elif auth_state == "COMPLETED":
+                token_data = get_token(auth_session, response)
+            else:
+                raise Exception("Unkown auth state " + auth_state)
+
+            session.headers.update({"authorization": "Bearer " + token_data["access_token"]})
+
+            global token_expires_at
+            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)
+        else:
+            message = auth.json()
+            raise Exception(message["details"][0]["userMessage"])
+
+    get_vcc_api_keys()
+    get_vehicles()
+    check_supported_endpoints()
+    Thread(target=backend_status_loop,name="backend_status_thread").start()
+
+def continue_auth(auth_session, data):
+    next_url = data["_links"]["continueAuthentication"]["href"].replace("http://", "https://") + "?action=continueAuthentication"
+    auth = auth_session.post(next_url, data="{}")

-    body = {
-        "username": settings.volvoData["username"],
-        "password": settings.volvoData["password"],
-        "grant_type": "password",
-        "scope": "openid email profile care_by_volvo:financial_information:invoice:read care_by_volvo:financial_information:payment_method care_by_volvo:subscription:read customer:attributes customer:attributes:write order:attributes vehicle:attributes tsp_customer_api:all conve:brake_status conve:climatization_start_stop conve:command_accessibility conve:commands conve:diagnostics_engine_status conve:diagnostics_workshop conve:doors_status conve:engine_status conve:environment conve:fuel_status conve:honk_flash conve:lock conve:lock_status conve:navigation conve:odometer_status conve:trip_statistics conve:tyre_status conve:unlock conve:vehicle_relation conve:warnings conve:windows_status energy:battery_charge_level energy:charging_connection_status energy:charging_system_status energy:electric_range energy:estimated_charging_time energy:recharge_status vehicle:attributes"
-    }
-    auth = requests.post(OAUTH_URL, data=body, headers=headers)
    if auth.status_code == 200:
-        data = auth.json()
-        session.headers.update({"authorization": "Bearer " + data["access_token"]})
-
-        global token_expires_at, refresh_token
-        token_expires_at = datetime.now(util.TZ) + timedelta(seconds=(data["expires_in"] - 30))
-        refresh_token = data["refresh_token"]
-
-        get_vcc_api_keys()
-        get_vehicles()
-        check_supported_endpoints()
+        return auth.json()
    else:
        message = auth.json()
+        raise Exception(message["details"][0]["userMessage"])
+
+
+def get_token(auth_session, data):
+    auth_session.headers.update({"content-type": "application/x-www-form-urlencoded"})
+    body = {"code": data["authorizeResponse"]["code"], "grant_type": "authorization_code"}
+    token_auth = auth_session.post(OAUTH_TOKEN_URL, data=body)
+
+    if token_auth.status_code == 200:
+        return token_auth.json()
+    else:
+        message = token_auth.json()
        raise Exception(message["error_description"])


+def check_username_password(auth_session, data):
+    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))
+
+    if auth.status_code == 200:
+        return auth.json()
+    else:
+        message = auth.json()
+        raise Exception(message["details"][0]["userMessage"])
+
+
+def send_otp(auth_session, data):
+    mqtt.create_otp_input()
+    next_url = data["_links"]["checkOtp"]["href"].replace("http://", "https://") + "?action=checkOtp"
+    body = {"otp": ""}
+
+    for i in range(otp_max_loops):
+        if mqtt.otp_code:
+            body["otp"] = mqtt.otp_code
+            break
+
+        logging.info("Waiting for otp code... Please check your mailbox and post your otp code to the following "
+                     "mqtt topic \"volvoAAOS2mqtt/otp_code\". Retry " + str(i) + "/" + str(otp_max_loops))
+        time.sleep(5)
+
+    if not mqtt.otp_code:
+        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:
+        message = auth.json()
+        raise Exception(message["details"][0]["userMessage"])
+
+
 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",
@@ -74,18 +190,45 @@ def refresh_auth():
    }

    try:
-        auth = requests.post(OAUTH_URL, data=body, headers=headers)
+        auth = requests.post(OAUTH_TOKEN_URL, data=body, headers=headers)
    except requests.exceptions.RequestException as e:
        logging.error("Error refreshing credentials data: " + str(e))
        return None

    if auth.status_code == 200:
-        data = auth.json()
-        session.headers.update({"authorization": "Bearer " + data["access_token"]})
+        token_path = util.get_token_path()
+        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():
@@ -116,6 +259,7 @@ def get_vehicles():
    else:
        initialize_climate(vins)
        initialize_scheduler(vins)
+        mqtt.delete_old_entities()
        logging.info("Vin: " + str(vins) + " found!")


@@ -197,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


@@ -240,16 +392,11 @@ def check_supported_endpoints():
    for vin in vins:
        supported_endpoints[vin] = []
        for entity in supported_entities:
-            if entity["id"] == "battery_charge_level" and entity["url"] == BATTERY_CHARGE_STATE_URL \
+            if entity["id"] == "battery_charge_level" and entity["url"] == FUEL_BATTERY_STATE_URL \
                    and any("battery_charge_level" in d["id"] for d in supported_endpoints[vin]):
                # If battery charge level could be found in recharge-api, skip the second battery charge sensor
                continue

-            if entity["id"] == "engine_state" and entity["url"] == ENGINE_DIAGNOSTICS_URL \
-                    and any("engine_state" in d["id"] for d in supported_endpoints[vin]):
-                # If engine state could be found in engine state endpoint, skip the second engine running sensor
-                continue
-
            if entity.get('url'):
                state = api_call(entity["url"], "GET", vin, entity["id"])
            else:
@@ -308,14 +455,52 @@ def check_engine_status(vin):
        # Exit thread as engine state is unsupported by car
        return None

-    t = currentThread()
+    t = current_thread()
    while getattr(t, "do_run", True):
        engine_state = api_call(endpoint_url, "GET", vin, "engine_state", True)
        if engine_state == "ON":
            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:
+        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
+    try:
+        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"
+
+        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


 def api_call(url, method, vin, sensor_id=None, force_update=False, key_change=False):
@@ -323,35 +508,35 @@ def api_call(url, method, vin, sensor_id=None, force_update=False, key_change=Fa
        refresh_auth()

    if url in [RECHARGE_STATE_URL, WINDOWS_STATE_URL, LOCK_STATE_URL, TYRE_STATE_URL,
-               STATISTICS_URL, ENGINE_DIAGNOSTICS_URL]:
+               STATISTICS_URL, ENGINE_DIAGNOSTICS_URL, VEHICLE_DIAGNOSTICS_URL, FUEL_BATTERY_STATE_URL, WARNINGS_URL]:
        # Minimize API calls for endpoints with multiple values
        response = cached_request(url, method, vin, force_update, key_change)
        if response is None:
            # 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:
@@ -369,14 +554,14 @@ def api_call(url, method, vin, sensor_id=None, force_update=False, key_change=Fa
            return None
        elif response.status_code == 403 and "message" in data:
            if "Out of call volume quota" in data["message"]:
-                logging.warn("Quota extended. Try to change VCCAPIKEY!")
+                logging.warning("Quota extended. Try to change VCCAPIKEY!")
                change_vcc_api_key()
                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


@@ -384,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)}
@@ -400,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
@@ -415,149 +600,202 @@ def cached_request(url, method, vin, force_update=False, key_change=False):


 def parse_api_data(data, sensor_id=None):
-    data = data["data"]
-    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["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 ""
-            else:
-                return 0
+    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
-    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":
-        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") \
-            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":
-        if util.keys_exists(data, "averageFuelConsumption"):
-            average_fuel_con = float(data["averageFuelConsumption"]["value"])
-            if average_fuel_con > 0:
-                multiplier = 1
-                if util.keys_exists(settings["volvoData"], "averageFuelConsumptionMultiplier"):
-                    multiplier = settings["volvoData"]["averageFuelConsumptionMultiplier"]
-                    if isinstance(multiplier, str):
-                        multiplier = 1
-                    elif multiplier < 1:
-                        multiplier = 1
-                return average_fuel_con * multiplier
-        return None
-    elif sensor_id == "average_speed":
-        if util.keys_exists(data, "averageSpeed"):
-            average_speed = float(data["averageSpeed"]["value"])
-            if average_speed > 1:
-                divider = 1
-                if util.keys_exists(settings["volvoData"], "averageSpeedDivider"):
-                    divider = settings["volvoData"]["averageSpeedDivider"]
-                    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 = {}
-        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":
-        if util.keys_exists(data, "distanceToEmpty"):
-            distance_to_empty = int(data["distanceToEmpty"]["value"])
-            if distance_to_empty > 0:
-                return util.convert_metric_values(data["distanceToEmpty"]["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 == "months_to_service":
-        return data["timeToService"]["value"] if util.keys_exists(data, "timeToService") else None
-    elif sensor_id == "service_warning_status":
-        return data["serviceWarning"]["value"] if util.keys_exists(data, "serviceWarning") else None
-    elif sensor_id == "service_warning_trigger":
-        return data["serviceTrigger"]["value"] if util.keys_exists(data, "serviceTrigger") else None
    else:
-        return None
+        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 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
+        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
+
+
Author	SHA1	Message	Date
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
linus	0cfb1a9e3f	Support new statistic endpoints // Remove unused multiplier options	2024-09-20 09:43:59 +02:00
linus	e179c76d39	Bump version	2024-09-16 19:27:51 +02:00
linus	391ae952d9	Bump version	2024-09-16 17:19:33 +02:00
Nick CampbellandGitHub	f9f5e218f5	Handle boundary condition when selecting battery icon (#235 ) We need to be able to handle floating point numbers right on the boundary between two icons. This means our from..to configurations must perfectly align at each end, and the algorithm to select those must not be both less-than-or-equal (<=) AND more-than-or-equal (>=). After this change: >>> get_icon_between(icon_states["battery_charge_level"], 0) 'battery-alert-variant-outline' >>> get_icon_between(icon_states["battery_charge_level"], 9.9) 'battery-alert-variant-outline' >>> get_icon_between(icon_states["battery_charge_level"], 10) 'battery-10' >>> get_icon_between(icon_states["battery_charge_level"], 39) 'battery-30' >>> get_icon_between(icon_states["battery_charge_level"], 39.9) 'battery-30' >>> get_icon_between(icon_states["battery_charge_level"], 39.9999) 'battery-30' >>> get_icon_between(icon_states["battery_charge_level"], 40) 'battery-40' >>> get_icon_between(icon_states["battery_charge_level"], 99.99) 'battery-90' >>> get_icon_between(icon_states["battery_charge_level"], 100) 'battery' >>> get_icon_between(icon_states["battery_charge_level"], 101) 'battery'	2024-09-16 17:17:22 +02:00
Linus DietzandGitHub	12744b6397	Add EX40 BEV	2024-09-06 09:56:35 +02:00
Linus DietzandGitHub	065c10c5bc	Add alpine comunity packages	2024-08-30 12:02:55 +02:00
Linus Dietz	4b83aa149e	Update readme	2024-08-09 09:50:51 +02:00
Linus Dietz	4a8caaf436	Add supported cars	2024-08-09 09:46:16 +02:00
Linus Dietz	710ca2fcbc	Bump version	2024-08-09 09:32:21 +02:00
Linus Dietz	c1998f8938	Rework image function	2024-08-09 09:30:04 +02:00
Linus Dietz	693e0b0048	Fix typo	2024-08-09 08:26:22 +02:00
Linus Dietz	f23f56e45e	Take care of corrupted token files #220	2024-08-09 08:25:17 +02:00
Linus Dietz	17eaa8dde2	Added retain status to survive HA reboots #210	2024-07-29 10:10:59 +02:00
Linus DietzandGitHub	8f3bf5f3b1	add addon changelog	2024-07-08 11:22:52 +02:00
Linus DietzandGitHub	9d4f8fab0c	Bump addon version	2024-07-08 11:21:24 +02:00
Linus Dietz	414ac503b1	Fix backend status URL #209 #208	2024-07-08 10:52:54 +02:00
Linus Dietz	18926b67e4	Fix typo	2024-05-29 20:11:36 +02:00
Linus Dietz	f650ea9247	Fix retained otp messages bug	2024-05-29 20:08:19 +02:00
Dielee	a7a2e1182c	Add missing addon changelog #199	2024-05-29 15:49:23 +02:00
Linus DietzandGitHub	3d3227de0d	Update README.md	2024-05-29 07:46:08 +02:00
Dielee	44509529ff	Set otp state right after HA input	2024-05-28 08:38:15 +02:00
Linus DietzandGitHub	0dd5852d81	Update README.md	2024-05-28 08:34:45 +02:00
Dielee	c6ddd71021	Bump addon version	2024-05-28 08:26:38 +02:00
Dielee	1f0612ca4a	Try to fix not saveable OTP Code	2024-05-28 08:26:18 +02:00
Dielee	6306c9a4b3	Let token survive addon updates	2024-05-27 14:16:07 +02:00
Dielee	8bd0388690	Extend waiting time for otp tp 120 seconds	2024-05-27 14:05:19 +02:00
Linus DietzandGitHub	245dd82c82	Update README.md	2024-05-27 14:02:39 +02:00
Dielee	8e471d8eb0	Fix security alert	2024-05-27 08:27:25 +02:00
Gert-janandGitHub	cb1377005c	Add "Battery Capacity" sensor (#185 )	2024-05-27 08:18:25 +02:00
Linus DietzandGitHub	89bd76e981	Move to OTP auth (#190 ) * Rebuild app OTP authentication * Adding OTP readme * Fix error message // Remove duplicated scopes * Add dynamic header building including latest app version * Fix missing startupcheck if using token from file * Change version	2024-05-27 08:17:52 +02:00
Linus DietzandGitHub	19aafa3b21	Move actions to node.js 20	2024-03-14 09:14:12 +01:00
Linus DietzandGitHub	03755ca034	add C40 2024	2024-03-05 18:32:10 +01:00
Linus Dietz	907440b81e	Fix changelog typo	2024-01-26 08:29:26 +01:00
Linus Dietz	a68faf8267	Merge remote-tracking branch 'origin/main' into main	2024-01-26 08:25:50 +01:00
Linus Dietz	290a441f2b	Add state cacheing for "diagnostics" endpoint	2024-01-26 08:24:51 +01:00
mkrzychandGitHub	63f333a186	Add XC60 B5 2023	2024-01-24 10:18:36 +01:00
Linus Dietz	3d2285f59e	Add option to disable updates #160	2024-01-23 09:25:25 +01:00
Linus Dietz	e444b6a838	Bump version	2024-01-23 08:44:57 +01:00
Linus Dietz	ce856d91c4	Fix #165	2024-01-23 08:42:37 +01:00
Anthony GitHub Anthony	9c749001c9	V90 B5 Mildhybrid (2023) added (#164 ) Co-authored-by: Anthony <anthony@betts.sh>	2024-01-23 06:38:36 +01:00
Linus Dietz	390df68203	Add warnings endpoint #151	2024-01-22 09:17:01 +01:00
Linus Dietz	fff2ccd6f4	Add option for dynamic interval settings #160	2024-01-22 08:08:13 +01:00
Linus DietzandGitHub	2622fc5e67	Update maintenance shield	2024-01-03 08:35:17 +01:00
Linus Dietz	776564b8b7	Add new charging system states #152	2024-01-02 15:04:41 +01:00
Dielee	b55e7ef6fb	Change units to HA default #148	2023-12-18 14:00:40 +01:00
Dielee	25e90091ab	Merge remote-tracking branch 'origin/main' into main	2023-12-14 08:54:50 +01:00
Dielee	c4c801e46a	Try to fix addon build #146	2023-12-14 08:53:40 +01:00
Dielee	8326ed3c88	Fix unknown state for icon update	2023-12-14 08:52:53 +01:00
Linus DietzandGitHub	3166a1c6ab	Add country info	2023-12-01 11:43:03 +01:00
Linus Dietz	80646bbf51	Fix unknown state for icon update	2023-11-28 12:47:42 +01:00
Linus Dietz	7401ebfc53	Add `UNSPECIFIED` state for windows	2023-11-27 14:30:07 +01:00
Linus DietzandGitHub	bdbb6bd5f8	Add V90 PHEV 2024	2023-11-23 06:43:02 +01:00
Linus Dietz	f03ff8953c	Fix #133	2023-11-22 07:15:20 +01:00
Linus Dietz	2e95e71661	Fix Backend State Sensor returning `null`	2023-11-21 18:50:55 +01:00
Linus Dietz	126cc37269	Move vehicles details endpoint to v2 // Try to fix #131	2023-11-21 13:59:47 +01:00
Linus Dietz	cb10fe07c3	Move vehicles details endpoint to v2	2023-11-21 09:46:16 +01:00
Linus Dietz	f3244ccdc0	Move vehicles endpoint to v2	2023-11-21 09:42:56 +01:00
Linus Dietz	1223853208	Bump version	2023-11-21 08:59:25 +01:00
Linus Dietz	1f0c52b5a7	Add average energy consumption, distance to empty battery and washer fluid level sensor	2023-11-21 08:55:27 +01:00
Linus Dietz	161c02fc11	Support force update for backend state	2023-11-21 08:25:33 +01:00
Linus Dietz	be4a1b6791	Use cached requests for fuel endpoints	2023-11-21 08:19:26 +01:00
Linus Dietz	8803f9ff1d	Add api backend state sensor	2023-11-20 19:33:27 +01:00
Linus Dietz	843e00acd1	Move battery charge to v2 endpoint	2023-11-20 18:34:57 +01:00
Linus Dietz	3be0a4edbf	Bump version	2023-11-20 07:49:34 +01:00
Linus Dietz	22cf71f007	Fix distance to empty sensor	2023-11-20 07:46:37 +01:00
Linus Dietz	b7feb9713b	Remove unused service warning trigger	2023-11-20 07:43:42 +01:00
Linus DietzandGitHub	1f53ef0198	Update CHANGELOG.md	2023-11-17 17:58:31 +01:00
Linus Dietz	d07e6dfe6e	Add "Time to Service" sensor	2023-11-17 17:57:30 +01:00
Linus Dietz	80473d5120	Fix apparmor for Debian 12	2023-11-11 14:56:41 +01:00
Linus Dietz	81b2771c80	Fix AJAR state for windows	2023-11-11 14:51:52 +01:00
Linus Dietz	f1953e1baa	Quality optimizations	2023-11-10 09:21:00 +01:00