Updates to store EV and EVSE limits shared in CPD and CL (-20 AC and DC).

iso15118/secc/comm_session_handler.py

@@ -16,11 +16,8 @@
 from asyncio.streams import StreamReader, StreamWriter
 from typing import Any, Coroutine, Dict, List, Optional, Tuple, Union
 
-from iso15118.secc.controller.interface import (
-    EVSEControllerInterface,
-    EVSessionContext15118,
-    ServiceStatus,
-)
+from iso15118.secc.controller.ev_data import EVSessionContext15118
+from iso15118.secc.controller.interface import EVSEControllerInterface, ServiceStatus
 from iso15118.secc.failed_responses import (
     init_failed_responses_din_spec_70121,
     init_failed_responses_iso_v2,

iso15118/secc/controller/common.py

@@ -0,0 +1,19 @@
+from abc import ABC
+
+
+class Limits(ABC):
+    def update(
+        self,
+        params: dict,
+    ):
+        updated_params = {}
+        for k, v in params.items():
+            if type(v) is dict:
+                updated_params.update({k: v["value"] * 10 ** v["exponent"]})
+            elif type(v) in [int, float]:
+                updated_params.update({k: v})
+
+        self.__dict__.update(updated_params)
+
+    def as_dict(self):
+        return self.__dict__

iso15118/secc/controller/ev_data.py

@@ -0,0 +1,187 @@
+from dataclasses import dataclass
+from typing import List, Optional, Union
+
+from iso15118.secc.controller.common import Limits
+from iso15118.shared.messages.datatypes import (
+    PVEAmount,
+    PVEVEnergyRequest,
+    PVEVMaxCurrent,
+    PVEVMaxCurrentLimit,
+    PVEVMaxPowerLimit,
+    PVEVMaxVoltage,
+    PVEVMaxVoltageLimit,
+)
+from iso15118.shared.messages.enums import AuthEnum
+from iso15118.shared.messages.iso15118_2.datatypes import ChargeService
+
+
+@dataclass
+class EVACCPDLimits(Limits):
+    """Holds the AC limits shared by the EV during ChargeParameterDiscovery"""
+
+    ev_max_charge_power: Optional[float] = 0.0
+    ev_max_charge_power_l2: Optional[float] = None
+    ev_max_charge_power_l3: Optional[float] = None
+
+    ev_min_charge_power: Optional[float] = 0.0
+    ev_min_charge_power_l2: Optional[float] = None
+    ev_min_charge_power_l3: Optional[float] = None
+
+    ev_max_discharge_power: Optional[float] = None
+    ev_max_discharge_power_l2: Optional[float] = None
+    ev_max_discharge_power_l3: Optional[float] = None
+    ev_min_discharge_power: Optional[float] = None
+    ev_min_discharge_power_l2: Optional[float] = None
+    ev_min_discharge_power_l3: Optional[float] = None
+
+
+@dataclass
+class EVDCCPDLimits(Limits):
+    """Holds the DC limits shared by the EV during ChargeParameterDiscovery"""
+
+    ev_max_charge_power: Optional[float] = 0.0
+    ev_min_charge_power: Optional[float] = 0.0
+    ev_max_charge_current: Optional[float] = None
+    ev_min_charge_current: Optional[float] = None
+    ev_max_voltage: Optional[float] = None
+    ev_min_voltage: Optional[float] = None
+    target_soc: Optional[int] = None
+
+    ev_max_discharge_power: Optional[float] = None
+    ev_min_discharge_power: Optional[float] = None
+    ev_max_discharge_current: Optional[float] = None
+    ev_min_discharge_current: Optional[float] = None
+
+
+@dataclass
+class EVRatedLimits(Limits):
+    def __init__(
+        self,
+        ac_limits: Optional[EVACCPDLimits] = None,
+        dc_limits: Optional[EVDCCPDLimits] = None,
+    ):
+        self.ac_limits = ac_limits or EVACCPDLimits()
+        self.dc_limits = dc_limits or EVDCCPDLimits()
+
+
+@dataclass
+class EVACCLLimits(Limits):
+    """Holds the AC limits shared by the EV during ChargingLoop.
+    Unlike the CPD values, these could potentially change during charing loop"""
+
+    departure_time: Optional[int] = None
+    ev_target_energy_request: Optional[float] = None
+    ev_max_energy_request: Optional[float] = None
+    ev_min_energy_request: Optional[float] = None
+
+    ev_max_charge_power: Optional[float] = None
+    ev_max_charge_power_l2: Optional[float] = None
+    ev_max_charge_power_l3: Optional[float] = None
+
+    ev_min_charge_power: Optional[float] = None
+    ev_min_charge_power_l2: Optional[float] = None
+    ev_min_charge_power_l3: Optional[float] = None
+
+    ev_present_active_power: Optional[float] = None
+    ev_present_active_power_l2: Optional[float] = None
+    ev_present_active_power_l3: Optional[float] = None
+
+    ev_present_reactive_power: Optional[float] = None
+    ev_present_reactive_power_l2: Optional[float] = None
+    ev_present_reactive_power_l3: Optional[float] = None
+
+    ev_max_discharge_power: Optional[float] = None
+    ev_max_discharge_power_l2: Optional[float] = None
+    ev_max_discharge_power_l3: Optional[float] = None
+
+    ev_min_discharge_power: Optional[float] = None
+    ev_min_discharge_power_l2: Optional[float] = None
+    ev_min_discharge_power_l3: Optional[float] = None
+
+    ev_max_v2x_energy_request: Optional[float] = None
+    ev_min_v2x_energy_request: Optional[float] = None
+
+
+@dataclass
+class EVDCCLLimits(Limits):
+    """Holds the DC limits shared by the EV during ChargingLoop.
+    Unlike the CPD values, these could potentially change during charging loop"""
+
+    departure_time: Optional[int] = None
+    ev_target_energy_request: Optional[float] = None
+
+    ev_target_current: float = 0.0
+    ev_target_voltage: float = 0.0
+    ev_max_charge_power: Optional[float] = None
+    ev_min_charge_power: Optional[float] = None
+    ev_max_charge_current: Optional[float] = None
+    ev_max_voltage: Optional[float] = None
+    ev_min_voltage: Optional[float] = None
+
+    ev_max_discharge_power: Optional[float] = None
+    ev_min_discharge_power: Optional[float] = None
+    ev_max_discharge_current: Optional[float] = None
+
+    ev_max_energy_request: Optional[float] = None
+    ev_min_energy_request: Optional[float] = None
+
+    ev_max_v2x_energy_request: Optional[float] = None
+    ev_min_v2x_energy_request: Optional[float] = None
+
+
+@dataclass
+class EVSessionContext(Limits):
+    def __init__(
+        self,
+        ac_limits: Optional[EVACCLLimits] = None,
+        dc_limits: Optional[EVDCCLLimits] = None,
+    ):
+        self.ac_limits = ac_limits or EVACCLLimits()
+        self.dc_limits = dc_limits or EVDCCLLimits()
+
+    dc_current_request: Optional[int] = None
+    dc_voltage_request: Optional[int] = None
+    ac_current: Optional[dict] = None  # {"l1": 10, "l2": 10, "l3": 10}
+    ac_voltage: Optional[dict] = None  # {"l1": 230, "l2": 230, "l3": 230}
+    soc: Optional[int] = None  # 0-100
+
+    remaining_time_to_full_soc_s: Optional[float] = None
+    remaining_time_to_bulk_soc_s: Optional[float] = None
+
+
+@dataclass
+class EVDataContext:
+    def __init__(
+        self,
+        evcc_id: Optional[str] = None,
+        ev_rated_limits: Optional[EVRatedLimits] = None,
+        ev_session_context: Optional[EVSessionContext] = None,
+    ):
+        self.evcc_id = evcc_id or None
+        self.ev_rated_limits = ev_rated_limits or EVRatedLimits()
+        self.ev_session_context = ev_session_context or EVSessionContext()
+
+
+@dataclass
+class EVChargeParamsLimits:
+    ev_max_voltage: Optional[Union[PVEVMaxVoltageLimit, PVEVMaxVoltage]] = None
+    ev_max_current: Optional[Union[PVEVMaxCurrentLimit, PVEVMaxCurrent]] = None
+    ev_max_power: Optional[PVEVMaxPowerLimit] = None
+    e_amount: Optional[PVEAmount] = None
+    ev_energy_request: Optional[PVEVEnergyRequest] = None
+
+
+@dataclass
+class EVSessionContext15118:
+    # EVSessionContext15118 holds information required to resume a paused session.
+    # [V2G2-741] - In a resumed session, the following are reused:
+    # 1. SessionID (SessionSetup)
+    # 2. PaymentOption that was previously selected (ServiceDiscoveryRes)
+    # 3. ChargeService (ServiceDiscoveryRes)
+    # 4. SAScheduleTuple (ChargeParameterDiscoveryRes) -
+    # Previously selected id must remain the same.
+    # However, the entries could reflect the elapsed time
+    session_id: Optional[str] = None
+    auth_options: Optional[List[AuthEnum]] = None
+    charge_service: Optional[ChargeService] = None
+    sa_schedule_tuple_id: Optional[int] = None

iso15118/secc/controller/evse_data.py

@@ -0,0 +1,138 @@
+from dataclasses import dataclass
+from typing import Optional, Union
+
+from iso15118.secc.controller.common import Limits
+
+
+@dataclass
+class EVSEACCPDLimits(Limits):
+    """Holds the EVSE's rated AC limits to be returned during
+    Charge Parameter Discovery state."""
+
+    # 15118-2 AC CPD
+    evse_nominal_voltage: Optional[float] = None  # Also required for 15118-20 CPD
+    evse_max_current: Optional[float] = None  # Required
+
+    # 15118-20 AC CPD (Required)
+    evse_max_charge_power: Optional[float] = None
+    evse_min_charge_power: Optional[float] = None
+
+    # 15118-20 AC CPD (Optional)
+    evse_max_charge_power_l2: Optional[float] = None
+    evse_max_charge_power_l3: Optional[float] = None
+    evse_min_charge_power_l2: Optional[float] = None
+    evse_min_charge_power_l3: Optional[float] = None
+    evse_nominal_frequency: Optional[float] = None
+    max_power_asymmetry: Optional[float] = None
+    evse_power_ramp_limit: Optional[float] = None
+
+    evse_present_active_power: Optional[float] = None  # Optional in AC Scheduled CL
+    evse_present_active_power_l2: Optional[float] = None  # Optional in AC Scheduled CL
+    evse_present_active_power_l3: Optional[float] = None  # Optional in AC Scheduled CL
+
+
+@dataclass
+class EVSEACBPTCPDLimits(EVSEACCPDLimits):
+    """Holds the EVSE's rated AC BPT limits to be returned during
+    Charge Parameter Discovery state."""
+
+    evse_max_discharge_power: Optional[float] = None  # Required
+    evse_max_discharge_power_l2: Optional[float] = None  # Optional
+    evse_max_discharge_power_l3: Optional[float] = None  # Optional
+
+    evse_min_discharge_power: Optional[float] = None  # Required
+    evse_min_discharge_power_l2: Optional[float] = None  # Optional
+    evse_min_discharge_power_l3: Optional[float] = None  # Optional
+
+
+@dataclass
+class EVSEDCBPTCPDLimits(Limits):
+    """Holds the EVSE's rated DC BPT limits to be returned during
+    Charge Parameter Discovery state."""
+
+    # Required in 15118-20 DC BPT CPD
+    evse_max_discharge_power: Optional[float] = None
+    evse_min_discharge_power: Optional[float] = None
+    evse_max_discharge_current: Optional[float] = None
+    evse_min_discharge_current: Optional[float] = None
+
+
+@dataclass
+class EVSEDCCPDLimits(EVSEDCBPTCPDLimits):
+    """Holds the EVSE's rated DC limits to be returned during
+    Charge Parameter Discovery state."""
+
+    # Required in 15118-20 DC CPD
+    evse_max_charge_power: Optional[float] = None  # Required for -2 DC, DIN CPD
+    evse_min_charge_power: Optional[float] = None  # Not Required for -2 DC, DIN CPD
+    evse_max_charge_current: Optional[float] = None  # Required for -2 DC, DIN CPD
+    evse_min_charge_current: Optional[float] = None  # Required for -2 DC, DIN CPD
+    evse_max_voltage: Optional[float] = None  # Required for -2 DC, DIN CPD
+    evse_min_voltage: Optional[float] = None  # Required for -2 DC, DIN CPD
+
+    #  Optional in 15118-20 DC CPD
+    evse_power_ramp_limit: Optional[float] = None
+
+    #  Optional in 15118-2 CPD
+    evse_current_regulation_tolerance: Optional[float] = None
+    evse_peak_current_ripple: Optional[float] = None
+    evse_energy_to_be_delivered: Optional[float] = None
+
+
+@dataclass
+class EVSERatedLimits:
+    ac_limits: Optional[EVSEACCPDLimits] = None
+    ac_bpt_limits: Optional[EVSEACBPTCPDLimits] = None
+    dc_limits: Optional[EVSEDCCPDLimits] = None
+    dc_bpt_limits: Optional[EVSEDCBPTCPDLimits] = None
+
+
+@dataclass
+class EVSEACCLLimits(Limits):
+    # Optional in both Scheduled and Dynamic CL (both AC CL and BPT AC CL)
+    evse_target_active_power: Optional[float] = None  # Required in Dynamic AC CL
+    evse_target_active_power_l2: Optional[float] = None
+    evse_target_active_power_l3: Optional[float] = None
+    evse_target_reactive_power: Optional[float] = None
+    evse_target_reactive_power_l2: Optional[float] = None
+    evse_target_reactive_power_l3: Optional[float] = None
+    evse_present_active_power: Optional[float] = None  # Optional in AC CPD
+    evse_present_active_power_l2: Optional[float] = None  # Optional in AC CPD
+    evse_present_active_power_l3: Optional[float] = None  # Optional in AC CPD
+
+
+@dataclass
+class EVSEDCCLLimits(Limits):
+    # Optional in 15118-20 DC Scheduled CL
+    evse_max_charge_power: Optional[float] = None  # Required in 15118-20 Dynamic CL
+    evse_min_charge_power: Optional[float] = None  # Required in 15118-20 Dynamic CL
+    evse_max_charge_current: Optional[float] = None  # Required in 15118-20 Dynamic CL
+    evse_max_voltage: Optional[float] = None  # Required in 15118-20 Dynamic CL
+
+    # Optional and present in 15118-20 DC BPT CL (Scheduled)
+    evse_max_discharge_power: Optional[float] = None  # Req in 15118-20 Dynamic BPT CL
+    evse_min_discharge_power: Optional[float] = None  # Req in 15118-20 Dynamic BPT CL
+    evse_max_discharge_current: Optional[float] = None  # Req in 15118-20 Dynamic BPT CL
+    evse_min_voltage: Optional[float] = None  # Required in 15118-20 Dynamic BPT CL
+
+
+@dataclass
+class EVSESessionContext:
+    # Optional in -20 Dynamic CL Res
+    ev_departure_time: Optional[int] = None
+    ev_min_soc: Optional[int] = None
+    ev_target_soc: Optional[int] = None
+    ack_max_delay: Optional[int] = None
+
+    # Required for -2 DC CurrentDemand, -20 DC CL
+    evse_present_current: Union[float, int] = 0
+    evse_present_voltage: Union[float, int] = 0
+
+    ac_limits: Optional[EVSEACCLLimits] = None
+    dc_limits: Optional[EVSEDCCLLimits] = None
+
+
+@dataclass
+class EVSEDataContext:
+    rated_limits: Optional[EVSERatedLimits] = None
+    session_context: Optional[EVSESessionContext] = None