Skip to content

update valid topics #2190

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
benderl merged 6 commits into from
Mar 19, 2025
Merged

update valid topics #2190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d3bf0fb
update valid topics
LKuemmel Feb 4, 2025
f0c292c
fix error message at start
LKuemmel Feb 24, 2025
019f1e7
et: price is checked for lower or equal
LKuemmel Mar 14, 2025
2f901fd
Update optional.py
benderl Mar 18, 2025
b00e83f
Update charge_template.py
benderl Mar 18, 2025
1ff5d5d
Merge branch 'master' into fix
benderl Mar 18, 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
4 changes: 2 additions & 2 deletions packages/control/ev/charge_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions packages/control/optional.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
11 changes: 7 additions & 4 deletions packages/helpermodules/update_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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$",
Expand Down