Feature/energymanagement extensions #1033

corneliusclaussen · 2025-01-31T07:19:24Z

Describe your changes

OCPP 2.1 bidi smart charging uses cases can be used to set setpoints for ampere, watt and watt/frequency table. It also requires to track which limit is actually limiting the charging power.
This PR adds support for both to the energy types and implements the changes in EnergyManager, EnergyNode and EvseManager.

Issue ticket number and link

Checklist before requesting a review

I have performed a self-review of my code
I have made corresponding changes to the documentation
I read the contribution documentation and made sure that my changes meet its requirements

- Extended energy types to align with requirements of OCPP2.1 - EnergyManager: Source tracking for all limits - EnergyManagerSetpoints for ampere, watt and frequency tables - Allow to set setpoints via external_limits interface Signed-off-by: Piet Gömpel <[email protected]> Signed-off-by: Cornelius Claussen <[email protected]>

Pietfried

In addition to the commands in line:

Please verify that the documentation for the EnergyManager module at doc/index.rst is still up-to-date . Looks like some examples are outdated and its probably useful add some words about the introduced setpoints.
There are some viable codacy remarks

Pietfried · 2025-01-31T11:05:46Z

types/energy.yaml

+        description: The total power in W
+        type: number
+  SetpointType:
+    description: Defines a setpoint


Suggested change

description: Defines a setpoint

description: Defines a setpoint, which is a target value for either charging or discharging depending on the sign. Setpoints per phase are currently not supported.

Pietfried · 2025-01-31T11:07:16Z

types/energy.yaml

+    type: object
+    additionalProperties: false
+    required:
+      - timestamp


Shouldnt the setpoint be required as well or does it mean that there is no setpoint for this point in time if omited? I would add this to the documentation then.

Pietfried · 2025-01-31T11:08:48Z

types/energy.yaml

@@ -232,13 +328,27 @@ types:
        items:
          description: One entry for the time series. Values are always positive.
          type: object
-          $ref: /energy#/ScheduleReqEntry
+          $ref: /energy#/ScheduleReqEntry  


Suggested change

$ref: /energy#/ScheduleReqEntry

$ref: /energy#/ScheduleReqEntry

Pietfried · 2025-01-31T11:11:20Z

modules/API/API.cpp


    if (is_watts) {
-        target_entry.limits_to_leaves.total_power_W = std::fabs(limit);
+        target_entry.limits_to_leaves.total_power_W = {std::fabs(limit), "API_module"};


can be defined as constexpr

Pietfried · 2025-01-31T11:32:32Z

modules/EnergyManager/Market.cpp

+
+            // Allow only one actual setpoint value to be set, in this priority order
+            if (sp.ac_current_A.has_value()) {
+                if (sp.ac_current_A.value() >= 0.) {


Not sure if its relevant here, but you may want to use a small epsilon value here (and at other places) to avoid floating point precision errors

Pietfried · 2025-02-12T13:48:11Z

modules/EnergyManager/Offer.cpp

-    if (b) {
-        if (a) {
-            if (a.value() > b.value()) {
+template <class T> static void apply_one_limit_if_smaller(std::optional<T>& a, const std::optional<T>& b) {


Suggested change

template <class T> static void apply_one_limit_if_smaller(std::optional<T>& a, const std::optional<T>& b) {

template <class T> void apply_one_limit_if_smaller(std::optional<T>& a, const std::optional<T>& b) {

templates have internal linkage by default

Pietfried · 2025-02-12T13:48:24Z

modules/EnergyManager/Offer.cpp

-    if (b) {
-        if (a) {
-            if (a.value() < b.value()) {
+template <class T> static void apply_one_limit_if_greater(std::optional<T>& a, const std::optional<T>& b) {


Suggested change

template <class T> static void apply_one_limit_if_greater(std::optional<T>& a, const std::optional<T>& b) {

template <class T> void apply_one_limit_if_greater(std::optional<T>& a, const std::optional<T>& b) {

same here

Pietfried · 2025-02-12T13:55:03Z

modules/EnergyNode/energy_grid/energyImpl.cpp

+    local_schedule.limits_to_root.ac_max_phase_count = {mod->config.phase_count, source_cfg};
+    local_schedule.limits_to_root.ac_max_current_A = {(float)mod->config.fuse_limit_A, source_cfg};
+    local_schedule.limits_to_leaves.ac_max_phase_count = {mod->config.phase_count, source_cfg};
+    local_schedule.limits_to_leaves.ac_max_current_A = {(float)mod->config.fuse_limit_A, source_cfg};


Suggested change

local_schedule.limits_to_root.ac_max_phase_count = {mod->config.phase_count, source_cfg};

local_schedule.limits_to_root.ac_max_current_A = {(float)mod->config.fuse_limit_A, source_cfg};

local_schedule.limits_to_leaves.ac_max_phase_count = {mod->config.phase_count, source_cfg};

local_schedule.limits_to_leaves.ac_max_current_A = {(float)mod->config.fuse_limit_A, source_cfg};

local_schedule.limits_to_root.ac_max_phase_count = {mod->config.phase_count, source_cfg};

local_schedule.limits_to_root.ac_max_current_A = {static_cast<float>(mod->config.fuse_limit_A), source_cfg};

local_schedule.limits_to_leaves.ac_max_phase_count = {mod->config.phase_count, source_cfg};

local_schedule.limits_to_leaves.ac_max_current_A = {static_cast<float>(mod->config.fuse_limit_A), source_cfg};

Pietfried · 2025-02-12T13:58:07Z

modules/EnergyNode/energy_grid/energyImpl.cpp

+        for (auto& e : energy_flow_request.schedule_import) {
+            if (!e.limits_to_root.ac_max_current_A.has_value() ||
+                e.limits_to_root.ac_max_current_A.value().value > mod->config.fuse_limit_A)
+                e.limits_to_root.ac_max_current_A = {(float)mod->config.fuse_limit_A, source_cfg};


Suggested change

e.limits_to_root.ac_max_current_A = {(float)mod->config.fuse_limit_A, source_cfg};

e.limits_to_root.ac_max_current_A = {static_cast<float>(mod->config.fuse_limit_A), source_cfg};

Pietfried · 2025-02-12T13:58:27Z

modules/EnergyNode/energy_grid/energyImpl.cpp

+        for (auto& e : energy_flow_request.schedule_export) {
+            if (!e.limits_to_root.ac_max_current_A.has_value() ||
+                e.limits_to_root.ac_max_current_A.value().value > mod->config.fuse_limit_A)
+                e.limits_to_root.ac_max_current_A = {(float)mod->config.fuse_limit_A, source_cfg};


Suggested change

e.limits_to_root.ac_max_current_A = {(float)mod->config.fuse_limit_A, source_cfg};

e.limits_to_root.ac_max_current_A = {static_cast<float>(mod->config.fuse_limit_A), source_cfg};

corneliusclaussen force-pushed the feature/energymanagement-extensions branch 5 times, most recently from 742536a to 58b9691 Compare January 31, 2025 08:13

corneliusclaussen marked this pull request as ready for review January 31, 2025 08:14

corneliusclaussen requested review from hikinggrass, Pietfried, maaikez and SebaLukas as code owners January 31, 2025 08:14

hikinggrass assigned andistorm, Pietfried and SebaLukas Feb 4, 2025

corneliusclaussen requested a review from andistorm as a code owner February 5, 2025 10:22

corneliusclaussen force-pushed the feature/energymanagement-extensions branch from 8b9093f to f9a6cfb Compare February 7, 2025 09:28

Pietfried added the post-release Tag that this PR should not go into the current merge window for the upcoming release label Feb 12, 2025

Pietfried requested changes Feb 12, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/energymanagement extensions #1033

Feature/energymanagement extensions #1033

corneliusclaussen commented Jan 31, 2025

Pietfried left a comment

Pietfried Jan 31, 2025

Pietfried Jan 31, 2025

Pietfried Jan 31, 2025

Pietfried Jan 31, 2025

Pietfried Jan 31, 2025

Pietfried Feb 12, 2025

Pietfried Feb 12, 2025

Pietfried Feb 12, 2025

Pietfried Feb 12, 2025

Pietfried Feb 12, 2025

	description: Defines a setpoint
	description: Defines a setpoint, which is a target value for either charging or discharging depending on the sign. Setpoints per phase are currently not supported.

	$ref: /energy#/ScheduleReqEntry
	$ref: /energy#/ScheduleReqEntry

	template <class T> static void apply_one_limit_if_smaller(std::optional<T>& a, const std::optional<T>& b) {
	template <class T> void apply_one_limit_if_smaller(std::optional<T>& a, const std::optional<T>& b) {

	e.limits_to_root.ac_max_current_A = {(float)mod->config.fuse_limit_A, source_cfg};
	e.limits_to_root.ac_max_current_A = {static_cast<float>(mod->config.fuse_limit_A), source_cfg};

Feature/energymanagement extensions #1033

Are you sure you want to change the base?

Feature/energymanagement extensions #1033

Conversation

corneliusclaussen commented Jan 31, 2025

Describe your changes

Issue ticket number and link

Checklist before requesting a review

Pietfried left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment