Dinspec implementation

iso15118/evcc/controller/interface.py

@@ -6,13 +6,20 @@
 from dataclasses import dataclass
 from typing import List, Optional, Tuple
 
-from iso15118.shared.messages.enums import Protocol
+from iso15118.shared.messages.datatypes_iso15118_2_dinspec import (
+    DCEVChargeParams,
+)
+from iso15118.shared.messages.din_spec.datatypes import (
+    DCEVStatus,
+    DCEVPowerDeliveryParameter,
+)
+
+from iso15118.shared.messages.enums import Protocol, EnergyTransferModeEnum
 from iso15118.shared.messages.iso15118_2.datatypes import (
     ACEVChargeParameter,
     ChargeProgress,
     ChargingProfile,
     DCEVChargeParameter,
-    EnergyTransferModeEnum,
     SAScheduleTupleEntry,
 )
 from iso15118.shared.messages.iso15118_20.ac import (
@@ -53,7 +60,7 @@ def get_evcc_id(self, protocol: Protocol, iface: str) -> str:
         raise NotImplementedError
 
     @abstractmethod
-    def get_energy_transfer_mode(self) -> EnergyTransferModeEnum:
+    def get_energy_transfer_mode(self, protocol: Protocol) -> EnergyTransferModeEnum:
         """
         Gets the energy transfer mode requested for the current charging session.
         This depends on the charging cable being plugged in, which could be a
@@ -200,3 +207,30 @@ def get_prioritised_emaids(self) -> Optional[EMAIDList]:
         - ISO 15118-20
         """
         raise NotImplementedError
+
+    @abstractmethod
+    def get_dc_charge_params(self) -> DCEVChargeParams:
+        """
+        This would return an encapsulation of the following parameters:
+        DC Max Current Limit
+        DC Max Voltage Limit
+        DC Target Current
+        DC Target Voltage
+        """
+        raise NotImplementedError
+
+    @abstractmethod
+    def get_dc_ev_status(self) -> DCEVStatus:
+        raise NotImplementedError
+
+    @abstractmethod
+    def ready_to_charge(self) -> bool:
+        raise NotImplementedError
+
+    @abstractmethod
+    def get_dc_ev_power_delivery_parameter(self) -> DCEVPowerDeliveryParameter:
+        raise NotImplementedError
+
+    @abstractmethod
+    def is_charging_complete(self) -> bool:
+        raise NotImplementedError

iso15118/evcc/controller/simulator.py

@@ -6,22 +6,38 @@
 import logging
 from typing import List, Optional, Tuple
 
+from iso15118.shared.messages.datatypes_iso15118_2_dinspec import (
+    PVEVTargetVoltage,
+    PVEVTargetCurrent,
+    PVEAmount,
+    PVEVMaxVoltage,
+    PVEVMaxCurrent,
+    PVEVMinCurrent,
+    PVPMax,
+    PVEVMaxCurrentLimit,
+    PVEVMaxVoltageLimit,
+    DCEVChargeParams,
+)
+from iso15118.shared.messages.din_spec.datatypes import (
+    DCEVStatus,
+    DCEVPowerDeliveryParameter,
+)
+
 from iso15118.evcc.controller.interface import ChargeParamsV2, EVControllerInterface
 from iso15118.shared.exceptions import InvalidProtocolError, MACAddressNotFound
-from iso15118.shared.messages.enums import Namespace, Protocol
+from iso15118.shared.messages.enums import (
+    Namespace,
+    Protocol,
+    EnergyTransferModeEnum,
+    UnitSymbol,
+    DCEVErrorCode,
+)
 from iso15118.shared.messages.iso15118_2.datatypes import (
     ACEVChargeParameter,
     ChargeProgress,
     ChargingProfile,
-    EnergyTransferModeEnum,
     ProfileEntryDetails,
-    PVEAmount,
-    PVEVMaxCurrent,
-    PVEVMaxVoltage,
-    PVEVMinCurrent,
-    PVPMax,
     SAScheduleTupleEntry,
-    UnitSymbol,
 )
 from iso15118.shared.messages.iso15118_20.ac import (
     ACChargeParameterDiscoveryReqParams,
@@ -41,11 +57,25 @@ class SimEVController(EVControllerInterface):
 
     def __init__(self):
         self.charging_loop_cycles: int = 0
+        self.dc_ev_charge_params: DCEVChargeParams = DCEVChargeParams(
+            dc_max_current_limit=PVEVMaxCurrentLimit(
+                multiplier=1, value=10, unit=UnitSymbol.AMPERE
+            ),
+            dc_max_voltage_limit=PVEVMaxVoltageLimit(
+                multiplier=1, value=40, unit=UnitSymbol.VOLTAGE
+            ),
+            dc_target_current=PVEVTargetCurrent(
+                multiplier=1, value=10, unit=UnitSymbol.AMPERE
+            ),
+            dc_target_voltage=PVEVTargetVoltage(
+                multiplier=1, value=40, unit=UnitSymbol.VOLTAGE
+            ),
+        )
 
     def get_evcc_id(self, protocol: Protocol, iface: str) -> str:
         """Overrides EVControllerInterface.get_evcc_id()."""
 
-        if protocol in (Protocol.ISO_15118_2, Protocol.DIN_SPEC_70121):
+        if protocol == Protocol.ISO_15118_2:
             try:
                 hex_str = get_nic_mac_address(iface)
                 return hex_str.replace(":", "").upper()
@@ -56,18 +86,22 @@ def get_evcc_id(self, protocol: Protocol, iface: str) -> str:
                     "'000000000000'"
                 )
                 return "000000000000"
+        elif protocol == Protocol.DIN_SPEC_70121:
+            return "00000000"
         elif protocol.ns.startswith(Namespace.ISO_V20_BASE):
             # The check digit (last character) is not a correctly computed one
             return "WMIV1234567890ABCDEX"
         else:
             logger.error(f"Invalid protocol '{protocol}', can't determine EVCCID")
             raise InvalidProtocolError
 
-    def get_energy_transfer_mode(self) -> EnergyTransferModeEnum:
+    def get_energy_transfer_mode(self, protocol: Protocol) -> EnergyTransferModeEnum:
         """Overrides EVControllerInterface.get_energy_transfer_mode()."""
+        if protocol == Protocol.DIN_SPEC_70121:
+            return EnergyTransferModeEnum.DC_EXTENDED
         return EnergyTransferModeEnum.AC_THREE_PHASE_CORE
 
-    def get_charge_params_v2(self) -> ChargeParamsV2:
+    def get_charge_params_v2(self, protocol: Protocol) -> ChargeParamsV2:
         """Overrides EVControllerInterface.get_charge_params_v2()."""
         # This is for simulating AC only. You can modify to simulate DC charging
         e_amount = PVEAmount(multiplier=0, value=60, unit=UnitSymbol.WATT_HOURS)
@@ -85,7 +119,9 @@ def get_charge_params_v2(self) -> ChargeParamsV2:
             ev_max_current=ev_max_current,
             ev_min_current=ev_min_current,
         )
-        return ChargeParamsV2(self.get_energy_transfer_mode(), ac_charge_params, None)
+        return ChargeParamsV2(
+            self.get_energy_transfer_mode(protocol), ac_charge_params, None
+        )
 
     def get_charge_params_v20(
         self,
@@ -174,3 +210,26 @@ def store_contract_cert_and_priv_key(self, contract_cert: bytes, priv_key: bytes
 
     def get_prioritised_emaids(self) -> Optional[EMAIDList]:
         return None
+
+    def get_dc_charge_params(self) -> DCEVChargeParams:
+        return self.dc_ev_charge_params
+
+    def get_dc_ev_status(self) -> DCEVStatus:
+        return DCEVStatus(
+            ev_ready=True,
+            ev_error_code=DCEVErrorCode.NO_ERROR,
+            ev_ress_soc=10,
+        )
+
+    def ready_to_charge(self) -> bool:
+        return self.continue_charging()
+
+    def get_dc_ev_power_delivery_parameter(self) -> DCEVPowerDeliveryParameter:
+        return DCEVPowerDeliveryParameter(
+            dc_ev_status=self.get_dc_ev_status(),
+            bulk_charging_complete=False,
+            charging_complete=self.continue_charging(),
+        )
+
+    def is_charging_complete(self) -> bool:
+        return True

iso15118/evcc/evcc_settings.py

@@ -72,7 +72,11 @@ def load_envs(self, env_path: Optional[str] = None) -> None:
         # the protocols are listed here determines the priority (i.e. first list entry
         # has higher priority than second list entry). A list entry must be a member
         # of the Protocol enum
-        self.supported_protocols = [Protocol.ISO_15118_2, Protocol.ISO_15118_20_AC]
+        self.supported_protocols = [
+            Protocol.DIN_SPEC_70121,
+            Protocol.ISO_15118_2,
+            Protocol.ISO_15118_20_AC,
+        ]
 
         env.seal()  # raise all errors at once, if any