Skip to content

Merge master into Beta #2260

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
Mar 14, 2025
Merged

Merge master into Beta #2260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67d3e3c
fix error handling internal chargepoint (#2255)
LKuemmel Mar 13, 2025
c12eae8
fix phase switch at pv start (#2256)
LKuemmel Mar 13, 2025
d868c74
Update version 2.1.7-Patch.1
LKuemmel Mar 14, 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
4 changes: 3 additions & 1 deletion packages/control/chargepoint/chargepoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,9 @@ def initiate_phase_switch(self):
if self._is_phase_switch_required():
# Wenn die Umschaltverzögerung aktiv ist, darf nicht umgeschaltet werden.
if (self.data.control_parameter.state != ChargepointState.PERFORMING_PHASE_SWITCH and
self.data.control_parameter.state != ChargepointState.WAIT_FOR_USING_PHASES):
(self.data.control_parameter.state != ChargepointState.WAIT_FOR_USING_PHASES or
(self.data.control_parameter.state == ChargepointState.WAIT_FOR_USING_PHASES and
self.data.get.charge_state is False))):
log.debug(
f"Lp {self.num}: Ladung aktiv halten "
f"{charging_ev.ev_template.data.keep_charge_active_duration}s")
Expand Down
2 changes: 1 addition & 1 deletion packages/modules/internal_chargepoint_handler/internal_chargepoint_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ def _loop():
time.sleep(1.1)
with SingleComponentUpdateContext(self.fault_state_info_cp0, update_always=False):
# Allgemeine Fehlermeldungen an LP 1
if self.cp0.mode == InternalChargepointMode.PRO_PLUS.value:
if self.cp0 is not None and self.cp0.mode == InternalChargepointMode.PRO_PLUS.value:
_loop()
elif self.cp0_client_handler is None and self.cp1_client_handler is None:
log.error("Kein ClientHandler vorhanden. Beende.")
Expand Down
2 changes: 1 addition & 1 deletion web/version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.7
2.1.7-Patch.1