Adding EV MCS serivces (#38)

Signed-off-by: Sebastian Lukas <sebastian.lukas@pionix.de>

Author: SebaLukas

iso15118/evcc/controller/simulator.py

@@ -362,9 +362,9 @@ async def get_charge_params_v20(
                 ev_max_discharge_power=RationalNumber(exponent=3, value=11),
                 ev_min_discharge_power=RationalNumber(exponent=0, value=100),
             )
-        elif selected_service.service == ServiceV20.DC:
+        elif selected_service.service in [ServiceV20.DC, ServiceV20.MCS]:
             return dc_cpd_params
-        elif selected_service.service == ServiceV20.DC_BPT:
+        elif selected_service.service in [ServiceV20.DC_BPT, ServiceV20.MCS_BPT]:
             return BPTDCChargeParameterDiscoveryReqParams(
                 **(dc_cpd_params.dict()),
                 # Todo(sl): Update later if bpt is also available

iso15118/evcc/states/iso15118_20_states.py

@@ -747,10 +747,15 @@ async def process_message(
         elif self.comm_session.selected_energy_service.service in (
             ServiceV20.DC,
             ServiceV20.DC_BPT,
+            ServiceV20.MCS,
+            ServiceV20.MCS_BPT,
         ):
             dc_params, bpt_dc_params = None, None
             self.comm_session.selected_charging_type_is_ac = False
-            if self.comm_session.selected_energy_service.service == ServiceV20.DC:
+            if self.comm_session.selected_energy_service.service in (
+                ServiceV20.DC,
+                ServiceV20.MCS,
+            ):
                 dc_params = await self.comm_session.ev_controller.get_charge_params_v20(
                     self.comm_session.selected_energy_service
                 )
@@ -850,6 +855,7 @@ async def process_message(
                 if self.comm_session.selected_energy_service.service in (
                     ServiceV20.AC_BPT,
                     ServiceV20.DC_BPT,
+                    ServiceV20.MCS_BPT,
                 ):
                     power_value = ev_power_profile.entry_list.entries[-1].power.value
                     if power_value < 0:
@@ -934,6 +940,8 @@ async def process_message(
             if self.comm_session.selected_energy_service.service in [
                 ServiceV20.DC,
                 ServiceV20.DC_BPT,
+                ServiceV20.MCS,
+                ServiceV20.MCS_BPT,
             ]:
                 welding_detection_req = DCWeldingDetectionReq(
                     header=MessageHeader(
@@ -1022,8 +1030,13 @@ async def process_message(
                 ISOV20PayloadTypes.AC_MAINSTREAM,
             )
 
-        elif selected_energy_service.service in [ServiceV20.DC, ServiceV20.DC_BPT]:
-            if selected_energy_service.service == ServiceV20.DC:
+        elif selected_energy_service.service in [
+            ServiceV20.DC,
+            ServiceV20.DC_BPT,
+            ServiceV20.MCS,
+            ServiceV20.MCS_BPT
+        ]:
+            if selected_energy_service.service in [ServiceV20.DC, ServiceV20.MCS]:
                 if control_mode == ControlMode.SCHEDULED:
                     scheduled_params = (
                         await ev_controller.get_scheduled_dc_charge_loop_params()
@@ -1032,7 +1045,7 @@ async def process_message(
                     dynamic_params = (
                         await ev_controller.get_dynamic_dc_charge_loop_params()
                     )
-            elif selected_energy_service.service == ServiceV20.DC_BPT:
+            elif selected_energy_service.service in [ServiceV20.DC_BPT, ServiceV20.MCS_BPT]:
                 if control_mode == ControlMode.SCHEDULED:
                     bpt_scheduled_params = (
                         await ev_controller.get_bpt_scheduled_dc_charge_loop_params()
@@ -1587,6 +1600,7 @@ async def build_power_delivery_req(self):
         if self.comm_session.selected_energy_service.service in (
             ServiceV20.AC_BPT,
             ServiceV20.DC_BPT,
+            ServiceV20.MCS_BPT,
         ):
             bpt_channel_selection = ChannelSelection.CHARGE
             if ev_power_profile is not None:
@@ -1691,7 +1705,7 @@ async def process_message(
     async def build_current_demand_data(self):
         scheduled_params, dynamic_params = None, None
         bpt_scheduled_params, bpt_dynamic_params = None, None
-        if self.comm_session.selected_energy_service.service == ServiceV20.DC:
+        if self.comm_session.selected_energy_service.service in [ServiceV20.DC, ServiceV20.MCS]:
             if self.comm_session.control_mode == ControlMode.SCHEDULED:
                 scheduled_params = (
                     await self.comm_session.ev_controller.get_scheduled_dc_charge_loop_params()  # noqa
@@ -1700,7 +1714,7 @@ async def build_current_demand_data(self):
                 dynamic_params = (
                     await self.comm_session.ev_controller.get_dynamic_dc_charge_loop_params()  # noqa
                 )
-        elif self.comm_session.selected_energy_service.service == ServiceV20.DC_BPT:
+        elif self.comm_session.selected_energy_service.service in [ServiceV20.DC_BPT, ServiceV20.MCS_BPT]:
             if self.comm_session.control_mode == ControlMode.SCHEDULED:
                 bpt_scheduled_params = (
                     await self.comm_session.ev_controller.get_bpt_scheduled_dc_charge_loop_params()  # noqa

iso15118/shared/messages/enums.py

@@ -330,6 +330,9 @@ class ServiceV20(Enum):
     AC_BPT = 5
     DC_BPT = 6
     DC_ACDP_BPT = 7
+    MCS = 8
+    MCS_BPT = 9
+    AC_DER = 10
     INTERNET = 65
     PARKING_STATUS = 66
 
@@ -368,6 +371,15 @@ class DCConnector(IntEnum):
     DUAL2 = 3
     DUAL4 = 4
 
+class McsConnector(IntEnum):
+
+    MCS = 1,
+    CHAOJI = 2,
+    ULTRACHAOJI = 3,
+    RMCS = 4,
+    XMCS = 5,
+    AVIATION = 6,
+    MARINE = 7,
 
 class ControlMode(IntEnum):
     """See e.g. Table 205 in section 8.4.3.2.2 of ISO 15118-20"""

iso15118/shared/utils.py

@@ -48,6 +48,9 @@ def load_requested_energy_services(
         "AC_BPT",
         "DC_BPT",
         "DC_ACDP_BPT",
+        "MCS",
+        "MCS_BPT",
+        "AC_DER",
         "INTERNET",
         "PARKING_STATUS",
     ]