diff options
| author | Clifford Roche <clifford.roche@gmail.com> | 2022-12-30 21:05:47 -0500 |
|---|---|---|
| committer | KevinOConnor <kevin@koconnor.net> | 2022-12-31 21:03:37 -0500 |
| commit | 40d8c2ef1653ed59dc1d9fe4cb4e26b2e98a8967 (patch) | |
| tree | 194d761c32a07e3bdd0e919c085fcbfc09ca5aed /klippy | |
| parent | 6ae6aaf71179ef1a57dde9c7d3b0b2efb3baf05d (diff) | |
| download | kutter-40d8c2ef1653ed59dc1d9fe4cb4e26b2e98a8967.tar.gz kutter-40d8c2ef1653ed59dc1d9fe4cb4e26b2e98a8967.tar.xz kutter-40d8c2ef1653ed59dc1d9fe4cb4e26b2e98a8967.zip | |
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>
Diffstat (limited to 'klippy')
| -rw-r--r-- | klippy/extras/palette2.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/klippy/extras/palette2.py b/klippy/extras/palette2.py index c3c43ea6..ec8631b0 100644 --- a/klippy/extras/palette2.py +++ b/klippy/extras/palette2.py @@ -221,9 +221,9 @@ class Palette2: def _wait_for_heartbeat(self): startTs = self.reactor.monotonic() currTs = startTs - while self.heartbeat is None and self.heartbeat < ( - currTs - SETUP_TIMEOUT) and startTs > ( - currTs - SETUP_TIMEOUT): + while self.heartbeat is None or (self.heartbeat < ( + currTs - SETUP_TIMEOUT) and startTs > ( + currTs - SETUP_TIMEOUT)): currTs = self.reactor.pause(currTs + 1.) if self.heartbeat < (currTs - SETUP_TIMEOUT): @@ -401,7 +401,7 @@ class Palette2: try: fw = params[0][1:] logging.info( - "Palette 2 firmware version %s detected" % os.fwalk) + "Palette 2 firmware version %s detected" % fw) except (TypeError, IndexError): logging.error("Unable to parse firmware version") @@ -583,7 +583,7 @@ class Palette2: self.write_queue.put(COMMAND_HEARTBEAT) eventtime = self.reactor.pause(eventtime + 5) if self.heartbeat and self.heartbeat < ( - eventtime - HEARTBEAT_TIMEOUT): + eventtime - HEARTBEAT_TIMEOUT): logging.error( "P2 has not responded to heartbeat") 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") self.signal_disconnect = True return self.reactor.NEVER + return eventtime + SERIAL_TIMER return eventtime + SERIAL_TIMER def _run_Smart_Load(self, eventtime): |