#296: Detect charging from BMS instead of car state

Author: nanomad

poetry.lock

@@ -22,7 +22,7 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = "^3.12"
-saic-ismart-client-ng = "0.5.4"
+saic-ismart-client-ng = "0.6.0"
 httpx = "^0.27.0"
 gmqtt = "^0.7.0"
 inflection = "^0.5.1"
@@ -47,7 +47,8 @@ build-backend = "poetry.core.masonry.api"
 norecursedirs = ".git build dist"
 testpaths = "tests"
 pythonpath = [
-    "src"
+    "src",
+    "tests"
 ]
 mock_use_standalone_module = true
 addopts = [

pyproject.toml

@@ -124,7 +124,6 @@ async def handle_vehicle(self) -> None:
 
     async def __polling(self):
         vehicle_status = await self.update_vehicle_status()
-        charge_status = None
 
         if self.vehicle_state.is_ev:
             try:

src/handlers/vehicle.py

@@ -45,21 +45,21 @@ def __init__(self, abrp_api_key: str, abrp_user_token: str, listener: Optional[A
     async def update_abrp(self, vehicle_status: VehicleStatusResp, charge_info: ChrgMgmtDataResp) \
             -> Tuple[bool, Any | None]:
 
-        charge_status = None if charge_info is None else charge_info.chrgMgmtData
+        charge_mgmt_data = None if charge_info is None else charge_info.chrgMgmtData
+        charge_status = None if charge_info is None else charge_info.rvsChargeStatus
 
         if (
                 self.abrp_api_key is not None
                 and self.abrp_user_token is not None
                 and vehicle_status is not None
-                and charge_status is not None
+                and charge_mgmt_data is not None
         ):
             # Request
             tlm_send_url = f'{self.__base_uri}tlm/send'
             data = {
                 # Guess the timestamp from either the API, GPS info or current machine time
                 'utc': int(get_update_timestamp(vehicle_status).timestamp()),
-                'soc': (charge_status.bmsPackSOCDsp / 10.0),
-                'is_charging': vehicle_status.is_charging,
+                'soc': (charge_mgmt_data.bmsPackSOCDsp / 10.0),
                 'is_parked': vehicle_status.is_parked,
             }
 
@@ -71,14 +71,21 @@ async def update_abrp(self, vehicle_status: VehicleStatusResp, charge_info: Chrg
 
             # Skip invalid current values reported by the API
             is_valid_current = (
-                    charge_status.bmsPackCrntV != 1
-                    and value_in_range(charge_status.bmsPackCrnt, 0, 65535)
+                    charge_mgmt_data.bmsPackCrntV != 1
+                    and value_in_range(charge_mgmt_data.bmsPackCrnt, 0, 65535)
             )
             if is_valid_current:
+                is_charging = (
+                        charge_status is not None
+                        and charge_status.chargingGunState
+                        and is_valid_current
+                        and charge_mgmt_data.decoded_current < 0
+                )
                 data.update({
-                    'power': charge_status.decoded_power,
-                    'voltage': charge_status.decoded_voltage,
-                    'current': charge_status.decoded_current
+                    'power': charge_mgmt_data.decoded_power,
+                    'voltage': charge_mgmt_data.decoded_voltage,
+                    'current': charge_mgmt_data.decoded_current,
+                    'is_charging': is_charging,
                 })
 
             basic_vehicle_status = vehicle_status.basicVehicleStatus

src/integrations/abrp/api.py

@@ -56,7 +56,6 @@ async def update_osmand(self, vehicle_status: VehicleStatusResp, charge_info: Ch
                 'id': self.__device_id,
                 # Guess the timestamp from either the API, GPS info or current machine time
                 'timestamp': int(get_update_timestamp(vehicle_status).timestamp()),
-                'is_charging': vehicle_status.is_charging,
                 'is_parked': vehicle_status.is_parked,
             }
 
@@ -85,10 +84,17 @@ async def update_osmand(self, vehicle_status: VehicleStatusResp, charge_info: Ch
                         and value_in_range(charge_mgmt_data.bmsPackCrnt, 0, 65535)
                 )
                 if is_valid_current:
+                    is_charging = (
+                            charge_status is not None
+                            and charge_status.chargingGunState
+                            and is_valid_current
+                            and charge_mgmt_data.decoded_current < 0
+                    )
                     data.update({
                         'power': charge_mgmt_data.decoded_power,
                         'voltage': charge_mgmt_data.decoded_voltage,
-                        'current': charge_mgmt_data.decoded_current
+                        'current': charge_mgmt_data.decoded_current,
+                        'is_charging': is_charging
                     })
 
             # Extract electric range if available

src/integrations/osmand/api.py

@@ -4,9 +4,12 @@
 from typing import Optional
 
 MODULES_DEFAULT_LOG_LEVEL = {
-    'httpx': 'WARNING',
+    'asyncio': 'WARNING',
     'gmqtt': 'WARNING',
+    'httpcore': 'WARNING',
+    'httpx': 'WARNING',
     'saic_ismart_client_ng': 'WARNING',
+    'tzlocal': 'WARNING',
 }
 
 MODULES_REPLACE_ENV_PREFIX = {
@@ -28,6 +31,7 @@ def get_module_log_level(module_name: str) -> Optional[str]:
     env_prefix = MODULES_REPLACE_ENV_PREFIX.get(module_name, module_name.upper().replace('.', '_'))
     return os.getenv(f'{env_prefix}_LOG_LEVEL', default_log_level)
 
+
 def setup_logging():
     logger = logging.getLogger(__name__)
     # Read the default log level from the environment