github-mirrors/pyPLC
1
0
Fork 0
mirror of https://github.com/uhi22/pyPLC.git synced 2024-11-20 01:13:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: use addToTrace instead of some prints

Browse source
This commit is contained in:
uhi22 2023-04-15 23:34:08 +02:00
parent 2cea8c678c
commit f927fbeee2
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pyPlcHomeplug.py
View file

@ -98,7 +98,7 @@ STATE_SDP = 16
class pyPlcHomeplug(): class pyPlcHomeplug():
def showIpAddresses(self, mybytearray): def showIpAddresses(self, mybytearray):
addr = lambda pkt, offset: '.'.join(str(pkt[i]) for i in range(offset, offset + 4)) addr = lambda pkt, offset: '.'.join(str(pkt[i]) for i in range(offset, offset + 4))
print('SRC %-16s\tDST %-16s' % (addr(mybytearray, self.sniffer.dloff + 12), addr(mybytearray, self.sniffer.dloff + 16))) self.addToTrace('SRC %-16s\tDST %-16s' % (addr(mybytearray, self.sniffer.dloff + 12), addr(mybytearray, self.sniffer.dloff + 16)))
def showMacAddresses(self, mybytearray): def showMacAddresses(self, mybytearray):
strDestMac = "" strDestMac = ""
@ -114,7 +114,7 @@ class pyPlcHomeplug():
if (lastThreeOfSource == 0x0064c3): if (lastThreeOfSource == 0x0064c3):
strSourceFriendlyName="Ioniq" strSourceFriendlyName="Ioniq"
print("From " + strSourceMac + strSourceFriendlyName + " to " + strDestMac) self.addToTrace("From " + strSourceMac + strSourceFriendlyName + " to " + strDestMac)
def getEtherType(self, messagebufferbytearray): def getEtherType(self, messagebufferbytearray):
etherType=0 etherType=0
@ -747,7 +747,7 @@ class pyPlcHomeplug():
return self.numberOfFoundModems>1 return self.numberOfFoundModems>1
def enterState(self, n): def enterState(self, n):
print("[PEVSLAC] from " + str(self.pevSequenceState) + " entering " + str(n)) self.addToTrace("[PEVSLAC] from " + str(self.pevSequenceState) + " entering " + str(n))
self.pevSequenceState = n self.pevSequenceState = n
self.pevSequenceCyclesInState = 0 self.pevSequenceCyclesInState = 0
@ -997,7 +997,7 @@ class pyPlcHomeplug():
if (len(self.addressManager.getSeccIp())>0): if (len(self.addressManager.getSeccIp())>0):
# we received an SDP response, and can start the high-level communication # we received an SDP response, and can start the high-level communication
self.showStatus("SDP finished", "pevState") self.showStatus("SDP finished", "pevState")
print("[PEVSLAC] Now we know the chargers IP.") self.addToTrace("[PEVSLAC] Now we know the chargers IP.")
self.isSDPDone = 1 self.isSDPDone = 1
self.callbackReadyForTcp(1) self.callbackReadyForTcp(1)
# Continue with checking the connection, for the case somebody pulls the plug. # Continue with checking the connection, for the case somebody pulls the plug.
@ -1017,7 +1017,7 @@ class pyPlcHomeplug():
self.enterState(STATE_SDP) # stick in the same state self.enterState(STATE_SDP) # stick in the same state
return return
# All repetitions are over, no SDP response was seen. Back to the beginning. # All repetitions are over, no SDP response was seen. Back to the beginning.
print("[PEVSLAC] ERROR: Did not receive SDP response. Starting from the beginning.") self.addToTrace("[PEVSLAC] ERROR: Did not receive SDP response. Starting from the beginning.")
self.enterState(STATE_INITIAL) self.enterState(STATE_INITIAL)
return return
# invalid state is reached. As robustness measure, go to initial state. # invalid state is reached. As robustness measure, go to initial state.
@ -1105,7 +1105,7 @@ class pyPlcHomeplug():
self.enterPevMode() self.enterPevMode()
self.pevMac = self.myMAC self.pevMac = self.myMAC
self.showStatus(prettyMac(self.pevMac), "pevmac") self.showStatus(prettyMac(self.pevMac), "pevmac")
print("sniffer created at " + self.strInterfaceName) print("sniffer created at " + self.strInterfaceName) # we use print, because addToLog does not yet work at this stage in the init.
def addToTrace(self, s): def addToTrace(self, s):
self.callbackAddToTrace(s) self.callbackAddToTrace(s)