Adding basic dynamic mode

dependencies.yaml

@@ -9,4 +9,4 @@ catch2:
   cmake_condition: "ISO15118_BUILD_TESTING"
 libcbv2g:
   git: https://github.com/EVerest/libcbv2g.git
-  git_tag: v0.2.0
+  git_tag: v0.2.1

include/iso15118/d20/config.hpp

@@ -11,12 +11,18 @@
 
 namespace iso15118::d20 {
 
+struct ControlMobilityNeedsModes {
+    message_20::ControlMode control_mode;
+    message_20::MobilityNeedsMode mobility_mode;
+};
+
 struct EvseSetupConfig {
     std::string evse_id;
     std::vector<message_20::ServiceCategory> supported_energy_services;
     std::vector<message_20::Authorization> authorization_services;
     bool enable_certificate_install_service;
     d20::DcTransferLimits dc_limits;
+    std::vector<ControlMobilityNeedsModes> control_mobility_modes;
 };
 
 struct SessionConfig {
@@ -37,6 +43,8 @@
     std::vector<message_20::ParkingParameterList> parking_parameter_list;
 
     DcTransferLimits dc_limits;
+
+    std::vector<ControlMobilityNeedsModes> supported_control_mobility_modes;
 };
 
 } // namespace iso15118::d20

include/iso15118/d20/control_event.hpp

@@ -2,8 +2,11 @@
 // Copyright 2023 Pionix GmbH and Contributors to EVerest
 #pragma once
 
+#include <cstdint>
+#include <optional>
 #include <variant>
 
+#include <iso15118/d20/dynamic_mode_parameters.hpp>
 #include <iso15118/d20/limits.hpp>
 
 namespace iso15118::d20 {
@@ -51,7 +54,7 @@ class StopCharging {
     bool stop;
 };
 
-using ControlEvent =
-    std::variant<CableCheckFinished, PresentVoltageCurrent, AuthorizationResponse, StopCharging, DcTransferLimits>;
+using ControlEvent = std::variant<CableCheckFinished, PresentVoltageCurrent, AuthorizationResponse, StopCharging,
+                                  DcTransferLimits, UpdateDynamicModeParameters>;
 
 } // namespace iso15118::d20

include/iso15118/d20/dynamic_mode_parameters.hpp

@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2024 Pionix GmbH and Contributors to EVerest
+#pragma once
+
+#include <cstdint>
+#include <ctime>
+#include <optional>
+
+namespace iso15118::d20 {
+
+struct UpdateDynamicModeParameters {
+    std::optional<std::time_t> departure_time;
+    std::optional<std::uint8_t> target_soc;
+    std::optional<std::uint8_t> min_soc;
+};
+
+} // namespace iso15118::d20

include/iso15118/d20/session.hpp

@@ -91,16 +91,10 @@ class Session {
 
     void selected_service_parameters(const message_20::ServiceCategory service, const uint16_t id);
 
-    message_20::ServiceCategory get_selected_energy_service() const {
-        return selected_services.selected_energy_service;
+    auto get_selected_services() const& {
+        return selected_services;
     }
 
-    message_20::ControlMode get_selected_control_mode() const {
-        return selected_services.selected_control_mode;
-    }
-
-    // TODO(sl): Define get_selected_*() if necessary
-
     ~Session();
 
     OfferedServices offered_services;

include/iso15118/d20/state/dc_charge_loop.hpp

@@ -4,6 +4,11 @@
 
 #include "../fsm.hpp"
 
+#include <cstdint>
+#include <optional>
+
+#include <iso15118/d20/dynamic_mode_parameters.hpp>
+
 namespace iso15118::d20::state {
 
 struct DC_ChargeLoop : public FsmSimpleState {
@@ -18,6 +23,8 @@ struct DC_ChargeLoop : public FsmSimpleState {
     float present_current{0};
     bool stop{false};
 
+    UpdateDynamicModeParameters dynamic_parameters;
+
     bool first_entry_in_charge_loop{true};
 };
 

include/iso15118/d20/state/schedule_exchange.hpp

@@ -4,6 +4,11 @@
 
 #include "../fsm.hpp"
 
+#include <cstdint>
+#include <optional>
+
+#include <iso15118/d20/dynamic_mode_parameters.hpp>
+
 namespace iso15118::d20::state {
 
 struct ScheduleExchange : public FsmSimpleState {
@@ -12,6 +17,9 @@ struct ScheduleExchange : public FsmSimpleState {
     void enter() final;
 
     HandleEventReturnType handle_event(AllocatorType&, FsmEvent) final;
+
+private:
+    UpdateDynamicModeParameters dynamic_parameters;
 };
 
 } // namespace iso15118::d20::state

include/iso15118/detail/cb_exi.hpp

@@ -48,6 +48,13 @@
                                                                                                                        \
     out##_isUsed = static_cast<bool>(in);
 
+#define CPP2CB_STRING_IF_USED(in, out)                                                                                 \
+    if (in) {                                                                                                          \
+        CPP2CB_STRING(in.value(), out);                                                                                \
+    }                                                                                                                  \
+                                                                                                                       \
+    out##_isUsed = static_cast<bool>(in);
+
 template <typename T1, typename T2> void cb_convert_enum(const T1& in, T2& out) {
     out = static_cast<T2>(in);
 }

include/iso15118/detail/d20/state/dc_charge_loop.hpp

@@ -2,9 +2,13 @@
 // Copyright 2023 Pionix GmbH and Contributors to EVerest
 #pragma once
 
+#include <cstdint>
+#include <ctime>
 #include <optional>
 #include <tuple>
+#include <variant>
 
+#include <iso15118/d20/dynamic_mode_parameters.hpp>
 #include <iso15118/d20/limits.hpp>
 #include <iso15118/d20/session.hpp>
 #include <iso15118/message/dc_charge_loop.hpp>
@@ -13,8 +17,10 @@
 
 namespace iso15118::d20::state {
 
-std::tuple<message_20::DC_ChargeLoopResponse, std::optional<session::feedback::DcChargeTarget>>
-handle_request(const message_20::DC_ChargeLoopRequest& req, const d20::Session& session, const float present_voltage,
-               const float present_current, const bool stop, const DcTransferLimits& dc_limits);
+message_20::DC_ChargeLoopResponse handle_request(const message_20::DC_ChargeLoopRequest& req,
+                                                 const d20::Session& session, const float present_voltage,
+                                                 const float present_current, const bool stop,
+                                                 const DcTransferLimits& dc_limits,
+                                                 const UpdateDynamicModeParameters& dynamic_parameters);
 
 } // namespace iso15118::d20::state

include/iso15118/detail/d20/state/dc_pre_charge.hpp

@@ -2,6 +2,7 @@
 // Copyright 2023 Pionix GmbH and Contributors to EVerest
 #pragma once
 
+#include <optional>
 #include <tuple>
 
 #include <iso15118/d20/session.hpp>
@@ -11,7 +12,7 @@
 
 namespace iso15118::d20::state {
 
-std::tuple<message_20::DC_PreChargeResponse, session::feedback::DcChargeTarget>
-handle_request(const message_20::DC_PreChargeRequest& req, const d20::Session& session, const float present_voltage);
+message_20::DC_PreChargeResponse handle_request(const message_20::DC_PreChargeRequest& req, const d20::Session& session,
+                                                const float present_voltage);
 
 } // namespace iso15118::d20::state

include/iso15118/detail/d20/state/schedule_exchange.hpp

@@ -5,10 +5,17 @@
 #include <iso15118/d20/session.hpp>
 #include <iso15118/message/schedule_exchange.hpp>
 
+#include <cstdint>
+#include <ctime>
+#include <optional>
+
+#include <iso15118/d20/dynamic_mode_parameters.hpp>
+
 namespace iso15118::d20::state {
 
 message_20::ScheduleExchangeResponse handle_request(const message_20::ScheduleExchangeRequest& req,
                                                     const d20::Session& session,
-                                                    const message_20::RationalNumber& max_power);
+                                                    const message_20::RationalNumber& max_power,
+                                                    const UpdateDynamicModeParameters& dynamic_parameters);
 
 } // namespace iso15118::d20::state

include/iso15118/message/common.hpp

@@ -286,4 +286,7 @@ RationalNumber from_float(float in);
 
 std::string from_Protocol(const Protocol& in);
 
+std::string from_control_mode(const ControlMode& in);
+std::string from_mobility_needs_mode(const MobilityNeedsMode& in);
+
 } // namespace iso15118::message_20

include/iso15118/message/dc_charge_loop.hpp

@@ -92,15 +92,17 @@
     std::optional<MeterInfo> meter_info;
     std::optional<Receipt> receipt;
 
-    RationalNumber present_current;
-    RationalNumber present_voltage;
+    RationalNumber present_current{0, 0};
+    RationalNumber present_voltage{0, 0};
     bool power_limit_achieved{false};
     bool current_limit_achieved{false};
     bool voltage_limit_achieved{false};
 
     std::variant<Scheduled_DC_CLResControlMode, BPT_Scheduled_DC_CLResControlMode, Dynamic_DC_CLResControlMode,
                  BPT_Dynamic_DC_CLResControlMode>
-        control_mode = Scheduled_DC_CLResControlMode();
+        control_mode;
+
+    DC_ChargeLoopResponse() : control_mode(std::in_place_type<DC_ChargeLoopResponse::Scheduled_DC_CLResControlMode>){};
 };
 
 } // namespace iso15118::message_20

include/iso15118/message/schedule_exchange.hpp

@@ -73,12 +73,6 @@
 
 struct ScheduleExchangeResponse {
 
-    static constexpr auto TAX_RULE_LENGTH = 10;
-    static constexpr auto PRICE_RULE_STACK_LENGTH = 1024;
-    static constexpr auto PRICE_RULE_LENGTH = 8;
-    static constexpr auto OVERSTAY_RULE_LENGTH = 5;
-    static constexpr auto ADDITIONAL_SERVICE_LENGTH = 5;
-    static constexpr auto PRICE_LEVEL_SCHEDULE_LENGTH = 1024;
     static constexpr auto SCHEDULED_POWER_DURATION_S = 86400;
 
     Header header;
@@ -112,7 +106,7 @@
 
     struct PriceRuleStack {
         uint32_t duration;
-        std::array<PriceRule, PRICE_RULE_LENGTH> price_rule;
+        std::vector<PriceRule> price_rule;
     };
 
     struct OverstayRule {
@@ -125,7 +119,7 @@
     struct OverstayRulesList {
         std::optional<uint32_t> overstay_time_threshold;
         std::optional<RationalNumber> overstay_power_threshold;
-        std::array<OverstayRule, OVERSTAY_RULE_LENGTH> overstay_rule;
+        std::vector<OverstayRule> overstay_rule;
     };
 
     struct AdditionalService {
@@ -143,10 +137,10 @@
         std::string price_algorithm;
         std::optional<RationalNumber> minimum_cost;
         std::optional<RationalNumber> maximum_cost;
-        std::optional<std::array<TaxRule, TAX_RULE_LENGTH>> tax_rules;
-        std::array<PriceRuleStack, PRICE_RULE_STACK_LENGTH> price_rule_stacks;
+        std::optional<std::vector<TaxRule>> tax_rules;
+        std::vector<PriceRuleStack> price_rule_stacks;
         std::optional<OverstayRulesList> overstay_rules;
-        std::optional<std::array<AdditionalService, ADDITIONAL_SERVICE_LENGTH>> additional_selected_services;
+        std::optional<std::vector<AdditionalService>> additional_selected_services;
     };
 
     struct PriceLevelScheduleEntry {
@@ -160,7 +154,7 @@
         uint32_t price_schedule_id;
         std::optional<std::string> price_schedule_description;
         uint8_t number_of_price_levels;
-        std::array<PriceLevelScheduleEntry, PRICE_LEVEL_SCHEDULE_LENGTH> price_level_schedule_entries;
+        std::vector<PriceLevelScheduleEntry> price_level_schedule_entries;
     };
 
     struct Dynamic_SEResControlMode {

include/iso15118/session/feedback.hpp

@@ -2,10 +2,13 @@
 // Copyright 2023 Pionix GmbH and Contributors to EVerest
 #pragma once
 
+#include <cmath>
 #include <functional>
 #include <optional>
 #include <string>
+#include <variant>
 
+#include <iso15118/message/dc_charge_loop.hpp>
 #include <iso15118/message/type.hpp>
 
 namespace iso15118::session {
@@ -24,37 +27,30 @@
     DLINK_PAUSE,
 };
 
-struct DcChargeTarget {
-    float voltage{-1};
-    float current{-1};
-};
-
 struct DcMaximumLimits {
-    float voltage{-1};
-    float current{-1};
-    float power{-1};
+    float voltage{NAN};
+    float current{NAN};
+    float power{NAN};
 };
 
-struct DisplayParameters {
-    std::optional<float> present_soc;
-    std::optional<float> minimum_soc;
-    std::optional<float> target_soc;
-    std::optional<float> maximum_soc;
-    std::optional<float> remaining_time_to_minimum_soc;
-    std::optional<float> remaining_time_to_target_soc;
-    std::optional<float> remaining_time_to_maximum_soc;
-    std::optional<float> battery_energy_capacity;
-    std::optional<bool> inlet_hot;
-};
+using PresentVoltage = message_20::RationalNumber;
+using MeterInfoRequested = bool;
+using DcReqControlMode = std::variant<message_20::DC_ChargeLoopRequest::Scheduled_DC_CLReqControlMode,
+                                      message_20::DC_ChargeLoopRequest::BPT_Scheduled_DC_CLReqControlMode,
+                                      message_20::DC_ChargeLoopRequest::Dynamic_DC_CLReqControlMode,
+                                      message_20::DC_ChargeLoopRequest::BPT_Dynamic_DC_CLReqControlMode>;
+
+using DcChargeLoopReq =
+    std::variant<DcReqControlMode, message_20::DisplayParameters, PresentVoltage, MeterInfoRequested>;
 
 struct Callbacks {
     std::function<void(Signal)> signal;
-    std::function<void(const DcChargeTarget&)> dc_charge_target;
+    std::function<void(float)> dc_pre_charge_target_voltage;
+    std::function<void(const DcChargeLoopReq&)> dc_charge_loop_req;
     std::function<void(const DcMaximumLimits&)> dc_max_limits;
     std::function<void(const message_20::Type&)> v2g_message;
     std::function<void(const std::string&)> evccid;
     std::function<void(const std::string&)> selected_protocol;
-    std::function<void(const DisplayParameters&)> display_parameters;
 };
 
 } // namespace feedback
@@ -64,12 +60,12 @@
     Feedback(feedback::Callbacks);
 
     void signal(feedback::Signal) const;
-    void dc_charge_target(const feedback::DcChargeTarget&) const;
+    void dc_pre_charge_target_voltage(float) const;
+    void dc_charge_loop_req(const feedback::DcChargeLoopReq&) const;
     void dc_max_limits(const feedback::DcMaximumLimits&) const;
     void v2g_message(const message_20::Type&) const;
     void evcc_id(const std::string&) const;
     void selected_protocol(const std::string&) const;
-    void display_parameters(const feedback::DisplayParameters&) const;
 
 private:
     feedback::Callbacks callbacks;