From d3bf0fb6d7d192cb829526dad78a832deb08e6b2 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Tue, 4 Feb 2025 07:51:29 +0100 Subject: [PATCH 1/5] update valid topics --- packages/helpermodules/update_config.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/helpermodules/update_config.py b/packages/helpermodules/update_config.py index 59f5387e4e..99cdb6d27f 100644 --- a/packages/helpermodules/update_config.py +++ b/packages/helpermodules/update_config.py @@ -85,19 +85,22 @@ class UpdateConfig: "^openWB/chargepoint/template/[0-9]+$", "^openWB/chargepoint/template/[0-9]+/autolock/[0-9]+$", "^openWB/chargepoint/[0-9]+/config$", - "^openWB/chargepoint/[0-9]+/control_parameter/submode$", "^openWB/chargepoint/[0-9]+/control_parameter/chargemode$", "^openWB/chargepoint/[0-9]+/control_parameter/current_plan$", + "^openWB/chargepoint/[0-9]+/control_parameter/failed_phase_switches$", "^openWB/chargepoint/[0-9]+/control_parameter/imported_at_plan_start$", "^openWB/chargepoint/[0-9]+/control_parameter/imported_instant_charging$", "^openWB/chargepoint/[0-9]+/control_parameter/limit$", + "^openWB/chargepoint/[0-9]+/control_parameter/min_current$", + "^openWB/chargepoint/[0-9]+/control_parameter/phases$", "^openWB/chargepoint/[0-9]+/control_parameter/prio$", "^openWB/chargepoint/[0-9]+/control_parameter/required_current$", + "^openWB/chargepoint/[0-9]+/control_parameter/required_currents$", + "^openWB/chargepoint/[0-9]+/control_parameter/state$", + "^openWB/chargepoint/[0-9]+/control_parameter/submode$", + "^openWB/chargepoint/[0-9]+/control_parameter/timestamp_charge_start$", "^openWB/chargepoint/[0-9]+/control_parameter/timestamp_last_phase_switch$", "^openWB/chargepoint/[0-9]+/control_parameter/timestamp_switch_on_off$", - "^openWB/chargepoint/[0-9]+/control_parameter/used_amount_instant_charging$", - "^openWB/chargepoint/[0-9]+/control_parameter/phases$", - "^openWB/chargepoint/[0-9]+/control_parameter/state$", "^openWB/chargepoint/[0-9]+/get/charge_state$", "^openWB/chargepoint/[0-9]+/get/currents$", "^openWB/chargepoint/[0-9]+/get/evse_current$", From f0c292c6c0ddd02affd5125aa593a4234ec2a955 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Mon, 24 Feb 2025 12:32:55 +0100 Subject: [PATCH 2/5] fix error message at start --- .../internal_chargepoint_handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/modules/internal_chargepoint_handler/internal_chargepoint_handler.py b/packages/modules/internal_chargepoint_handler/internal_chargepoint_handler.py index 983f30bb63..4324c56124 100644 --- a/packages/modules/internal_chargepoint_handler/internal_chargepoint_handler.py +++ b/packages/modules/internal_chargepoint_handler/internal_chargepoint_handler.py @@ -212,7 +212,7 @@ def _loop(): time.sleep(1.1) with SingleComponentUpdateContext(self.fault_state_info_cp0, update_always=False): # Allgemeine Fehlermeldungen an LP 1 - if self.cp0.mode == InternalChargepointMode.PRO_PLUS.value: + if self.cp0 and self.cp0.mode == InternalChargepointMode.PRO_PLUS.value: _loop() elif self.cp0_client_handler is None and self.cp1_client_handler is None: log.error("Kein ClientHandler vorhanden. Beende.") From 019f1e7070039c4bb74a30dbf92389222fd91e77 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Fri, 14 Mar 2025 08:54:11 +0100 Subject: [PATCH 3/5] et: price is checked for lower or equal --- packages/control/ev/charge_template.py | 4 ++-- packages/control/optional.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/control/ev/charge_template.py b/packages/control/ev/charge_template.py index ed0493350c..8d9f678144 100644 --- a/packages/control/ev/charge_template.py +++ b/packages/control/ev/charge_template.py @@ -149,7 +149,7 @@ def time_charging(self, if plan is not None: current = plan.current if charging_type == ChargingType.AC.value else plan.dc_current if self.data.et.active and data.data.optional_data.et_provider_available(): - if not data.data.optional_data.et_price_lower_than_limit(self.data.et.max_price): + if not data.data.optional_data.et_price_lower_or_equal_than_limit(self.data.et.max_price): return 0, "stop", self.CHARGING_PRICE_EXCEEDED, plan.id if plan.limit.selected == "none": # kein Limit konfiguriert, mit konfigurierter Stromstärke laden return current, "time_charging", message, plan.id @@ -195,7 +195,7 @@ def instant_charging(self, else: current = instant_charging.dc_current if self.data.et.active and data.data.optional_data.et_provider_available(): - if not data.data.optional_data.et_price_lower_than_limit(self.data.et.max_price): + if not data.data.optional_data.et_price_lower_or_equal_than_limit(self.data.et.max_price): return 0, "stop", self.CHARGING_PRICE_EXCEEDED if instant_charging.limit.selected == "none": return current, "instant_charging", message diff --git a/packages/control/optional.py b/packages/control/optional.py index dea75d3df8..e348738aa4 100644 --- a/packages/control/optional.py +++ b/packages/control/optional.py @@ -41,12 +41,12 @@ def monitoring_stop(self): def et_provider_available(self) -> bool: return self.et_module is not None and self.data.et.get.fault_state != 2 - def et_price_lower_than_limit(self, max_price: float): - """ prüft, ob der aktuelle Strompreis unter der festgelegten Preisgrenze liegt. + def et_price_lower_or_equal_than_limit(self, max_price: float): + """ prüft, ob der aktuelle Strompreis niedriger oder gleich der festgelegten Preisgrenze ist. Return ------ - True: Preis liegt darunter + True: Preis ist gleich oder liegt darunter False: Preis liegt darüber """ try: From 2f901fde2328f25cad6302de1946d5fbfb03bd21 Mon Sep 17 00:00:00 2001 From: benderl Date: Tue, 18 Mar 2025 07:57:59 +0100 Subject: [PATCH 4/5] Update optional.py rename method --- packages/control/optional.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/control/optional.py b/packages/control/optional.py index e348738aa4..cd161fffd9 100644 --- a/packages/control/optional.py +++ b/packages/control/optional.py @@ -41,7 +41,7 @@ def monitoring_stop(self): def et_provider_available(self) -> bool: return self.et_module is not None and self.data.et.get.fault_state != 2 - def et_price_lower_or_equal_than_limit(self, max_price: float): + def et_charging_allowed(self, max_price: float): """ prüft, ob der aktuelle Strompreis niedriger oder gleich der festgelegten Preisgrenze ist. Return From b00e83fedba38b2c6fc791ba0ab55f2a7f2737ec Mon Sep 17 00:00:00 2001 From: benderl Date: Tue, 18 Mar 2025 07:59:02 +0100 Subject: [PATCH 5/5] Update charge_template.py rename method --- packages/control/ev/charge_template.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/control/ev/charge_template.py b/packages/control/ev/charge_template.py index 8d9f678144..94fd5b5ca0 100644 --- a/packages/control/ev/charge_template.py +++ b/packages/control/ev/charge_template.py @@ -149,7 +149,7 @@ def time_charging(self, if plan is not None: current = plan.current if charging_type == ChargingType.AC.value else plan.dc_current if self.data.et.active and data.data.optional_data.et_provider_available(): - if not data.data.optional_data.et_price_lower_or_equal_than_limit(self.data.et.max_price): + if not data.data.optional_data.et_charging_allowed(self.data.et.max_price): return 0, "stop", self.CHARGING_PRICE_EXCEEDED, plan.id if plan.limit.selected == "none": # kein Limit konfiguriert, mit konfigurierter Stromstärke laden return current, "time_charging", message, plan.id @@ -195,7 +195,7 @@ def instant_charging(self, else: current = instant_charging.dc_current if self.data.et.active and data.data.optional_data.et_provider_available(): - if not data.data.optional_data.et_price_lower_or_equal_than_limit(self.data.et.max_price): + if not data.data.optional_data.et_charging_allowed(self.data.et.max_price): return 0, "stop", self.CHARGING_PRICE_EXCEEDED if instant_charging.limit.selected == "none": return current, "instant_charging", message