Merge branch 'master' into jtt_845_remove_3s_contactor_timeout_dc

EcoG-io · Apr 16, 2024 · 52fc78b · 52fc78b
2 parents 1e1bd3b + e661df8
commit 52fc78b
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 20 deletions.
diff --git a/iso15118/secc/states/din_spec_states.py b/iso15118/secc/states/din_spec_states.py
@@ -502,6 +502,17 @@ async def process_message(
             IsolationLevel.VALID,
             IsolationLevel.WARNING,
         ]:
+            # Requirement in 6.4.3.106 of the IEC 61851-23
+            # Any relays in the DC output circuit of the DC station shall
+            # be closed during the insulation test
+            if not await self.comm_session.evse_controller.is_contactor_closed():
+                self.stop_state_machine(
+                    "Contactor didnt close for Cable Check",
+                    message,
+                    ResponseCode.FAILED,
+                )
+                return
+
             if isolation_level == IsolationLevel.WARNING:
                 logger.warning(
                     "Isolation resistance measured by EVSE is in Warning-Range"

diff --git a/iso15118/secc/states/iso15118_20_states.py b/iso15118/secc/states/iso15118_20_states.py
@@ -1609,6 +1609,15 @@ async def process_message(
         if not self.cable_check_req_was_received:
             # First DCCableCheckReq received. Start cable check.
             await self.comm_session.evse_controller.start_cable_check()
+            self.cable_check_req_was_received = True
+
+        next_state = None
+        processing = EVSEProcessing.ONGOING
+        isolation_level = (
+            await self.comm_session.evse_controller.get_cable_check_status()
+        )
+
+        if isolation_level in [IsolationLevel.VALID, IsolationLevel.WARNING]:
             # Requirement in 6.4.3.106 of the IEC 61851-23
             # Any relays in the DC output circuit of the DC station shall
             # be closed during the insulation test
@@ -1619,15 +1628,7 @@ async def process_message(
                     ResponseCode.FAILED,
                 )
                 return
-            self.cable_check_req_was_received = True
-
-        next_state = None
-        processing = EVSEProcessing.ONGOING
-        isolation_level = (
-            await self.comm_session.evse_controller.get_cable_check_status()
-        )
 
-        if isolation_level in [IsolationLevel.VALID, IsolationLevel.WARNING]:
             if isolation_level == IsolationLevel.WARNING:
                 logger.warning(
                     "Isolation resistance measured by EVSE is in Warning range"

diff --git a/iso15118/secc/states/iso15118_2_states.py b/iso15118/secc/states/iso15118_2_states.py
@@ -2216,17 +2216,6 @@ async def process_message(
         if not self.cable_check_req_was_received:
             # First CableCheckReq received. Start cable check.
             await self.comm_session.evse_controller.start_cable_check()
-            # Requirement in 6.4.3.106 of the IEC 61851-23
-            # Any relays in the DC output circuit of the DC station shall
-            # be closed during the insulation test
-            if not await self.comm_session.evse_controller.is_contactor_closed():
-                self.stop_state_machine(
-                    "Contactor didnt close for Cable Check",
-                    message,
-                    ResponseCode.FAILED,
-                )
-                return
-
             self.cable_check_req_was_received = True
 
         self.comm_session.evse_controller.ev_data_context.present_soc = (
@@ -2243,6 +2232,17 @@ async def process_message(
             IsolationLevel.VALID,
             IsolationLevel.WARNING,
         ]:
+            # Requirement in 6.4.3.106 of the IEC 61851-23
+            # Any relays in the DC output circuit of the DC station shall
+            # be closed during the insulation test
+            if not await self.comm_session.evse_controller.is_contactor_closed():
+                self.stop_state_machine(
+                    "Contactor didnt close for Cable Check",
+                    message,
+                    ResponseCode.FAILED,
+                )
+                return
+
             if isolation_level == IsolationLevel.WARNING:
                 logger.warning(
                     "Isolation resistance measured by EVSE is in Warning-Range"

diff --git a/tests/iso15118_20/secc/test_iso15118_20_dc_states.py b/tests/iso15118_20/secc/test_iso15118_20_dc_states.py
@@ -212,7 +212,7 @@ async def test_15118_20_schedule_exchange_res(
         "cable_check_status, "
         "expected_state",
         [
-            (False, False, None, Terminate),
+            (False, False, IsolationLevel.VALID, Terminate),
             (False, True, None, None),
             (False, True, IsolationLevel.VALID, DCPreCharge),
             (True, True, None, None),