From 9403a1497ab4896c46b424ede0361d4f4b3986cb Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Fri, 3 Jan 2025 16:10:24 +0100 Subject: [PATCH] fix switch on and phase switch before charge start --- packages/control/chargepoint/chargepoint.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/control/chargepoint/chargepoint.py b/packages/control/chargepoint/chargepoint.py index 1aa94780d2..485d34e263 100644 --- a/packages/control/chargepoint/chargepoint.py +++ b/packages/control/chargepoint/chargepoint.py @@ -357,19 +357,19 @@ def _is_phase_switch_required(self) -> bool: 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 + if ((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 - 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 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