Merge branch 'nanomad-magior-feature/handle_charge_current_limit' into develop

Author: Thomas Salm

src/saic_ismart_client/common_model.py

@@ -49,6 +49,42 @@ class ScheduledChargingMode(Enum):
     UNTIL_CONFIGURED_TIME = 1
 
 
+class ChargeCurrentLimitCode(Enum):
+    C_IGNORE = 0
+    C_6A = 1
+    C_8A = 2
+    C_16A = 3
+    C_MAX = 4
+
+    @staticmethod
+    def to_code(limit: str):
+        match limit.upper():
+            case "6A":
+                return ChargeCurrentLimitCode.C_6A
+            case "8A":
+                return ChargeCurrentLimitCode.C_8A
+            case "16A":
+                return ChargeCurrentLimitCode.C_16A
+            case "MAX":
+                return ChargeCurrentLimitCode.C_MAX
+            case _:
+                raise ValueError(f'Unknown charge current limit: {limit}')
+
+    def get_limit(self) -> str:
+        match self:
+            case ChargeCurrentLimitCode.C_6A:
+                return "6A"
+            case ChargeCurrentLimitCode.C_8A:
+                return "8A"
+            case ChargeCurrentLimitCode.C_16A:
+                return "16A"
+            case ChargeCurrentLimitCode.C_MAX:
+                return "Max"
+            case _:
+                raise ValueError(f'Unknown charge current limit code: {self}')
+
+
+
 class TargetBatteryCode(Enum):
     P_40 = 1
     P_50 = 2

src/saic_ismart_client/saic_api.py

@@ -10,7 +10,7 @@
 import requests as requests
 
 from saic_ismart_client.common_model import AbstractMessage, AbstractMessageBody, Header, MessageBodyV2, MessageV2, \
-    ScheduledChargingMode, TargetBatteryCode
+    ScheduledChargingMode, TargetBatteryCode, ChargeCurrentLimitCode
 from saic_ismart_client.ota_v1_1.Message import MessageCoderV11
 from saic_ismart_client.ota_v1_1.data_model import AbortSendMessageReq, AlarmSwitch, AlarmSwitchReq, Message, \
     MessageBodyV11, MessageListReq, MessageListResp, MessageV11, MpAlarmSettingType, MpUserLoggingInReq, \
@@ -639,10 +639,16 @@ def start_charging(self, vin_info: VinInfo, event_id: str = None) -> MessageV30:
     def start_charging_with_retry(self, vin_info: VinInfo) -> MessageV30:
         return self.handle_retry(self.start_charging, vin_info)
 
-    def set_target_battery_soc(self, target_soc: TargetBatteryCode, vin_info: VinInfo, event_id: str = None):
+    def set_target_battery_soc(
+            self,
+            target_soc: TargetBatteryCode,
+            vin_info: VinInfo,
+            charge_current_limit: ChargeCurrentLimitCode = ChargeCurrentLimitCode.C_IGNORE,
+            event_id: str = None
+    ):
         chrg_setng_req = OtaChrgSetngReq()
         chrg_setng_req.onBdChrgTrgtSOCReq = target_soc.value
-        chrg_setng_req.altngChrgCrntReq = 4
+        chrg_setng_req.altngChrgCrntReq = charge_current_limit.value
         chrg_setng_req.tboxV2XSpSOCReq = 0
         chrg_setng_req_msg = MessageV30(MessageBodyV30(), chrg_setng_req)
         application_id = '516'