From 81b2771c80c57e4ca6700eb0772f947f63eecb15 Mon Sep 17 00:00:00 2001
From: Linus Dietz <45101649+Dielee@users.noreply.github.com>
Date: Sat, 11 Nov 2023 14:51:52 +0100
Subject: [PATCH] Fix AJAR state for windows

---
 src/CHANGELOG.md | 8 +++++++-
 src/config.yaml  | 2 +-
 src/const.py     | 4 ++--
 src/volvo.py     | 4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/CHANGELOG.md b/src/CHANGELOG.md
index 167277e..df5b094 100644
--- a/src/CHANGELOG.md
+++ b/src/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v1.8.12
+### 🐛 Bug Fixes:
+
+- Fix `AJAR` state for windows
+- Fix deprecation from `currentThread` to `current_thread`
+
 ## v1.8.11
 ### 🐛 Bug Fixes:
 
@@ -64,7 +70,7 @@
 ### 🚀 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:
diff --git a/src/config.yaml b/src/config.yaml
index be6d0dd..80a4045 100644
--- a/src/config.yaml
+++ b/src/config.yaml
@@ -1,6 +1,6 @@
 name: "Volvo2Mqtt"
 description: "Volvo AAOS MQTT bridge"
-version: "1.8.11"
+version: "1.8.12"
 slug: "volvo2mqtt"
 init: false
 url: "https://github.com/Dielee/volvo2mqtt"
diff --git a/src/const.py b/src/const.py
index 5aab980..89791aa 100644
--- a/src/const.py
+++ b/src/const.py
@@ -1,6 +1,6 @@
 from config import settings
 
-VERSION = "v1.8.11"
+VERSION = "v1.8.12"
 
 OAUTH_URL = "https://volvoid.eu.volvocars.com/as/token.oauth2"
 VEHICLES_URL = "https://api.volvocars.com/connected-vehicle/v1/vehicles"
@@ -50,7 +50,7 @@
                               "CONNECTION_STATUS_CONNECTED_DC": "Connected DC", "CONNECTION_STATUS_CONNECTED_AC": "Connected AC",
                               "CONNECTION_STATUS_FAULT": "Fault"}
 
-window_states = {"CLOSED": "OFF", "OPEN": "ON"}
+window_states = {"CLOSED": "OFF", "OPEN": "ON", "AJAR": "ON"}
 door_states = {"CLOSED": "OFF", "OPEN": "ON", "UNSPECIFIED": "UNKNOWN", "AJAR": "ON"}
 engine_states = {"RUNNING": "ON", "STOPPED": "OFF", "true": "ON", "false": "OFF"}
 
diff --git a/src/volvo.py b/src/volvo.py
index 09eaef9..9fe8f11 100644
--- a/src/volvo.py
+++ b/src/volvo.py
@@ -4,7 +4,7 @@
 import util
 import time
 import re
-from threading import currentThread
+from threading import current_thread
 from datetime import datetime, timedelta
 from config import settings
 from babel.dates import format_datetime
@@ -303,7 +303,7 @@ 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":