Skip to content

Internal chargepoint handler: refactor loop contexts #4169

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

Open
LKuemmel wants to merge 1 commit into from
Open

Internal chargepoint handler: refactor loop contexts #4169

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 15 additions & 19 deletions packages/modules/internal_chargepoint_handler/internal_chargepoint_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/python
from contextlib import ExitStack
import copy
import logging
from threading import Event, Thread
Expand Down Expand Up @@ -160,27 +161,22 @@ def _loop():
heartbeat_cp1 = self.cp1.update(data["global_data"], data["cp1"].data, data["rfid_data"])
self.heartbeat = True if heartbeat_cp0 and heartbeat_cp1 else False
time.sleep(1.1)
# Allgemeine Fehlermeldungen an LP 1
with SingleComponentUpdateContext(self.fault_state_info_cp0, update_always=False):
# Allgemeine Fehlermeldungen an LP 1
if self.cp0 is not None and self.cp0.mode == InternalChargepointMode.PRO_PLUS:
clients = []
is_pro_plus = self.cp0 is not None and self.cp0.mode == InternalChargepointMode.PRO_PLUS
if not is_pro_plus:
for handler in (self.cp0_client_handler, self.cp1_client_handler):
if handler is not None and handler.client not in clients:
clients.append(handler.client)
if not clients:
log.error("Kein ClientHandler vorhanden. Beende.")
return

with ExitStack() as stack:
for client in clients:
stack.enter_context(client)
_loop()
elif self.cp0_client_handler is None and self.cp1_client_handler is None:
log.error("Kein ClientHandler vorhanden. Beende.")
elif self.cp0_client_handler is not None and self.cp1_client_handler is None:
with self.cp0_client_handler.client:
_loop()
elif self.cp0_client_handler is None and self.cp1_client_handler is not None:
with self.cp1_client_handler.client:
_loop()
elif self.cp0_client_handler.client == self.cp1_client_handler.client:
with self.cp0_client_handler.client:
_loop()
elif self.cp0_client_handler is not None and self.cp1_client_handler is not None:
with self.cp0_client_handler.client:
with self.cp1_client_handler.client:
_loop()
else:
log.error("Kein ClientHandler vorhanden. Beende.")


class HandlerChargepoint:
Expand Down
Loading