Skip to content

Commit 7b3b4c7

Browse files
authored
don't ignore new phases to use during phase switch (#2370)
1 parent f277ecb commit 7b3b4c7

2 files changed

Lines changed: 10 additions & 9 deletions

File tree

packages/control/chargepoint/chargepoint.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,8 @@ def initiate_phase_switch(self):
455455
log.debug(
456456
f"Lp {self.num}: Ladung aktiv halten "
457457
f"{charging_ev.ev_template.data.keep_charge_active_duration}s")
458-
phase_switch.thread_phase_switch(self)
458+
if phase_switch.thread_phase_switch(self) is False:
459+
return
459460
log.debug("start phase switch phases_to_use " +
460461
str(self.data.set.phases_to_use) +
461462
" control_parameter phases " +

packages/control/phase_switch.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ def thread_phase_switch(cp) -> None:
1616
Phasenumschaltung erfolgt in Threads, da diese länger als ein Zyklus dauert.
1717
"""
1818
try:
19-
if thread_handler(threading.Thread(
20-
target=_perform_phase_switch,
21-
args=(cp.chargepoint_module,
22-
cp.data.control_parameter.phases,
23-
cp.data.set.charging_ev_data,
24-
cp.data.get.charge_state),
25-
name=f"phase switch cp{cp.chargepoint_module.config.id}")):
26-
log.debug("Thread zur Phasenumschaltung an LP"+str(cp.num)+" gestartet.")
19+
log.debug("Starte Thread zur Phasenumschaltung an LP"+str(cp.num))
20+
return thread_handler(threading.Thread(
21+
target=_perform_phase_switch,
22+
args=(cp.chargepoint_module,
23+
cp.data.control_parameter.phases,
24+
cp.data.set.charging_ev_data,
25+
cp.data.get.charge_state),
26+
name=f"phase switch cp{cp.chargepoint_module.config.id}"))
2727
except Exception:
2828
log.exception("Fehler im Phasenumschaltungs-Modul")
2929

0 commit comments

Comments
 (0)