power_manager: Enable PM if automated blocking is used

Allows using external signals to block charging even if PV excess charging and dynamic load management are disabled.
Tinkerforge · Jan 17, 2025 · 19f3e8d · 19f3e8d
1 parent a94ea21
commit 19f3e8d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/software/src/modules/power_manager/module.ini b/software/src/modules/power_manager/module.ini
@@ -10,6 +10,7 @@ Optional = Automation
            EM V1
            Meters
 
-After    = Charge Manager
+After    = Automation
+           Charge Manager
            EM V1
            Meters
diff --git a/software/src/modules/power_manager/power_manager.cpp b/software/src/modules/power_manager/power_manager.cpp
@@ -321,9 +321,14 @@ void PowerManager::setup()
     api.restorePersistentConfig("power_manager/config", &config);
     api.restorePersistentConfig("power_manager/dynamic_load_config", &dynamic_load_config);
 
+    bool automation_has_action = false;
+#if MODULE_AUTOMATION_AVAILABLE()
+    automation_has_action = automation.has_task_with_action(AutomationActionID::PMBlockCharge);
+#endif
+
     // Force-enable PM if either PV excess charging or dynamic load management are enabled.
     // Force-disable otherwise.
-    if (config.get("excess_charging_enable")->asBool() || dynamic_load_config.get("enabled")->asBool()) {
+    if (config.get("excess_charging_enable")->asBool() || dynamic_load_config.get("enabled")->asBool() || automation_has_action) {
         config.get("enabled")->updateBool(true);
     } else {
         config.get("enabled")->updateBool(false);