Format

Signed-off-by: AssemblyJohn <ioan.bogdann@gmail.com>

Author: AssemblyJohn

include/iso15118/d20/config.hpp

@@ -42,9 +42,9 @@ struct SessionConfig {
 
     std::vector<message_20::datatypes::InternetParameterList> internet_parameter_list;
     std::vector<message_20::datatypes::ParkingParameterList> parking_parameter_list;
-    
+
     // I have a deja vu with this DC limits, shouldn't they be called dc_evse_limits?
-    DcTransferLimits dc_limits;    
+    DcTransferLimits dc_limits;
 
     std::vector<ControlMobilityNeedsModes> supported_control_mobility_modes;
 };

include/iso15118/d20/context.hpp

@@ -14,8 +14,8 @@
 
 #include "config.hpp"
 #include "control_event.hpp"
-#include "session.hpp"
 #include "ev_session_info.hpp"
+#include "session.hpp"
 
 namespace iso15118::d20 {
 

include/iso15118/d20/ev_session_info.hpp

@@ -7,7 +7,7 @@
 namespace iso15118::d20 {
 
 // Holds information reported by the EV
-struct EVSessionInfo {    
+struct EVSessionInfo {
     session::feedback::EV_TransferLimits ev_transfer_limits;
     session::feedback::EV_SEControlMode ev_control_mode;
 };

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

@@ -3,9 +3,9 @@
 #pragma once
 
 #include <iso15118/d20/config.hpp>
+#include <iso15118/d20/ev_session_info.hpp>
 #include <iso15118/d20/limits.hpp>
 #include <iso15118/d20/session.hpp>
-#include <iso15118/d20/ev_session_info.hpp>
 #include <iso15118/message/dc_charge_parameter_discovery.hpp>
 
 namespace iso15118::d20::state {

include/iso15118/session/feedback.hpp

@@ -9,9 +9,9 @@
 #include <variant>
 
 #include <iso15118/d20/limits.hpp>
-#include <iso15118/message/schedule_exchange.hpp>
 #include <iso15118/message/dc_charge_loop.hpp>
 #include <iso15118/message/dc_charge_parameter_discovery.hpp>
+#include <iso15118/message/schedule_exchange.hpp>
 #include <iso15118/message/type.hpp>
 
 namespace iso15118::session {
@@ -40,21 +40,16 @@ struct DcMaximumLimits {
 
 using PresentVoltage = dt::RationalNumber;
 using MeterInfoRequested = bool;
-using DcReqControlMode = std::variant<
-    dt::Scheduled_DC_CLReqControlMode, dt::BPT_Scheduled_DC_CLReqControlMode,
-    dt::Dynamic_DC_CLReqControlMode, dt::BPT_Dynamic_DC_CLReqControlMode>;
+using DcReqControlMode = std::variant<dt::Scheduled_DC_CLReqControlMode, dt::BPT_Scheduled_DC_CLReqControlMode,
+                                      dt::Dynamic_DC_CLReqControlMode, dt::BPT_Dynamic_DC_CLReqControlMode>;
 
-using DcChargeLoopReq =
-    std::variant<DcReqControlMode, dt::DisplayParameters, PresentVoltage, MeterInfoRequested>;
+using DcChargeLoopReq = std::variant<DcReqControlMode, dt::DisplayParameters, PresentVoltage, MeterInfoRequested>;
 
 // TODO(ioan): preparation for AC limits
-using EVSE_TransferLimits =
-    std::variant<d20::DcTransferLimits>;
+using EVSE_TransferLimits = std::variant<d20::DcTransferLimits>;
 
-using EV_TransferLimits =
-    std::variant<dt::DC_CPDReqEnergyTransferMode, dt::BPT_DC_CPDReqEnergyTransferMode>;
-using EV_SEControlMode =
-    std::variant<dt::Dynamic_SEReqControlMode, dt::Scheduled_SEReqControlMode>;
+using EV_TransferLimits = std::variant<dt::DC_CPDReqEnergyTransferMode, dt::BPT_DC_CPDReqEnergyTransferMode>;
+using EV_SEControlMode = std::variant<dt::Dynamic_SEReqControlMode, dt::Scheduled_SEReqControlMode>;
 
 struct Callbacks {
     std::function<void(Signal)> signal;
@@ -85,7 +80,7 @@ class Feedback {
     void selected_protocol(const std::string&) const;
 
     void notify_ev_charging_needs(const dt::ServiceCategory&, const dt::AcConnector&, const dt::ControlMode&,
-                                  const dt::MobilityNeedsMode&, const feedback::EVSE_TransferLimits&, 
+                                  const dt::MobilityNeedsMode&, const feedback::EVSE_TransferLimits&,
                                   const feedback::EV_TransferLimits&) const;
 
 private:

src/iso15118/d20/state/dc_charge_parameter_discovery.cpp

@@ -76,7 +76,7 @@ handle_request(const message_20::DC_ChargeParameterDiscoveryRequest& req, const
         }
 
         // Extract info from the EV
-        out_ev_session_info.ev_transfer_limits.emplace<BPT_DC_ModeReq>(std::get<BPT_DC_ModeReq>(req.transfer_mode));        
+        out_ev_session_info.ev_transfer_limits.emplace<BPT_DC_ModeReq>(std::get<BPT_DC_ModeReq>(req.transfer_mode));
 
         auto& mode = res.transfer_mode.emplace<BPT_DC_ModeRes>();
         convert(mode, dc_limits);
@@ -119,7 +119,7 @@ Result DC_ChargeParameterDiscovery::feed(Event ev) {
             logf_info("Max charge current %fA", dt::from_RationalNumber(mode->max_charge_current));
             logf_info("Max discharge current %fA", dt::from_RationalNumber(mode->max_discharge_current));
         }
-        
+
         const auto res = handle_request(*req, m_ctx.session, m_ctx.session_config.dc_limits, m_ctx.session_ev_info);
 
         m_ctx.respond(res);

src/iso15118/d20/state/schedule_exchange.cpp

@@ -147,14 +147,13 @@ Result ScheduleExchange::feed(Event ev) {
         const session::feedback::EVSE_TransferLimits& evse_limits = m_ctx.session_config.dc_limits;
         const session::feedback::EV_TransferLimits& ev_limits = m_ctx.session_ev_info.ev_transfer_limits;
 
-        // TODO: send and transform        
+        // TODO: send and transform
         const session::feedback::EV_SEControlMode control_mode = req->control_mode;
 
         // Send the charging feedback
-        this->m_ctx.feedback.notify_ev_charging_needs(selected_energy_service, ac_connector,
-                                                      selected_services.selected_control_mode,
-                                                      selected_services.selected_mobility_needs_mode, 
-                                                      evse_limits, ev_limits);
+        this->m_ctx.feedback.notify_ev_charging_needs(
+            selected_energy_service, ac_connector, selected_services.selected_control_mode,
+            selected_services.selected_mobility_needs_mode, evse_limits, ev_limits);
 
         const auto res = handle_request(*req, m_ctx.session, max_charge_power, dynamic_parameters);
 

test/iso15118/states/dc_charge_parameter_discovery.cpp

@@ -2,8 +2,8 @@
 // Copyright 2023 Pionix GmbH and Contributors to EVerest
 #include <catch2/catch_test_macros.hpp>
 
-#include <iso15118/detail/d20/state/dc_charge_parameter_discovery.hpp>
 #include <iso15118/d20/ev_session_info.hpp>
+#include <iso15118/detail/d20/state/dc_charge_parameter_discovery.hpp>
 
 using namespace iso15118;