From 8493daeb56b89bdb0788992b74dae86779132425 Mon Sep 17 00:00:00 2001 From: uhi22 Date: Mon, 13 Feb 2023 21:34:13 +0100 Subject: [PATCH] feature: show pev status on display --- pyPlcWorker.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pyPlcWorker.py b/pyPlcWorker.py index 8f93110..bea47f3 100644 --- a/pyPlcWorker.py +++ b/pyPlcWorker.py @@ -28,8 +28,8 @@ class pyPlcWorker(): self.callbackShowStatus = callbackShowStatus self.oldAvlnStatus = 0 self.isSimulationMode = isSimulationMode - self.hp = pyPlcHomeplug.pyPlcHomeplug(self.workerAddToTrace, self.callbackShowStatus, self.mode, self.addressManager, self.callbackReadyForTcp, self.isSimulationMode) - self.hardwareInterface = hardwareInterface.hardwareInterface(self.workerAddToTrace, self.callbackShowStatus) + self.hp = pyPlcHomeplug.pyPlcHomeplug(self.workerAddToTrace, self.showStatus, self.mode, self.addressManager, self.callbackReadyForTcp, self.isSimulationMode) + self.hardwareInterface = hardwareInterface.hardwareInterface(self.workerAddToTrace, self.showStatus) self.hp.printToUdp("pyPlcWorker init") # Find out the version number, using git. # see https://stackoverflow.com/questions/14989858/get-the-current-git-hash-in-a-python-script @@ -39,9 +39,9 @@ class pyPlcWorker(): strLabel = "(unknown version. 'git describe --tags' failed.)" self.workerAddToTrace("[pyPlcWorker] Software version " + strLabel) if (self.mode == C_EVSE_MODE): - self.evse = fsmEvse.fsmEvse(self.addressManager, self.workerAddToTrace, self.hardwareInterface, self.callbackShowStatus) + self.evse = fsmEvse.fsmEvse(self.addressManager, self.workerAddToTrace, self.hardwareInterface, self.showStatus) if (self.mode == C_PEV_MODE): - self.pev = fsmPev.fsmPev(self.addressManager, self.workerAddToTrace, self.hardwareInterface, self.callbackShowStatus) + self.pev = fsmPev.fsmPev(self.addressManager, self.workerAddToTrace, self.hardwareInterface, self.showStatus) def __del__(self): if (self.mode == C_PEV_MODE): print("worker: deleting pev") @@ -55,7 +55,9 @@ class pyPlcWorker(): self.hp.printToUdp(s) # give the message to the udp for remote logging. def showStatus(self, s, selection = ""): - self.callbackShowStatus(s, selection) + self.callbackShowStatus(s, selection) + if (selection == "pevState"): + self.hardwareInterface.showOnDisplay(s, "", "") def callbackReadyForTcp(self, status): if (status==1):