Update to EcoG-io/iso15118 version 0.27.0

Author: SebaLukas

CHANGELOG.md

@@ -5,6 +5,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.27.0] - 2024-04-17
+* ScheduleExchangeRes parsing fix by @heavyweight87 in https://github.com/SwitchEV/iso15118/pull/391
+* Moved contactor status check for dc to be after cable check by @shalinnijel2 in https://github.com/SwitchEV/iso15118/pull/396
+* Simulate soc in -2, -20 and din. by @shalinnijel2 in https://github.com/SwitchEV/iso15118/pull/393
+
 ## [0.26.0] - 2024-03-20
 * Jtt 770 return ongoing if cs is not ready by @shalinnijel2 in https://github.com/SwitchEV/iso15118/pull/387
 * Fixes for issue where the saved session context wasn't found on waking up. by @shalinnijel2 in https://github.com/SwitchEV/iso15118/pull/388

iso15118/__init__.py

@@ -1 +1 @@
-__version__ = "0.26.1"
+__version__ = "0.27.0"

iso15118/evcc/controller/interface.py

@@ -58,7 +58,10 @@
     SelectedEnergyService,
     SelectedVAS,
 )
-from iso15118.shared.messages.iso15118_20.common_types import RationalNumber
+from iso15118.shared.messages.iso15118_20.common_types import (
+    DisplayParameters,
+    RationalNumber,
+)
 from iso15118.shared.messages.iso15118_20.dc import (
     BPTDCChargeParameterDiscoveryReqParams,
     BPTDynamicDCChargeLoopReqParams,
@@ -681,3 +684,12 @@ async def enable_charging(self, enabled: bool) -> None:
         - ISO 15118-2
         - ISO 15118-20
         """
+
+    @abstractmethod
+    async def get_display_params(self) -> DisplayParameters:
+        """
+        Enables charging for the EVCC.
+        Can be used as an indication to go to state C
+        Relevant for:
+        - ISO 15118-20
+        """

iso15118/evcc/controller/simulator.py

@@ -108,7 +108,10 @@
     SelectedEnergyService,
     SelectedVAS,
 )
-from iso15118.shared.messages.iso15118_20.common_types import RationalNumber
+from iso15118.shared.messages.iso15118_20.common_types import (
+    DisplayParameters,
+    RationalNumber,
+)
 from iso15118.shared.messages.iso15118_20.dc import (
     BPTDCChargeParameterDiscoveryReqParams,
     BPTDynamicDCChargeLoopReqParams,
@@ -141,7 +144,8 @@ class SimEVController(EVControllerInterface):
 
     def __init__(self, evcc_config: EVCCConfig):
         self.config = evcc_config
-        self.charging_loop_cycles: int = evcc_config.charge_loop_cycle
+        self.charging_loop_cycles: int = max(evcc_config.charge_loop_cycle, 1)
+        self.increment = (1 / self.charging_loop_cycles) * 100
         self.precharge_loop_cycles: int = 0
         self.welding_detection_cycles: int = 0
         self._charging_is_completed = False
@@ -617,8 +621,19 @@ async def process_sa_schedules_v2(
 
     async def continue_charging(self) -> bool:
         """Overrides EVControllerInterface.continue_charging()."""
+        # if self.charging_loop_cycles == 0 or await self.is_charging_complete():
+        #     # To simulate a bit of a charging loop, we'll let it run chargingLoopCycle
+        #     # times specified in config file
+        #     return False
+        # else:
+        #     self.charging_loop_cycles -= 1
+        #     self._soc = min(int(self._soc + self.increment), 100)
+        #     # The line below can just be called once process_message in all states
+        #     # are converted to async calls
+        #     # await asyncio.sleep(0.5)
+        #     return True
         return not EVEREST_EV_STATE.StopCharging
-
+    
     async def pause(self) -> bool:
         return EVEREST_EV_STATE.Pause
 
@@ -772,14 +787,14 @@ async def get_dc_ev_status_dinspec(self) -> DCEVStatusDINSPEC:
         return DCEVStatusDINSPEC(
             ev_ready=True,
             ev_error_code=DCEVErrorCode.NO_ERROR,
-            ev_ress_soc=60,
+            ev_ress_soc=self._soc,
         )
 
     async def get_dc_ev_status(self) -> DCEVStatus:
         return DCEVStatus(
             ev_ready=True,
             ev_error_code=DCEVErrorCode.NO_ERROR,
-            ev_ress_soc=60,
+            ev_ress_soc=self._soc,
         )
 
     async def get_scheduled_dc_charge_loop_params(
@@ -864,6 +879,13 @@ async def enable_charging(self, enabled: bool) -> None:
         """Overrides EVControllerInterface.enable_charging()."""
         pass
 
+    async def get_display_params(self) -> DisplayParameters:
+        """Overrides EVControllerInterface.get_display_params()."""
+        return DisplayParameters(
+            present_soc=self._soc,
+            charging_complete=await self.is_charging_complete(),
+        )
+
     # ============================================================================
     # |                          SAE J2847/2 FUNCTIONS                           |
     # ============================================================================

iso15118/evcc/states/iso15118_20_states.py

@@ -857,8 +857,8 @@ async def process_message(
                     else:
                         bpt_channel_selection = ChannelSelection.CHARGE
 
+            await self.comm_session.ev_controller.enable_charging(True)
             if self.comm_session.selected_charging_type_is_ac:
-                await self.comm_session.ev_controller.enable_charging(True)
                 power_delivery_req = PowerDeliveryReq(
                     header=MessageHeader(
                         session_id=self.comm_session.session_id,
@@ -1006,6 +1006,7 @@ async def process_message(
                     session_id=self.comm_session.session_id,
                     timestamp=time.time(),
                 ),
+                display_parameters=await self.comm_session.ev_controller.get_display_params(),  # noqa
                 scheduled_params=scheduled_params,
                 dynamic_params=dynamic_params,
                 bpt_scheduled_params=bpt_scheduled_params,
@@ -1046,6 +1047,7 @@ async def process_message(
                     session_id=self.comm_session.session_id,
                     timestamp=time.time(),
                 ),
+                display_parameters=await ev_controller.get_display_params(),
                 ev_present_voltage=await ev_controller.get_present_voltage(),
                 scheduled_params=scheduled_params,
                 dynamic_params=dynamic_params,
@@ -1092,15 +1094,15 @@ async def create_new_power_delivery_req(
 
         # Information from EV to show if charging or discharging is planned
         bpt_channel_selection = None
-        if self.comm_session.selected_energy_service in (
+        if self.comm_session.selected_energy_service.service in (
             ServiceV20.AC_BPT,
             ServiceV20.DC_BPT,
         ):
-            power_value = ev_power_profile.entry_list.entries.pop().power.value
-            if power_value < 0:
-                bpt_channel_selection = ChannelSelection.DISCHARGE
-            else:
-                bpt_channel_selection = ChannelSelection.CHARGE
+            bpt_channel_selection = ChannelSelection.CHARGE
+            if ev_power_profile is not None:
+                power_value = ev_power_profile.entry_list.entries[-1].power.value
+                if power_value < 0:
+                    bpt_channel_selection = ChannelSelection.DISCHARGE
 
         power_delivery_req = PowerDeliveryReq(
             header=MessageHeader(
@@ -1328,6 +1330,7 @@ async def process_message(
                     session_id=self.comm_session.session_id,
                     timestamp=time.time(),
                 ),
+                display_parameters=await self.comm_session.ev_controller.get_display_params(),  # noqa
                 scheduled_params=scheduled_params,
                 dynamic_params=dynamic_params,
                 bpt_scheduled_params=bpt_scheduled_params,
@@ -1581,16 +1584,15 @@ async def build_power_delivery_req(self):
 
         # Information from EV to show if charging or discharging is planned
         bpt_channel_selection = None
-        if self.comm_session.selected_energy_service in (
+        if self.comm_session.selected_energy_service.service in (
             ServiceV20.AC_BPT,
             ServiceV20.DC_BPT,
         ):
-            power_value = ev_power_profile.entry_list.entries.pop().power.value
-            if power_value < 0:
-                bpt_channel_selection = ChannelSelection.DISCHARGE
-            else:
-                bpt_channel_selection = ChannelSelection.CHARGE
-        await self.comm_session.ev_controller.enable_charging(True)
+            bpt_channel_selection = ChannelSelection.CHARGE
+            if ev_power_profile is not None:
+                power_value = ev_power_profile.entry_list.entries[-1].power.value
+                if power_value < 0:
+                    bpt_channel_selection = ChannelSelection.DISCHARGE
         power_delivery_req = PowerDeliveryReq(
             header=MessageHeader(
                 session_id=self.comm_session.session_id,
@@ -1713,6 +1715,7 @@ async def build_current_demand_data(self):
                 session_id=self.comm_session.session_id,
                 timestamp=time.time(),
             ),
+            display_parameters=await self.comm_session.ev_controller.get_display_params(),  # noqa
             ev_present_voltage=await self.comm_session.ev_controller.get_present_voltage(),  # noqa
             scheduled_params=scheduled_params,
             dynamic_params=dynamic_params,

iso15118/secc/states/iso15118_20_states.py

@@ -1609,7 +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
@@ -1621,15 +1629,6 @@ async def process_message(
                 )
                 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"

iso15118/shared/comm_session.py

@@ -413,6 +413,8 @@ async def stop(self, reason: str):
             evse_controller = self.comm_session.evse_controller
             await evse_controller.update_data_link(terminate_or_pause)
             await evse_controller.session_ended(str(self.current_state), reason)
+        elif hasattr(self.comm_session, "ev_controller"):
+            await self.comm_session.ev_controller.enable_charging(False)
         logger.info(f"{terminate_or_pause}d the data link")
         await asyncio.sleep(3)
         try:

iso15118/shared/messages/iso15118_20/common_messages.py

@@ -10,6 +10,7 @@
 (or class) that matches the definitions in the XSD schema, including the XSD
 element names by using the 'alias' attribute.
 """
+
 from dataclasses import dataclass
 from enum import Enum
 from typing import List, Tuple
@@ -821,30 +822,6 @@ def min_soc_less_than_or_equal_to_target_soc(cls, values):
 
         return values
 
-    @root_validator(pre=True)
-    def either_price_levels_or_absolute_prices(cls, values):
-        """
-        Either price_level_schedule or absolute_price_schedule must be set,
-        depending on abstract price levels or absolute prices are used to
-        indicate costs for the charging session.
-
-        Pydantic validators are "class methods",
-        see https://pydantic-docs.helpmanual.io/usage/validators/
-        """
-        # pylint: disable=no-self-argument
-        # pylint: disable=no-self-use
-        if one_field_must_be_set(
-            [
-                "price_level_schedule",
-                "PriceLevelSchedule",
-                "absolute_price_schedule",
-                "AbsolutePriceSchedule",
-            ],
-            values,
-            True,
-        ):
-            return values
-
 
 class ScheduleExchangeRes(V2GResponse):
     """See section 8.3.4.3.7.3 in ISO 15118-20"""

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "iso15118"
-version = "0.26.1"
+version = "0.27.0"
 description = "Implementation of DIN SPEC 70121, ISO 15118-2 and -20 specs for SECC"
 authors = ["André Duarte <andre@switch-ev.com>",
            "Dr. Marc Mültin <marc@switch-ev.com>",

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),