Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removing custom constructors from d20 message structs #46

Merged
merged 1 commit into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions include/iso15118/message/ac_charge_parameter_discovery.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,8 @@ struct AC_ChargeParameterDiscoveryResponse {
Header header;
datatypes::ResponseCode response_code;

AC_ChargeParameterDiscoveryResponse() : transfer_mode(std::in_place_type<datatypes::AC_CPDResEnergyTransferMode>){};

std::variant<datatypes::AC_CPDResEnergyTransferMode, datatypes::BPT_AC_CPDResEnergyTransferMode> transfer_mode;
std::variant<datatypes::AC_CPDResEnergyTransferMode, datatypes::BPT_AC_CPDResEnergyTransferMode> transfer_mode =
datatypes::AC_CPDResEnergyTransferMode();
};

} // namespace iso15118::message_20
4 changes: 1 addition & 3 deletions include/iso15118/message/authorization.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,9 @@
};

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};

Check notice on line 40 in include/iso15118/message/authorization.hpp

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

include/iso15118/message/authorization.hpp#L40

struct member 'AuthorizationResponse::evse_processing' is never used.
};

} // namespace iso15118::message_20
12 changes: 4 additions & 8 deletions include/iso15118/message/authorization_setup.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,13 @@
};

struct AuthorizationSetupResponse {
AuthorizationSetupResponse() :
authorization_services({datatypes::Authorization::EIM}),
certificate_installation_service(false),
authorization_mode(std::in_place_type<datatypes::EIM_ASResAuthorizationMode>){};

Header header;
datatypes::ResponseCode response_code;

std::vector<datatypes::Authorization> authorization_services;
bool certificate_installation_service;
std::variant<datatypes::EIM_ASResAuthorizationMode, datatypes::PnC_ASResAuthorizationMode> authorization_mode;
std::vector<datatypes::Authorization> authorization_services{{datatypes::Authorization::EIM}};

Check notice on line 34 in include/iso15118/message/authorization_setup.hpp

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

include/iso15118/message/authorization_setup.hpp#L34

struct member 'AuthorizationSetupResponse::authorization_services' is never used.
bool certificate_installation_service{false};

Check notice on line 35 in include/iso15118/message/authorization_setup.hpp

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

include/iso15118/message/authorization_setup.hpp#L35

struct member 'AuthorizationSetupResponse::certificate_installation_service' is never used.
std::variant<datatypes::EIM_ASResAuthorizationMode, datatypes::PnC_ASResAuthorizationMode> authorization_mode =
datatypes::EIM_ASResAuthorizationMode();
};

} // namespace iso15118::message_20
5 changes: 1 addition & 4 deletions include/iso15118/message/dc_cable_check.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,10 @@
};

struct DC_CableCheckResponse {

DC_CableCheckResponse() : processing(datatypes::Processing::Ongoing){};

Header header;
datatypes::ResponseCode response_code;

datatypes::Processing processing;
datatypes::Processing processing{datatypes::Processing::Ongoing};

Check notice on line 17 in include/iso15118/message/dc_cable_check.hpp

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

include/iso15118/message/dc_cable_check.hpp#L17

struct member 'DC_CableCheckResponse::processing' is never used.
};

} // namespace iso15118::message_20
4 changes: 1 addition & 3 deletions include/iso15118/message/dc_charge_loop.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,7 @@ struct DC_ChargeLoopResponse {

std::variant<datatypes::Scheduled_DC_CLResControlMode, datatypes::BPT_Scheduled_DC_CLResControlMode,
datatypes::Dynamic_DC_CLResControlMode, datatypes::BPT_Dynamic_DC_CLResControlMode>
control_mode;

DC_ChargeLoopResponse() : control_mode(std::in_place_type<datatypes::Scheduled_DC_CLResControlMode>){};
control_mode = datatypes::Scheduled_DC_CLResControlMode();
};

} // namespace iso15118::message_20
5 changes: 2 additions & 3 deletions include/iso15118/message/dc_charge_parameter_discovery.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,8 @@ struct DC_ChargeParameterDiscoveryResponse {
Header header;
datatypes::ResponseCode response_code;

DC_ChargeParameterDiscoveryResponse() : transfer_mode(std::in_place_type<datatypes::DC_CPDResEnergyTransferMode>){};

std::variant<datatypes::DC_CPDResEnergyTransferMode, datatypes::BPT_DC_CPDResEnergyTransferMode> transfer_mode;
std::variant<datatypes::DC_CPDResEnergyTransferMode, datatypes::BPT_DC_CPDResEnergyTransferMode> transfer_mode =
datatypes::DC_CPDResEnergyTransferMode();
};

} // namespace iso15118::message_20
9 changes: 3 additions & 6 deletions include/iso15118/message/schedule_exchange.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -193,16 +193,13 @@
};

struct ScheduleExchangeResponse {
ScheduleExchangeResponse() :
processing(datatypes::Processing::Finished),
control_mode(std::in_place_type<datatypes::Dynamic_SEResControlMode>){};

Header header;
datatypes::ResponseCode response_code;
datatypes::Processing processing;
datatypes::Processing processing{datatypes::Processing::Finished};

Check notice on line 198 in include/iso15118/message/schedule_exchange.hpp

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

include/iso15118/message/schedule_exchange.hpp#L198

struct member 'ScheduleExchangeResponse::processing' is never used.
std::optional<bool> go_to_pause;

std::variant<datatypes::Dynamic_SEResControlMode, datatypes::Scheduled_SEResControlMode> control_mode;
std::variant<datatypes::Dynamic_SEResControlMode, datatypes::Scheduled_SEResControlMode> control_mode =
datatypes::Dynamic_SEResControlMode();
};

} // namespace iso15118::message_20
1 change: 0 additions & 1 deletion include/iso15118/message/service_discovery.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading