3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

palette2: Fix errors with bad handling of NoneType in a few locations 

Issue specific to Python 3, NoneType is being used to compare heartbeat time (actually caused by invalid condition operator), and by returning NoneType in timer functions.

Signed-off-by: Clifford Roche <clifford.roche@gmail.com>
This commit is contained in:
Clifford Roche 2022-12-30 21:05:47 -05:00 committed by KevinOConnor
parent 6ae6aaf711
commit 40d8c2ef16
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
klippy/extras/palette2.py
View File

@ -221,9 +221,9 @@ class Palette2:
def _wait_for_heartbeat(self): def _wait_for_heartbeat(self):
startTs = self.reactor.monotonic() startTs = self.reactor.monotonic()
currTs = startTs currTs = startTs
while self.heartbeat is None and self.heartbeat < ( while self.heartbeat is None or (self.heartbeat < (
currTs - SETUP_TIMEOUT) and startTs > ( currTs - SETUP_TIMEOUT) and startTs > (
currTs - SETUP_TIMEOUT): currTs - SETUP_TIMEOUT)):
currTs = self.reactor.pause(currTs + 1.) currTs = self.reactor.pause(currTs + 1.)
if self.heartbeat < (currTs - SETUP_TIMEOUT): if self.heartbeat < (currTs - SETUP_TIMEOUT):
@ -401,7 +401,7 @@ class Palette2:
try: try:
fw = params[0][1:] fw = params[0][1:]
logging.info( logging.info(
"Palette 2 firmware version %s detected" % os.fwalk) "Palette 2 firmware version %s detected" % fw)
except (TypeError, IndexError): except (TypeError, IndexError):
logging.error("Unable to parse firmware version") logging.error("Unable to parse firmware version")
@ -583,7 +583,7 @@ class Palette2:
self.write_queue.put(COMMAND_HEARTBEAT) self.write_queue.put(COMMAND_HEARTBEAT)
eventtime = self.reactor.pause(eventtime + 5) eventtime = self.reactor.pause(eventtime + 5)
if self.heartbeat and self.heartbeat < ( if self.heartbeat and self.heartbeat < (
eventtime - HEARTBEAT_TIMEOUT): eventtime - HEARTBEAT_TIMEOUT):
logging.error( logging.error(
"P2 has not responded to heartbeat") "P2 has not responded to heartbeat")
if not self.is_printing or self.is_setup_complete: if not self.is_printing or self.is_setup_complete:
@ -612,6 +612,7 @@ class Palette2:
logging.error("Unable to communicate with the Palette 2") logging.error("Unable to communicate with the Palette 2")
self.signal_disconnect = True self.signal_disconnect = True
return self.reactor.NEVER return self.reactor.NEVER
return eventtime + SERIAL_TIMER
return eventtime + SERIAL_TIMER return eventtime + SERIAL_TIMER
def _run_Smart_Load(self, eventtime): def _run_Smart_Load(self, eventtime):