Skip to content

Ladepunkte&Verbraucher: Statusmeldungen verbessert #4043

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 3 commits into from
Oct 2, 2026
Merged

Ladepunkte&Verbraucher: Statusmeldungen verbessert #4043

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44f5c5e
Ladepunkte: Statusmeldungen verbessert
LKuemmel Oct 2, 2026
a7320c2
fix
LKuemmel Oct 2, 2026
27689d1
flake8
LKuemmel Oct 2, 2026
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
2 changes: 1 addition & 1 deletion packages/control/chargepoint/chargepoint_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ class Get:
serial_number: Optional[str] = None
soc: Optional[float] = None
soc_timestamp: Optional[int] = None
state_str: Optional[str] = None
state_str: Optional[str] = field(default=None, metadata={"topic": "get/state_str"})
vehicle_id: Optional[str] = None
version: Optional[str] = None
voltages: List[float] = field(default_factory=voltages_list_factory)
Expand Down
30 changes: 15 additions & 15 deletions packages/control/process.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from control.consumer.usage import ConsumerUsage
from helpermodules import timecheck
from helpermodules.phase_handling import voltages_mean
from helpermodules.pub import Pub

Check failure on line 16 in packages/control/process.py

View workflow job for this annotation

GitHub Actions / build 

'helpermodules.pub.Pub' imported but unused
from helpermodules.utils._thread_handler import joined_thread_handler
from modules.common.abstract_consumer import CurrentValues
from modules.common.abstract_io import AbstractIoDevice
Expand All @@ -34,6 +34,10 @@
def __init__(self) -> None:
pass

def _prepend_state_message(self, prefix: str, state_str: Optional[str]) -> str:
suffix = state_str or ""
return f"{prefix} {suffix}".strip()

def process_algorithm_results(self) -> None:
try:
modules_threads: List[Thread] = []
Expand All @@ -55,16 +59,11 @@
control_parameter.state = ChargepointState.NO_CHARGING_ALLOWED
cp.data.set.current = 0

if cp.data.get.state_str is not None:
Pub().pub("openWB/set/chargepoint/"+str(cp.num)+"/get/state_str",
cp.data.get.state_str)
else:
if cp.data.get.charge_state:
Pub().pub(
f"openWB/set/chargepoint/{cp.num}/get/state_str", "Fahrzeug lädt.")
else:
Pub().pub(
f"openWB/set/chargepoint/{cp.num}/get/state_str", "Ladevorgang wird gestartet... ")
if cp.data.get.charge_state:
cp.data.get.state_str = self._prepend_state_message("Fahrzeug lädt.", cp.data.get.state_str)
elif cp.data.set.current != 0:
cp.data.get.state_str = self._prepend_state_message(
"Strom freigegeben, warten auf Fahrzeug.", cp.data.get.state_str)
if cp.chargepoint_module.fault_state.fault_state != FaultStateLevel.NO_ERROR:
cp.chargepoint_module.fault_state.store_error()
modules_threads.append(self._start_charging(cp))
Expand All @@ -87,11 +86,12 @@
consumer.data.get.state_str = "Messwerte des Verbrauchers werden erfasst."
elif consumer.data.usage.type == ConsumerUsage.SELF_CONTROLLED:
consumer.data.get.state_str = "Messwerte werden an den Verbraucher übermittelt."
else:
if consumer.data.get.charge_state:
consumer.data.get.state_str = "Verbraucher läuft."
else:
consumer.data.get.state_str = "Verbraucher wird gestartet... "
if consumer.data.get.charge_state:
consumer.data.get.state_str = self._prepend_state_message(
"Verbraucher läuft.", consumer.data.get.state_str)
elif consumer.data.set.current != 0:
consumer.data.get.state_str = self._prepend_state_message(
"Strom freigegeben, warten auf Verbraucher.", consumer.data.get.state_str)

consumer_thread = self._start_consumer(consumer)
if consumer_thread is not None:
Expand Down
Loading