Update to SwitchEV/iso15118 version 0.25.2

Author: SebaLukas

CHANGELOG.md

@@ -5,6 +5,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.25.2] - 2024-02-14
+* Fix for choosing PnC and DIN removal when the connection is non-TLS by @anudeep-20 in https://github.com/SwitchEV/iso15118/pull/367
+* Fix SessionID length in SessionSetupReq for ISO15118-20 by @adoebber in https://github.com/SwitchEV/iso15118/pull/378
+* fixed the issue when parameters are none in currentdemandReq by @ikaratass in https://github.com/SwitchEV/iso15118/pull/381
+* evcc charging loop time added to config by @ikaratass in https://github.com/SwitchEV/iso15118/pull/262
+* @anudeep-20 made their first contribution in https://github.com/SwitchEV/iso15118/pull/367
+
 ## [0.25.1] - 2024-01-31
 * fixed type returned by get_evse_max_current_limit by @tropxy in https://github.com/SwitchEV/iso15118/pull/373
 * Fix for ChargeParameterDiscovery  get_evse_max_voltage by @tropxy in https://github.com/SwitchEV/iso15118/pull/376

iso15118/__init__.py

@@ -1 +1 @@
-__version__ = "0.25.1"
+__version__ = "0.25.2"

iso15118/evcc/comm_session_handler.py

@@ -139,7 +139,7 @@ def __init__(
         # Avoids recomputing the signature, eim, pnc params during authorization loop.
         self.authorization_req_message: Optional[AuthorizationReq] = None
 
-        self.is_tls = self.config.use_tls
+        self.is_tls = False
 
         self.sae_j2847_active: int = 0
 
@@ -164,7 +164,7 @@ def create_sap(self) -> Union[SupportedAppProtocolReq, None]:
         # Protocol equal to “TCP” and Security equal to “No transport layer security”
         # according to Table 23. Remove it from the supported protocols list if
         # use_tls is enabled
-        if self.config.use_tls:
+        if self.is_tls:
             try:
                 supported_protocols.remove(Protocol.DIN_SPEC_70121)
                 logger.warning(
@@ -435,6 +435,10 @@ async def start_comm_session(self, host: IPv6Address, port: int, is_tls: bool):
             self.iface,
             self.ev_controller,
         )
+        # Overwriting is_tls field in EVCCCommunicationSession with the setting
+        # returned from SDP response. Remember is_tls field in config still represents
+        # the value initially provided in evcc_config.
+        comm_session.is_tls = is_tls
 
         try:
             await comm_session.send_sap()

iso15118/evcc/controller/simulator.py

@@ -141,7 +141,7 @@ class SimEVController(EVControllerInterface):
 
     def __init__(self, evcc_config: EVCCConfig):
         self.config = evcc_config
-        self.charging_loop_cycles: int = 0
+        self.charging_loop_cycles: int = evcc_config.charge_loop_cycle
         self.precharge_loop_cycles: int = 0
         self.welding_detection_cycles: int = 0
         self._charging_is_completed = False

iso15118/evcc/evcc_config.py

@@ -69,6 +69,9 @@ class EVCCConfig(BaseModel):
     # The SECC must not transmit more entries than defined in this parameter.
     max_supporting_points: Optional[int] = Field(1024, alias="maxSupportingPoints")
 
+    # charge cycle count
+    charge_loop_cycle: Optional[int] = Field(10, alias="chargeLoopCycle")
+
     def load_raw_values(self):
         # conversion of list of strings to enum types.
         self.supported_energy_services = load_requested_energy_services(

iso15118/evcc/states/sap_states.py

@@ -128,7 +128,7 @@ async def process_message(
                         protocol.protocol_ns
                     )
                     header = MessageHeaderV20(
-                        session_id=self.get_session_id(), timestamp=time.time()
+                        session_id=self.get_session_id(length=8), timestamp=time.time()
                     )
                     next_msg = SessionSetupReqV20(
                         header=header,
@@ -170,17 +170,18 @@ async def process_message(
             f"ID '{sap_res.schema_id}'"
         )
 
-    def get_session_id(self) -> str:
+    def get_session_id(self, length=1) -> str:
         """
         Check if there's a saved session ID from a previously paused charging
         session and applies that for the now resumed charging session.
-        If there's no stored session ID, we'll set the session ID equal to zero.
+        If there's no stored session ID, we'll set the session ID equal to zero
+        with the specified length in bytes.
         The session ID is also stored as a comm session variable.
         """
         if evcc_settings.ev_session_context.session_id:
             self.comm_session.session_id = evcc_settings.ev_session_context.session_id
             evcc_settings.ev_session_context.session_id = None
         else:
-            self.comm_session.session_id = bytes(1).hex().upper()
+            self.comm_session.session_id = bytes(length).hex().upper()
 
         return self.comm_session.session_id

iso15118/secc/controller/ev_data.py

@@ -333,31 +333,30 @@ def update_charge_loop_parameters(
         self.present_soc = current_demand_req.dc_ev_status.ev_ress_soc
         self.target_current = current_demand_req.ev_target_current.get_decimal_value()
         self.target_voltage = current_demand_req.ev_target_voltage.get_decimal_value()
-        self.remaining_time_to_max_soc = (  # noqa: E501
-            None
-            if current_demand_req.remaining_time_to_full_soc is None
-            else current_demand_req.remaining_time_to_full_soc.get_decimal_value()
-        )
-        self.remaining_time_to_bulk_soc = (  # noqa: E501
-            None
-            if current_demand_req.remaining_time_to_bulk_soc is None
-            else current_demand_req.remaining_time_to_bulk_soc.get_decimal_value()
-        )
-        self.session_limits.dc_limits.max_charge_current = (  # noqa: E501
-            None
-            if current_demand_req.ev_max_current_limit is None
-            else current_demand_req.ev_max_current_limit.get_decimal_value()
-        )
-        self.session_limits.dc_limits.max_charge_power = (  # noqa: E501
-            None
-            if current_demand_req.ev_max_power_limit is None
-            else current_demand_req.ev_max_power_limit.get_decimal_value()
-        )
-        self.session_limits.dc_limits.max_voltage = (  # noqa: E501
-            None
-            if current_demand_req.ev_max_voltage_limit is None
-            else current_demand_req.ev_max_voltage_limit.get_decimal_value()
-        )
+        if current_demand_req.remaining_time_to_full_soc is not None:
+            self.remaining_time_to_max_soc = (
+                current_demand_req.remaining_time_to_full_soc.get_decimal_value()
+            )
+
+        if current_demand_req.remaining_time_to_bulk_soc is not None:
+            self.remaining_time_to_bulk_soc = (
+                current_demand_req.remaining_time_to_bulk_soc.get_decimal_value()
+            )
+
+        if current_demand_req.ev_max_current_limit is not None:
+            self.session_limits.dc_limits.max_charge_current = (
+                current_demand_req.ev_max_current_limit.get_decimal_value()
+            )
+
+        if current_demand_req.ev_max_power_limit is not None:
+            self.session_limits.dc_limits.max_charge_power = (
+                current_demand_req.ev_max_power_limit.get_decimal_value()
+            )
+
+        if current_demand_req.ev_max_voltage_limit is not None:
+            self.session_limits.dc_limits.max_voltage = (
+                current_demand_req.ev_max_voltage_limit.get_decimal_value()
+            )
 
     def update_schedule_exchange_parameters(
         self, control_mode: ControlMode, schedule_exchange_req: ScheduleExchangeReq

iso15118/shared/examples/evcc/DIN/evcc_config.json

@@ -4,5 +4,6 @@
 	],
 	"energyTransferMode": "DC_extended",
 	"isCertInstallNeeded": false,
-	"useTls": false
+	"useTls": false,
+	"chargeLoopCycle": 10
 }

iso15118/shared/examples/evcc/iso15118_2/evcc_config_eim_ac.json

@@ -6,5 +6,6 @@
 		"AC"
 	],
 	"isCertInstallNeeded": false,
-	"useTls": false
+	"useTls": false,
+	"chargeLoopCycle": 10
 }

iso15118/shared/examples/evcc/iso15118_2/evcc_config_eim_dc.json

@@ -7,5 +7,6 @@
 	],
 	"energyTransferMode": "DC_extended",
 	"isCertInstallNeeded": false,
-	"useTls": false
+	"useTls": false,
+	"chargeLoopCycle": 10
 }