Skip to content

Fix heartbeat waiting logic in palette2.py #2

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
cfelicio wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix heartbeat waiting logic in palette2.py #2

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
23 changes: 13 additions & 10 deletions klippy/extras/palette2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,18 +218,21 @@ def cmd_OmegaDefault(self, gcmd):
if self._check_P2(gcmd):
self.write_queue.put(gcmd.get_commandline())

def _wait_for_heartbeat(self):
startTs = self.reactor.monotonic()
currTs = startTs
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):
def _wait_for_heartbeat(self):
startTs = self.reactor.monotonic()
currTs = startTs
while True:
currTs = self.reactor.pause(currTs + 1.0)
if (
self.heartbeat is not None
and self.heartbeat >= (currTs - SETUP_TIMEOUT)
):
break
if currTs - startTs > SETUP_TIMEOUT:
self.signal_disconnect = True
raise self.printer.command_error(
"No response from Palette 2")
"No response from Palette 2"
)

cmd_O1_help = (
"Initialize the print, and check connection with the Palette 2")
Expand Down