From 09edc9d7dc50993090b701dec0123af907fb8118 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Wed, 20 Aug 2025 12:46:55 +0200 Subject: [PATCH 1/2] remove obsolet charge plan code in commands --- packages/helpermodules/command.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/packages/helpermodules/command.py b/packages/helpermodules/command.py index d75438229f..69751bd804 100644 --- a/packages/helpermodules/command.py +++ b/packages/helpermodules/command.py @@ -261,15 +261,7 @@ def setup_added_chargepoint(): Pub().pub(f'openWB/chargepoint/{new_id}/set/manual_lock', False) {Pub().pub(f"openWB/chargepoint/{new_id}/get/"+k, v) for (k, v) in asdict(chargepoint.Get()).items()} charge_template = SubData.ev_charge_template_data[f"ct{SubData.ev_data['ev0'].data.charge_template}"] - for time_plan in charge_template.data.time_charging.plans: - Pub().pub(f'openWB/chargepoint/{new_id}/set/charge_template/time_charging/plans', - dataclass_utils.asdict(time_plan)) - for scheduled_plan in charge_template.data.chargemode.scheduled_charging.plans: - Pub().pub(f'openWB/chargepoint/{new_id}/set/charge_template/chargemode/scheduled_charging/plans', - scheduled_plan) charge_template = dataclass_utils.asdict(charge_template.data) - charge_template["chargemode"]["scheduled_charging"]["plans"].clear() - charge_template["time_charging"]["plans"].clear() Pub().pub(f'openWB/chargepoint/{new_id}/set/charge_template', charge_template) self.max_id_hierarchy = self.max_id_hierarchy + 1 Pub().pub("openWB/set/command/max_id/hierarchy", self.max_id_hierarchy) From 33c84c7508c1cc3c5da70526097bc3d99d1018e3 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Thu, 21 Aug 2025 12:37:39 +0200 Subject: [PATCH 2/2] fix message method --- packages/helpermodules/command.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/helpermodules/command.py b/packages/helpermodules/command.py index 69751bd804..e53d50af23 100644 --- a/packages/helpermodules/command.py +++ b/packages/helpermodules/command.py @@ -344,7 +344,7 @@ def removeChargepoint(self, connection_id: str, payload: dict) -> None: """ löscht ein Ladepunkt. """ if self.max_id_hierarchy < payload["data"]["id"]: - log.error( + pub_user_message( payload, connection_id, f'Die ID \'{payload["data"]["id"]}\' ist größer als die maximal vergebene ' f'ID \'{self.max_id_hierarchy}\'.', MessageType.ERROR)