Skip to content

improve eco charging message #2441

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 1 commit into from
Jun 10, 2025
Merged

improve eco charging message #2441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions packages/control/ev/charge_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from typing import Optional, Tuple

from control import data
from control.chargepoint.chargepoint_state import CHARGING_STATES
from control.chargepoint.charging_type import ChargingType
from control.chargepoint.control_parameter import ControlParameter
from control.ev.ev_template import EvTemplate
Expand Down Expand Up @@ -135,8 +136,7 @@ class ChargeTemplate:
"topic": ""})

BUFFER = -1200 # nach mehr als 20 Min Überschreitung wird der Termin als verpasst angesehen
CHARGING_PRICE_EXCEEDED = ("Keine Ladung, da der aktuelle Strompreis über dem maximalen Strompreis liegt. "
+ "Falls vorhanden wird mit EVU-Überschuss geladen.")
CHARGING_PRICE_EXCEEDED = ("Der aktuelle Strompreis liegt über dem maximalen Strompreis. ")
CHARGING_PRICE_LOW = "Laden, da der aktuelle Strompreis unter dem maximalen Strompreis liegt."

TIME_CHARGING_NO_PLAN_CONFIGURED = "Zeitladen aktiviert, aber keine Zeitfenster konfiguriert."
Expand Down Expand Up @@ -269,7 +269,7 @@ def pv_charging(self,

def eco_charging(self,
soc: Optional[float],
min_current: int,
control_parameter: ControlParameter,
charging_type: str,
used_amount: float) -> Tuple[int, str, Optional[str], int]:
""" prüft, ob Min-oder Max-Soc erreicht wurden und setzt entsprechend den Ladestrom.
Expand All @@ -295,10 +295,12 @@ def eco_charging(self,
sub_mode = "instant_charging"
message = self.CHARGING_PRICE_LOW
else:
current = min_current
current = control_parameter.min_current
message = self.CHARGING_PRICE_EXCEEDED
if control_parameter.state in CHARGING_STATES:
message += "Lädt mit Überschuss. "
else:
current = min_current
current = control_parameter.min_current
return current, sub_mode, message, phases
except Exception:
log.exception("Fehler im ev-Modul "+str(self.data.id))
Expand Down
2 changes: 1 addition & 1 deletion packages/control/ev/ev.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ def get_required_current(self,
self.data.get.soc, control_parameter.min_current, charging_type, imported_since_plugged)
elif charge_template.data.chargemode.selected == "eco_charging":
required_current, submode, tmp_message, phases = charge_template.eco_charging(
self.data.get.soc, control_parameter.min_current, charging_type, imported_since_plugged)
self.data.get.soc, control_parameter, charging_type, imported_since_plugged)
else:
tmp_message = None
message = f"{message or ''} {tmp_message or ''}".strip()
Expand Down