From dd604ed904b01a76e07f886b1e7b16d3f3339a92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piet=20G=C3=B6mpel?= Date: Thu, 24 Oct 2024 11:27:47 +0200 Subject: [PATCH 1/3] Fixed bug which interchanged number phases and stack level when converting from OCPP to everest ChargingSchedulePeriod type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Piet Gömpel --- modules/OCPP/conversions.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/OCPP/conversions.cpp b/modules/OCPP/conversions.cpp index afbe96af3..32b73993a 100644 --- a/modules/OCPP/conversions.cpp +++ b/modules/OCPP/conversions.cpp @@ -389,13 +389,12 @@ to_everest_authorization_status(const ocpp::v201::AuthorizationStatusEnum status types::ocpp::ChargingSchedulePeriod to_charging_schedule_period(const ocpp::v16::EnhancedChargingSchedulePeriod& period) { - types::ocpp::ChargingSchedulePeriod csp = { - period.startPeriod, - period.limit, - period.stackLevel, - period.numberPhases, - }; - return csp; + types::ocpp::ChargingSchedulePeriod _period; + _period.start_period = period.startPeriod; + _period.limit = period.limit; + _period.number_phases = period.numberPhases; + _period.phase_to_use = period.phaseToUse; + return _period; } types::ocpp::ChargingSchedule to_charging_schedule(const ocpp::v16::EnhancedChargingSchedule& schedule) { From 856bc35035880ab00ce79e052d3b87d117756011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piet=20G=C3=B6mpel?= Date: Thu, 24 Oct 2024 11:48:15 +0200 Subject: [PATCH 2/3] Correctely using stack level instead of phaseToUse MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Piet Gömpel --- modules/OCPP/conversions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/OCPP/conversions.cpp b/modules/OCPP/conversions.cpp index 32b73993a..6a43eff58 100644 --- a/modules/OCPP/conversions.cpp +++ b/modules/OCPP/conversions.cpp @@ -393,7 +393,7 @@ to_charging_schedule_period(const ocpp::v16::EnhancedChargingSchedulePeriod& per _period.start_period = period.startPeriod; _period.limit = period.limit; _period.number_phases = period.numberPhases; - _period.phase_to_use = period.phaseToUse; + _period.stack_level = period.stackLevel; return _period; } From f773937511790e3ebad03e70a2c65f658b4d502b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piet=20G=C3=B6mpel?= <37657534+Pietfried@users.noreply.github.com> Date: Thu, 24 Oct 2024 13:33:30 +0200 Subject: [PATCH 3/3] Update modules/OCPP/conversions.cpp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Piet Gömpel <37657534+Pietfried@users.noreply.github.com> --- modules/OCPP/conversions.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/OCPP/conversions.cpp b/modules/OCPP/conversions.cpp index 6a43eff58..7fb62a649 100644 --- a/modules/OCPP/conversions.cpp +++ b/modules/OCPP/conversions.cpp @@ -389,12 +389,12 @@ to_everest_authorization_status(const ocpp::v201::AuthorizationStatusEnum status types::ocpp::ChargingSchedulePeriod to_charging_schedule_period(const ocpp::v16::EnhancedChargingSchedulePeriod& period) { - types::ocpp::ChargingSchedulePeriod _period; - _period.start_period = period.startPeriod; - _period.limit = period.limit; - _period.number_phases = period.numberPhases; - _period.stack_level = period.stackLevel; - return _period; + types::ocpp::ChargingSchedulePeriod csp; + csp.start_period = period.startPeriod; + csp.limit = period.limit; + csp.number_phases = period.numberPhases; + csp.stack_level = period.stackLevel; + return csp; } types::ocpp::ChargingSchedule to_charging_schedule(const ocpp::v16::EnhancedChargingSchedule& schedule) {