Merge branch 'main' into feature/327-use-case-h01-reservation

dependencies.yaml

@@ -47,7 +47,7 @@ libcbv2g:
 # libiso15118
 libiso15118:
   git: https://github.com/EVerest/libiso15118.git
-  git_tag: v0.2.0
+  git_tag: v0.3.0
   cmake_condition: "EVEREST_DEPENDENCY_ENABLED_LIBISO15118"
 
 # LEM DCBM 400/600 module
@@ -72,7 +72,7 @@ libocpp:
 # Josev
 Josev:
   git: https://github.com/EVerest/ext-switchev-iso15118.git
-  git_tag: 2024.9.0
+  git_tag: 2024.10.0
   cmake_condition: "EVEREST_ENABLE_PY_SUPPORT AND EVEREST_DEPENDENCY_ENABLED_JOSEV"
 # mbedtls
 ext-mbedtls:

interfaces/ISO15118_charger.yaml

@@ -351,3 +351,14 @@ vars:
       Parameters that may be displayed on the EVSE (Soc, battery capacity)
     type: object
     $ref: /iso15118_charger#/DisplayParameters
+  d20_dc_dynamic_charge_mode:
+    description: >-
+      The parameters the EVCC offers and sets for dynamic control mode
+    type: object
+    $ref: /iso15118_charger#/DcChargeDynamicModeValues
+  dc_ev_present_voltage:
+    description: Present Voltage measured from the EV
+    type: number
+  meter_info_requested:
+    description: The EV requested meter infos from the EVSE
+    type: "null"

modules/Evse15118D20/Evse15118D20.hpp

@@ -28,6 +28,9 @@ struct Conf {
     bool enable_ssl_logging;
     bool enable_tls_key_logging;
     bool enable_sdp_server;
+    bool supported_dynamic_mode;
+    bool supported_mobility_needs_mode_provided_by_secc;
+    bool supported_scheduled_mode;
 };
 
 class Evse15118D20 : public Everest::ModuleBase {

modules/Evse15118D20/manifest.yaml

@@ -43,6 +43,20 @@ config:
       Enable the built-in SDP server
     type: boolean
     default: true
+  supported_dynamic_mode:
+    description: The EVSE should support dynamic mode
+    type: boolean
+    default: true
+  supported_mobility_needs_mode_provided_by_secc:
+    description: >-
+      The EVSE should support the mobility needs mode provided by the SECC.
+      Mobility needs mode provided by the EVCC is always provided.
+    type: boolean
+    default: false
+  supported_scheduled_mode:
+    description: The EVSE should support scheduled mode
+    type: boolean
+    default: false
 provides:
   charger:
     interface: ISO15118_charger

modules/EvseManager/EvseManager.cpp

@@ -397,6 +397,48 @@ void EvseManager::ready() {
                 }
             });
 
+            r_hlc[0]->subscribe_d20_dc_dynamic_charge_mode(
+                [this](types::iso15118_charger::DcChargeDynamicModeValues values) {
+                    constexpr auto PRE_CHARGE_MAX_POWER = 800.0f;
+
+                    bool target_changed{false};
+
+                    if (values.min_voltage > latest_target_voltage) {
+                        latest_target_voltage = values.min_voltage + 10; // TODO(sl): Check if okay
+                        target_changed = true;
+                    }
+                    if (values.max_voltage < latest_target_voltage) {
+                        latest_target_voltage = values.max_voltage - 10; // TODO(sl): Check if okay
+                        target_changed = true;
+                    }
+
+                    const double latest_target_power = latest_target_voltage * latest_target_current;
+
+                    if (latest_target_power <= PRE_CHARGE_MAX_POWER or values.min_charge_power > latest_target_power or
+                        values.max_charge_power < latest_target_power) {
+                        latest_target_current = static_cast<double>(values.max_charge_power) / latest_target_voltage;
+                        if (values.max_charge_current < latest_target_current) {
+                            latest_target_current = values.max_charge_current;
+                        }
+                        target_changed = true;
+                    }
+
+                    if (target_changed) {
+                        apply_new_target_voltage_current();
+                        if (not contactor_open) {
+                            powersupply_DC_on();
+                        }
+
+                        {
+                            Everest::scoped_lock_timeout lock(ev_info_mutex,
+                                                              Everest::MutexDescription::EVSE_publish_ev_info);
+                            ev_info.target_voltage = latest_target_voltage;
+                            ev_info.target_current = latest_target_current;
+                            p_evse->publish_ev_info(ev_info);
+                        }
+                    }
+                });
+
             // Car requests DC contactor open. We don't actually open but switch off DC supply.
             // opening will be done by Charger on C->B CP event.
             r_hlc[0]->subscribe_dc_open_contactor([this] {

modules/IsoMux/charger/ISO15118_chargerImpl.cpp

@@ -435,6 +435,36 @@ void ISO15118_chargerImpl::init() {
             publish_display_parameters(o);
         }
     });
+
+    mod->r_iso20->subscribe_d20_dc_dynamic_charge_mode([this](const auto o) {
+        if (mod->selected_iso20()) {
+            publish_d20_dc_dynamic_charge_mode(o);
+        }
+    });
+
+    mod->r_iso2->subscribe_dc_ev_present_voltage([this](const auto o) {
+        if (not mod->selected_iso20()) {
+            publish_dc_ev_present_voltage(o);
+        }
+    });
+
+    mod->r_iso20->subscribe_dc_ev_present_voltage([this](const auto o) {
+        if (mod->selected_iso20()) {
+            publish_dc_ev_present_voltage(o);
+        }
+    });
+
+    mod->r_iso2->subscribe_meter_info_requested([this]() {
+        if (not mod->selected_iso20()) {
+            publish_meter_info_requested(nullptr);
+        }
+    });
+
+    mod->r_iso20->subscribe_meter_info_requested([this]() {
+        if (mod->selected_iso20()) {
+            publish_meter_info_requested(nullptr);
+        }
+    });
 }
 
 void ISO15118_chargerImpl::ready() {

types/iso15118_charger.yaml

@@ -579,10 +579,87 @@ types:
         description: Remaining time it takes to reach maximum SoC
         type: number
         minimum: 0
+      charging_complete:
+        description: Indication if the charging is complete
+        type: boolean
       battery_energy_capacity:
         description: Energy capacity in Wh of the EV battery
         type: number
         minimum: 0
       inlet_hot:
         description: Inlet temperature is too high
         type: boolean
+  DcChargeDynamicModeValues:
+    description: Parameters for dynamic control mode
+    type: object
+    additionalProperties: false
+    required:
+      - target_energy_request
+      - max_energy_request
+      - min_energy_request
+      - max_charge_power
+      - min_charge_power
+      - max_charge_current
+      - max_voltage
+      - min_voltage
+    properties:
+      departure_time:
+        description: The time when the EV wants to finish charging
+        type: number
+        minimum: 0
+      target_energy_request:
+        description: Energy request to fulfil the target SoC
+        type: number
+        minimum: 0
+      max_energy_request:
+        description: Maximum acceptable energy level of the EV
+        type: number
+        minimum: 0
+      min_energy_request:
+        description: Energy request to fulfil the minimum SoC
+        type: number
+        minimum: 0
+      max_charge_power:
+        description: Maximum charge power allowed by the EV
+        type: number
+        minimum: 0
+      min_charge_power:
+        description: Minimum charge power allowed by the EV
+        type: number
+        minimum: 0
+      max_charge_current:
+        description: Maximum charge current allowed by the EV
+        type: number
+        minimum: 0
+      max_voltage:
+        description: Maximum voltage allowed by the EV
+        type: number
+        minimum: 0
+      min_voltage:
+        description: Minimum voltage allowd by the EV
+        type: number
+        minimum: 0
+      max_discharge_power:
+        description: Maximum discharge current allowed by the EV
+        type: number
+        minimum: 0
+      min_discharge_power:
+        description: Minimum discharge current allowed by the EV
+        type: number
+        minimum: 0
+      max_discharge_current:
+        description: Maximum discharge current allowed by the EV
+        type: number
+        minimum: 0
+      max_v2x_energy_request:
+        description: >-
+          Energy which may be charged until the PresentSOC has left the range
+          dedicated for cycling activity.
+        type: number
+        minimum: 0
+      min_v2x_energy_request:
+        description: >-
+          Energy which needs to be charged until the PresentSOC has left the
+          range dedicated for cycling activity.
+        type: number
+        minimum: 0