From 3d2da28027f45a7b35f570a92a71d85a575eafb0 Mon Sep 17 00:00:00 2001 From: Lutz Bender Date: Tue, 24 Feb 2026 08:51:45 +0100 Subject: [PATCH 1/3] fixes --- packages/control/bat_all.py | 4 ++-- packages/helpermodules/setdata.py | 2 +- packages/helpermodules/update_config.py | 17 ++++++++++++++--- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/packages/control/bat_all.py b/packages/control/bat_all.py index fa32363088..fcc060908a 100644 --- a/packages/control/bat_all.py +++ b/packages/control/bat_all.py @@ -209,7 +209,7 @@ def _limit_bat_power_discharge(self, required_power): def _set_bat_power_active_control(self, power): controllable_bat_components = get_controllable_bat_components() - # maximal mögliche Lade- und Entaldeleistung des Systems unter Einbeziehung + # maximal mögliche Lade- und Entladeleistung des Systems unter Einbeziehung # der erlaubten Lade-/ Entladeleistung und SoC der regelbaren Speicher ermitteln max_charge_power_total = 0 bat_ready_to_charge = 0 @@ -233,7 +233,7 @@ def _set_bat_power_active_control(self, power): # Leistung an einzelne Speicher übergeben for bat_component in controllable_bat_components: bat_component_data = data.data.bat_data[f"bat{bat_component.component_config.id}"].data - # Falls keine leistung übergeben wird greift die Eigenregelung der Speicher + # Falls keine Leistung übergeben wird greift die Eigenregelung der Speicher if power is None: power_limit = None bat_component_data.get.state_str = "Keine Steuerung" diff --git a/packages/helpermodules/setdata.py b/packages/helpermodules/setdata.py index a7db8af858..506fbf3435 100644 --- a/packages/helpermodules/setdata.py +++ b/packages/helpermodules/setdata.py @@ -661,7 +661,7 @@ def process_bat_topic(self, msg: mqtt.MQTTMessage): try: if ("openWB/set/bat/config/bat_control_permitted" in msg.topic or "openWB/set/bat/config/bat_control_activated" in msg.topic or - "openWB/set/bat/config/price_limit_actived" in msg.topic or + "openWB/set/bat/config/price_limit_activated" in msg.topic or "openWB/set/bat/config/price_charge_activated" in msg.topic or "openWB/set/bat/config/configured" in msg.topic or "openWB/set/bat/get/power_limit_controllable" in msg.topic or diff --git a/packages/helpermodules/update_config.py b/packages/helpermodules/update_config.py index 48623114fa..53df7014dc 100644 --- a/packages/helpermodules/update_config.py +++ b/packages/helpermodules/update_config.py @@ -533,9 +533,6 @@ class UpdateConfig: ("openWB/bat/config/price_limit$", 0.3), ("openWB/bat/config/price_charge_activated", False), ("openWB/bat/config/charge_limit$", 0.3), - ("openWB/bat/[0-9]+/get/max_charge_power", 0), - ("openWB/bat/[0-9]+/get/max_discharge_power", 0), - # ("openWB/bat/[0-9]+/get/state_str", "Eigenregelung"), ("openWB/bat/config/configured", False), ("openWB/bat/get/fault_state", 0), ("openWB/bat/get/fault_str", NO_ERROR), @@ -2735,3 +2732,17 @@ def upgrade(topic: str, payload) -> None: return {topic: log_data} self._loop_all_received_topics(upgrade) self._append_datastore_version(108) + + def upgrade_datastore_109(self) -> None: + def upgrade(topic: str, payload) -> None: + if re.search("openWB/bat/[0-9]+/power", topic) is not None: + index = get_index(topic) + # add new topics for battery control: + # openWB/bat/[0-9]+/get/max_charge_power => 0 + # openWB/bat/[0-9]+/get/max_discharge_power => 0 + if f"openWB/bat/{index}/get/max_charge_power" not in self.all_received_topics: + self.__update_topic(f"openWB/bat/{index}/get/max_charge_power", 0) + if f"openWB/bat/{index}/get/max_discharge_power" not in self.all_received_topics: + self.__update_topic(f"openWB/bat/{index}/get/max_discharge_power", 0) + self._loop_all_received_topics(upgrade) + self._append_datastore_version(109) From 6d5d2d0153c7e16f3a7053884994f707f61dbbcb Mon Sep 17 00:00:00 2001 From: benderl Date: Tue, 24 Feb 2026 09:12:16 +0100 Subject: [PATCH 2/3] Update packages/helpermodules/update_config.py Co-authored-by: LKuemmel <76958050+LKuemmel@users.noreply.github.com> --- packages/helpermodules/update_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/helpermodules/update_config.py b/packages/helpermodules/update_config.py index 53df7014dc..1dd6299587 100644 --- a/packages/helpermodules/update_config.py +++ b/packages/helpermodules/update_config.py @@ -2735,7 +2735,7 @@ def upgrade(topic: str, payload) -> None: def upgrade_datastore_109(self) -> None: def upgrade(topic: str, payload) -> None: - if re.search("openWB/bat/[0-9]+/power", topic) is not None: + if re.search("openWB/bat/[0-9]+/get/power", topic) is not None: index = get_index(topic) # add new topics for battery control: # openWB/bat/[0-9]+/get/max_charge_power => 0 From d21610186e13ae05bae7231e4df1aed4c6241f89 Mon Sep 17 00:00:00 2001 From: Lutz Bender Date: Tue, 24 Feb 2026 09:13:57 +0100 Subject: [PATCH 3/3] increment datastore version --- packages/helpermodules/update_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/helpermodules/update_config.py b/packages/helpermodules/update_config.py index 1dd6299587..6b76894095 100644 --- a/packages/helpermodules/update_config.py +++ b/packages/helpermodules/update_config.py @@ -57,7 +57,7 @@ class UpdateConfig: - DATASTORE_VERSION = 108 + DATASTORE_VERSION = 109 valid_topic = [ "^openWB/bat/config/bat_control_permitted$",