From b41a1ceafcc4f6aca2ff04f3b552aeca7d67e372 Mon Sep 17 00:00:00 2001 From: Sebastian Lukas Date: Thu, 14 Nov 2024 11:57:16 +0100 Subject: [PATCH] Removing custom constructors from the d20 message structs Signed-off-by: Sebastian Lukas --- .../message/ac_charge_parameter_discovery.hpp | 5 ++--- include/iso15118/message/authorization.hpp | 4 +--- include/iso15118/message/authorization_setup.hpp | 12 ++++-------- include/iso15118/message/dc_cable_check.hpp | 5 +---- include/iso15118/message/dc_charge_loop.hpp | 4 +--- .../message/dc_charge_parameter_discovery.hpp | 5 ++--- include/iso15118/message/schedule_exchange.hpp | 9 +++------ include/iso15118/message/service_discovery.hpp | 1 - 8 files changed, 14 insertions(+), 31 deletions(-) diff --git a/include/iso15118/message/ac_charge_parameter_discovery.hpp b/include/iso15118/message/ac_charge_parameter_discovery.hpp index df7da946..2bdfa5ba 100644 --- a/include/iso15118/message/ac_charge_parameter_discovery.hpp +++ b/include/iso15118/message/ac_charge_parameter_discovery.hpp @@ -64,9 +64,8 @@ struct AC_ChargeParameterDiscoveryResponse { Header header; datatypes::ResponseCode response_code; - AC_ChargeParameterDiscoveryResponse() : transfer_mode(std::in_place_type){}; - - std::variant transfer_mode; + std::variant transfer_mode = + datatypes::AC_CPDResEnergyTransferMode(); }; } // namespace iso15118::message_20 diff --git a/include/iso15118/message/authorization.hpp b/include/iso15118/message/authorization.hpp index d7561a61..3263e70b 100644 --- a/include/iso15118/message/authorization.hpp +++ b/include/iso15118/message/authorization.hpp @@ -35,11 +35,9 @@ struct AuthorizationRequest { }; struct AuthorizationResponse { - AuthorizationResponse() : evse_processing(datatypes::Processing::Finished){}; - Header header; datatypes::ResponseCode response_code; - datatypes::Processing evse_processing; + datatypes::Processing evse_processing{datatypes::Processing::Finished}; }; } // namespace iso15118::message_20 diff --git a/include/iso15118/message/authorization_setup.hpp b/include/iso15118/message/authorization_setup.hpp index d6e8da6c..58d845ec 100644 --- a/include/iso15118/message/authorization_setup.hpp +++ b/include/iso15118/message/authorization_setup.hpp @@ -28,17 +28,13 @@ struct AuthorizationSetupRequest { }; struct AuthorizationSetupResponse { - AuthorizationSetupResponse() : - authorization_services({datatypes::Authorization::EIM}), - certificate_installation_service(false), - authorization_mode(std::in_place_type){}; - Header header; datatypes::ResponseCode response_code; - std::vector authorization_services; - bool certificate_installation_service; - std::variant authorization_mode; + std::vector authorization_services{{datatypes::Authorization::EIM}}; + bool certificate_installation_service{false}; + std::variant authorization_mode = + datatypes::EIM_ASResAuthorizationMode(); }; } // namespace iso15118::message_20 diff --git a/include/iso15118/message/dc_cable_check.hpp b/include/iso15118/message/dc_cable_check.hpp index 5da70185..490f5ba6 100644 --- a/include/iso15118/message/dc_cable_check.hpp +++ b/include/iso15118/message/dc_cable_check.hpp @@ -11,13 +11,10 @@ struct DC_CableCheckRequest { }; struct DC_CableCheckResponse { - - DC_CableCheckResponse() : processing(datatypes::Processing::Ongoing){}; - Header header; datatypes::ResponseCode response_code; - datatypes::Processing processing; + datatypes::Processing processing{datatypes::Processing::Ongoing}; }; } // namespace iso15118::message_20 diff --git a/include/iso15118/message/dc_charge_loop.hpp b/include/iso15118/message/dc_charge_loop.hpp index f7f601bd..063a128b 100644 --- a/include/iso15118/message/dc_charge_loop.hpp +++ b/include/iso15118/message/dc_charge_loop.hpp @@ -104,9 +104,7 @@ struct DC_ChargeLoopResponse { std::variant - control_mode; - - DC_ChargeLoopResponse() : control_mode(std::in_place_type){}; + control_mode = datatypes::Scheduled_DC_CLResControlMode(); }; } // namespace iso15118::message_20 diff --git a/include/iso15118/message/dc_charge_parameter_discovery.hpp b/include/iso15118/message/dc_charge_parameter_discovery.hpp index dbd7b35d..d97edf57 100644 --- a/include/iso15118/message/dc_charge_parameter_discovery.hpp +++ b/include/iso15118/message/dc_charge_parameter_discovery.hpp @@ -56,9 +56,8 @@ struct DC_ChargeParameterDiscoveryResponse { Header header; datatypes::ResponseCode response_code; - DC_ChargeParameterDiscoveryResponse() : transfer_mode(std::in_place_type){}; - - std::variant transfer_mode; + std::variant transfer_mode = + datatypes::DC_CPDResEnergyTransferMode(); }; } // namespace iso15118::message_20 diff --git a/include/iso15118/message/schedule_exchange.hpp b/include/iso15118/message/schedule_exchange.hpp index 91ae44a6..f0ad4f40 100644 --- a/include/iso15118/message/schedule_exchange.hpp +++ b/include/iso15118/message/schedule_exchange.hpp @@ -193,16 +193,13 @@ struct ScheduleExchangeRequest { }; struct ScheduleExchangeResponse { - ScheduleExchangeResponse() : - processing(datatypes::Processing::Finished), - control_mode(std::in_place_type){}; - Header header; datatypes::ResponseCode response_code; - datatypes::Processing processing; + datatypes::Processing processing{datatypes::Processing::Finished}; std::optional go_to_pause; - std::variant control_mode; + std::variant control_mode = + datatypes::Dynamic_SEResControlMode(); }; } // namespace iso15118::message_20 diff --git a/include/iso15118/message/service_discovery.hpp b/include/iso15118/message/service_discovery.hpp index 00970a69..47d11680 100644 --- a/include/iso15118/message/service_discovery.hpp +++ b/include/iso15118/message/service_discovery.hpp @@ -30,7 +30,6 @@ struct ServiceDiscoveryResponse { Header header; datatypes::ResponseCode response_code; bool service_renegotiation_supported = false; - // FIXME(sl): Adding constructor datatypes::ServiceList energy_transfer_service_list = {{ datatypes::ServiceCategory::AC, // service_id false // free_service