Skip to content

fix template id must be int not str #2566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LKuemmel merged 2 commits into from
Jul 16, 2025
Merged

fix template id must be int not str #2566

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
587f222
fix template id must be int not str
LKuemmel Jul 16, 2025
6b977e7
flake8
LKuemmel Jul 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions packages/helpermodules/update_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

class UpdateConfig:

DATASTORE_VERSION = 87
DATASTORE_VERSION = 88

valid_topic = [
"^openWB/bat/config/bat_control_permitted$",
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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)