Skip to content
Merged
Changes from all commits
Commits
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
23 changes: 12 additions & 11 deletions packages/control/ev/ev.py
Original file line number Diff line number Diff line change
Expand Up @@ -434,17 +434,18 @@ def reset_phase_switch_delay(self, control_parameter: ControlParameter, max_phas

Die Phasenumschaltung kann nicht abgebrochen werden!
"""
control_parameter.timestamp_phase_switch_buffer_start = None
control_parameter.state = ChargepointState.CHARGING_ALLOWED
if control_parameter.state == ChargepointState.PHASE_SWITCH_DELAY and control_parameter.phases == 1:
# Wenn der Timer läuft, ist den Control-Parametern die alte Phasenzahl hinterlegt.
# bei der Umschaltung 3p1p wird keine Leistung reserviert
evu_counter = data.data.counter_all_data.get_evu_counter()
reserved = max(0, control_parameter.min_current * max_phases * 230 -
self.ev_template.data.max_current_single_phase * 230)
evu_counter.data.set.reserved_surplus -= reserved
log.debug(f"Zurücksetzen von {reserved}W reservierter Leistung für die Phasenumschaltung. "
f"reservierte Leistung: {evu_counter.data.set.reserved_surplus} W")
if control_parameter.state == ChargepointState.PHASE_SWITCH_DELAY:
control_parameter.timestamp_phase_switch_buffer_start = None
control_parameter.state = ChargepointState.CHARGING_ALLOWED
if control_parameter.phases == 1:
# Wenn der Timer läuft, ist den Control-Parametern die alte Phasenzahl hinterlegt.
# bei der Umschaltung 3p1p wird keine Leistung reserviert
evu_counter = data.data.counter_all_data.get_evu_counter()
reserved = max(0, control_parameter.min_current * max_phases * 230 -
self.ev_template.data.max_current_single_phase * 230)
evu_counter.data.set.reserved_surplus -= reserved
log.debug(f"Zurücksetzen von {reserved}W reservierter Leistung für die Phasenumschaltung. "
f"reservierte Leistung: {evu_counter.data.set.reserved_surplus} W")

def reset_phase_switch(self, control_parameter: ControlParameter):
if control_parameter.state == ChargepointState.PERFORMING_PHASE_SWITCH:
Expand Down
Loading