From 587f222e58ccf012b423abd5a8a18205864dcfbd Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Wed, 16 Jul 2025 15:04:52 +0200 Subject: [PATCH 1/2] fix template id must be int not str --- packages/helpermodules/update_config.py | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/packages/helpermodules/update_config.py b/packages/helpermodules/update_config.py index 21f0082a69..1f06c05053 100644 --- a/packages/helpermodules/update_config.py +++ b/packages/helpermodules/update_config.py @@ -56,7 +56,7 @@ class UpdateConfig: - DATASTORE_VERSION = 87 + DATASTORE_VERSION = 88 valid_topic = [ "^openWB/bat/config/bat_control_permitted$", @@ -2133,16 +2133,7 @@ def upgrade(topic: str, payload) -> Optional[dict]: self._loop_all_received_topics(upgrade) self.__update_topic("openWB/system/datastore_version", 80) - def upgrade_datastore_80(self) -> None: - def upgrade(topic: str, payload) -> None: - if (re.search("openWB/vehicle/template/charge_template/[0-9]+", topic) is not None or - re.search("openWB/vehicle/template/ev_template/[0-9]+", topic) is not None): - payload = decode_payload(payload) - index = get_index(topic) - payload.update({"id": index}) - Pub().pub(topic, payload) - self._loop_all_received_topics(upgrade) - self.__update_topic("openWB/system/datastore_version", 81) + # moved and corrected to 87 def upgrade_datastore_81(self) -> None: def upgrade(topic: str, payload) -> None: @@ -2338,3 +2329,14 @@ def upgrade_datastore_86(self) -> None: "für die Speichersteuerung. Die Speichersteuerung war bisher bereits verfügbar, ist" " jedoch bis zum Akzeptieren standardmäßig deaktiviert.", MessageType.WARNING) self.__update_topic("openWB/system/datastore_version", 87) + + def upgrade_datastore_87(self) -> None: + def upgrade(topic: str, payload) -> None: + if (re.search("openWB/vehicle/template/charge_template/[0-9]+", topic) is not None or + re.search("openWB/vehicle/template/ev_template/[0-9]+", topic) is not None): + payload = decode_payload(payload) + index = int(get_index(topic)) + payload.update({"id": index}) + Pub().pub(topic, payload) + self._loop_all_received_topics(upgrade) + self.__update_topic("openWB/system/datastore_version", 88) \ No newline at end of file From 6b977e7de530fa2a5b9430acad14202802a06b7c Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Wed, 16 Jul 2025 15:17:13 +0200 Subject: [PATCH 2/2] flake8 --- 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 1f06c05053..98d616f78c 100644 --- a/packages/helpermodules/update_config.py +++ b/packages/helpermodules/update_config.py @@ -2339,4 +2339,4 @@ def upgrade(topic: str, payload) -> None: payload.update({"id": index}) Pub().pub(topic, payload) self._loop_all_received_topics(upgrade) - self.__update_topic("openWB/system/datastore_version", 88) \ No newline at end of file + self.__update_topic("openWB/system/datastore_version", 88)