Skip to content

fix phase switch required in state wait for using phases #2577

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 2 commits into from
Jul 18, 2025
Merged

fix phase switch required in state wait for using phases #2577

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23776be
fix phase switch required in state wait for using phases
LKuemmel Jul 18, 2025
bcaba51
fix
LKuemmel Jul 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
24 changes: 13 additions & 11 deletions packages/control/chargepoint/chargepoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,28 +337,30 @@ def check_deviating_contactor_states(self, phase_a: int, phase_b: int) -> bool:

def _is_phase_switch_required(self) -> bool:
phase_switch_required = False
if self.data.control_parameter.state == ChargepointState.WAIT_FOR_USING_PHASES:
phase_switch_required = False
# Manche EVs brauchen nach der Umschaltung mehrere Zyklen, bis sie mit den drei Phasen laden. Dann darf
# nicht zwischendurch eine neue Umschaltung getriggert werden.
if ((((self.data.control_parameter.state == ChargepointState.PHASE_SWITCH_AWAITED or
elif ((((self.data.control_parameter.state == ChargepointState.PHASE_SWITCH_AWAITED or
self.data.control_parameter.state == ChargepointState.SWITCH_OFF_DELAY) and
# Nach Ablauf der Laden aktiv halten Zeit, sollte mit der vorgegebenen Phasenzahl geladen werden.
self.check_deviating_contactor_states(self.data.set.phases_to_use, self.data.get.phases_in_use)) or
self.check_deviating_contactor_states(self.data.set.phases_to_use, self.data.get.phases_in_use)) or
# Vorgegebene Phasenzahl hat sich geändert und es wird geladen
(self.check_deviating_contactor_states(self.data.set.phases_to_use,
self.data.control_parameter.phases) and
(self.check_deviating_contactor_states(self.data.set.phases_to_use,
self.data.control_parameter.phases) and
self.data.control_parameter.state in CHARGING_STATES)) and
# Wenn ein Soll-Strom vorgegeben ist, muss das Auto auch laden, damit umgeschaltet wird, sonst
# wird zB bei automatischer Umschaltung ständig versucht auf 1 Phase zurück zu schalten, wenn
# das Auto bei 3 Phasen voll ist.
((self.data.set.current != 0 and self.data.get.charge_state) or
(self.data.set.current != 0 and self.data.set.current_prev == 0) or
self.data.set.current == 0)):
((self.data.set.current != 0 and self.data.get.charge_state) or
(self.data.set.current != 0 and self.data.set.current_prev == 0) or
self.data.set.current == 0)):
phase_switch_required = True
if (self.data.control_parameter.state == ChargepointState.NO_CHARGING_ALLOWED and
(self.check_deviating_contactor_states(self.data.set.phases_to_use, self.data.get.phases_in_use) or
elif (self.data.control_parameter.state == ChargepointState.NO_CHARGING_ALLOWED and
(self.check_deviating_contactor_states(self.data.set.phases_to_use, self.data.get.phases_in_use) or
# Vorgegebene Phasenzahl hat sich geändert
self.check_deviating_contactor_states(self.data.set.phases_to_use,
self.data.control_parameter.phases)) and
self.check_deviating_contactor_states(self.data.set.phases_to_use,
self.data.control_parameter.phases)) and
# Wenn der Ladevorgang gestartet wird, muss vor dem ersten Laden umgeschaltet werden.
self.data.set.current != 0):
phase_switch_required = True
Expand Down