From 572018cecd6fe9cc1447db43d4f57dd319e8a6b0 Mon Sep 17 00:00:00 2001 From: c-jimenez <18682655+c-jimenez@users.noreply.github.com> Date: Wed, 23 Oct 2024 09:54:25 +0200 Subject: [PATCH] =?UTF-8?q?[ocpp20]=C2=A0Fix=20clang=20build?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/ocpp20/quick_start_chargepoint/main.cpp | 4 ++-- .../centralsystem/chargepoint/ChargePointHandler20.cpp | 5 +---- .../centralsystem/chargepoint/ChargePointHandler20.h | 8 +------- .../centralsystem/chargepoint/ChargePointProxy20.cpp | 2 +- .../templates/centralsystem/ChargePointHandler.cpp.j2 | 5 +---- .../templates/centralsystem/ChargePointHandler.h.j2 | 8 +------- .../templates/centralsystem/ChargePointProxy.cpp.j2 | 2 +- 7 files changed, 8 insertions(+), 26 deletions(-) diff --git a/examples/ocpp20/quick_start_chargepoint/main.cpp b/examples/ocpp20/quick_start_chargepoint/main.cpp index befe2aa4..ae0ccf8a 100644 --- a/examples/ocpp20/quick_start_chargepoint/main.cpp +++ b/examples/ocpp20/quick_start_chargepoint/main.cpp @@ -125,8 +125,8 @@ int main(int argc, char* argv[]) std::string error; std::string error_msg; - auto last_boot_notif = std::chrono::steady_clock::time_point(); - std::chrono::seconds hb_boot_notif_interval = std::chrono::seconds(10); + auto last_boot_notif = std::chrono::steady_clock::time_point(); + std::chrono::seconds hb_boot_notif_interval = std::chrono::seconds(10); RegistrationStatusEnumType registration_status = RegistrationStatusEnumType::Rejected; unsigned int transaction_id = std::chrono::system_clock::now().time_since_epoch().count(); diff --git a/src/ocpp20/centralsystem/chargepoint/ChargePointHandler20.cpp b/src/ocpp20/centralsystem/chargepoint/ChargePointHandler20.cpp index 594984de..414d60c2 100644 --- a/src/ocpp20/centralsystem/chargepoint/ChargePointHandler20.cpp +++ b/src/ocpp20/centralsystem/chargepoint/ChargePointHandler20.cpp @@ -39,8 +39,7 @@ namespace ocpp20 /** @brief Constructor */ ChargePointHandler20::ChargePointHandler20(const std::string& identifier, const ocpp::messages::ocpp20::MessagesConverter20& messages_converter, - ocpp::messages::MessageDispatcher& msg_dispatcher, - const ocpp::config::ICentralSystemConfig20& stack_config) + ocpp::messages::MessageDispatcher& msg_dispatcher) : GenericMessageHandler(BOOTNOTIFICATION_ACTION, messages_converter), GenericMessageHandler(AUTHORIZE_ACTION, messages_converter), GenericMessageHandler(CLEAREDCHARGINGLIMIT_ACTION, messages_converter), @@ -71,8 +70,6 @@ ChargePointHandler20::ChargePointHandler20(const std::string& GenericMessageHandler(TRANSACTIONEVENT_ACTION, messages_converter), m_identifier(identifier), - m_stack_config(stack_config), - m_messages_converter(messages_converter), m_handler(nullptr) { msg_dispatcher.registerHandler(BOOTNOTIFICATION_ACTION, diff --git a/src/ocpp20/centralsystem/chargepoint/ChargePointHandler20.h b/src/ocpp20/centralsystem/chargepoint/ChargePointHandler20.h index 407220e8..8cbceb34 100644 --- a/src/ocpp20/centralsystem/chargepoint/ChargePointHandler20.h +++ b/src/ocpp20/centralsystem/chargepoint/ChargePointHandler20.h @@ -119,12 +119,10 @@ class ChargePointHandler20 * @param identifier Charge point's identifier * @param messages_converter Converter from/to OCPP to/from JSON messages * @param msg_dispatcher Message dispatcher - * @param stack_config Stack configuration */ ChargePointHandler20(const std::string& identifier, const ocpp::messages::ocpp20::MessagesConverter20& messages_converter, - ocpp::messages::MessageDispatcher& msg_dispatcher, - const ocpp::config::ICentralSystemConfig20& stack_config); + ocpp::messages::MessageDispatcher& msg_dispatcher); /** @brief Destructor */ virtual ~ChargePointHandler20(); @@ -352,10 +350,6 @@ class ChargePointHandler20 private: /** @brief Charge point's identifier */ const std::string m_identifier; - /** @brief Stack configuration */ - const ocpp::config::ICentralSystemConfig20& m_stack_config; - /** @brief Messages converters */ - const ocpp::messages::GenericMessagesConverter& m_messages_converter; /** @brief Request handler */ IChargePointRequestHandler20* m_handler; }; diff --git a/src/ocpp20/centralsystem/chargepoint/ChargePointProxy20.cpp b/src/ocpp20/centralsystem/chargepoint/ChargePointProxy20.cpp index 5db3859a..d092f669 100644 --- a/src/ocpp20/centralsystem/chargepoint/ChargePointProxy20.cpp +++ b/src/ocpp20/centralsystem/chargepoint/ChargePointProxy20.cpp @@ -44,7 +44,7 @@ ChargePointProxy20::ChargePointProxy20(ICentralSystem20& m_rpc(rpc), m_msg_dispatcher(messages_validator), m_msg_sender(*m_rpc, messages_converter, messages_validator, stack_config.callRequestTimeout()), - m_handler(m_identifier, messages_converter, m_msg_dispatcher, stack_config), + m_handler(m_identifier, messages_converter, m_msg_dispatcher), m_messages_validator(messages_validator), m_messages_converter(messages_converter) { diff --git a/tools/json2cpp/templates/centralsystem/ChargePointHandler.cpp.j2 b/tools/json2cpp/templates/centralsystem/ChargePointHandler.cpp.j2 index bd36932a..7b901db7 100644 --- a/tools/json2cpp/templates/centralsystem/ChargePointHandler.cpp.j2 +++ b/tools/json2cpp/templates/centralsystem/ChargePointHandler.cpp.j2 @@ -39,16 +39,13 @@ namespace {{ocpp_version_namespace}} /** @brief Constructor */ ChargePointHandler{{ocpp_version_suffix}}::ChargePointHandler{{ocpp_version_suffix}}(const std::string& identifier, const ocpp::messages::{{ocpp_version_namespace}}::MessagesConverter{{ocpp_version_suffix}}& messages_converter, - ocpp::messages::MessageDispatcher& msg_dispatcher, - const ocpp::config::ICentralSystemConfig{{ocpp_version_suffix}}& stack_config) + ocpp::messages::MessageDispatcher& msg_dispatcher) : {%- for msg_name in cs_msgs %} GenericMessageHandler<{{msg_name}}Req, {{msg_name}}Conf>({{msg_name.upper()}}_ACTION, messages_converter), {%- endfor %} m_identifier(identifier), - m_stack_config(stack_config), - m_messages_converter(messages_converter), m_handler(nullptr) { {%- for msg_name in cs_msgs %} diff --git a/tools/json2cpp/templates/centralsystem/ChargePointHandler.h.j2 b/tools/json2cpp/templates/centralsystem/ChargePointHandler.h.j2 index b31d5a2a..e458bfe9 100644 --- a/tools/json2cpp/templates/centralsystem/ChargePointHandler.h.j2 +++ b/tools/json2cpp/templates/centralsystem/ChargePointHandler.h.j2 @@ -63,12 +63,10 @@ class ChargePointHandler{{ocpp_version_suffix}} * @param identifier Charge point's identifier * @param messages_converter Converter from/to OCPP to/from JSON messages * @param msg_dispatcher Message dispatcher - * @param stack_config Stack configuration */ ChargePointHandler{{ocpp_version_suffix}}(const std::string& identifier, const ocpp::messages::{{ocpp_version_namespace}}::MessagesConverter{{ocpp_version_suffix}}& messages_converter, - ocpp::messages::MessageDispatcher& msg_dispatcher, - const ocpp::config::ICentralSystemConfig20& stack_config); + ocpp::messages::MessageDispatcher& msg_dispatcher); /** @brief Destructor */ virtual ~ChargePointHandler{{ocpp_version_suffix}}(); @@ -92,10 +90,6 @@ class ChargePointHandler{{ocpp_version_suffix}} private: /** @brief Charge point's identifier */ const std::string m_identifier; - /** @brief Stack configuration */ - const ocpp::config::ICentralSystemConfig{{ocpp_version_suffix}}& m_stack_config; - /** @brief Messages converters */ - const ocpp::messages::GenericMessagesConverter& m_messages_converter; /** @brief Request handler */ IChargePointRequestHandler{{ocpp_version_suffix}}* m_handler; }; diff --git a/tools/json2cpp/templates/centralsystem/ChargePointProxy.cpp.j2 b/tools/json2cpp/templates/centralsystem/ChargePointProxy.cpp.j2 index 0fcc9952..134beb29 100644 --- a/tools/json2cpp/templates/centralsystem/ChargePointProxy.cpp.j2 +++ b/tools/json2cpp/templates/centralsystem/ChargePointProxy.cpp.j2 @@ -44,7 +44,7 @@ ChargePointProxy{{ocpp_version_suffix}}::ChargePointProxy{{ocpp_version_suffix}} m_rpc(rpc), m_msg_dispatcher(messages_validator), m_msg_sender(*m_rpc, messages_converter, messages_validator, stack_config.callRequestTimeout()), - m_handler(m_identifier, messages_converter, m_msg_dispatcher, stack_config), + m_handler(m_identifier, messages_converter, m_msg_dispatcher), m_messages_validator(messages_validator), m_messages_converter(messages_converter) {