diff --git a/packages/control/ev/charge_template.py b/packages/control/ev/charge_template.py index ed0493350c..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_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_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 diff --git a/packages/control/optional.py b/packages/control/optional.py index dea75d3df8..cd161fffd9 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_charging_allowed(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: diff --git a/packages/helpermodules/update_config.py b/packages/helpermodules/update_config.py index 1ef2073582..d795d21c13 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$",