diff options
| author | Arksine <arksine.code@gmail.com> | 2019-02-24 12:28:30 -0500 |
|---|---|---|
| committer | KevinOConnor <kevin@koconnor.net> | 2019-03-01 00:45:51 -0500 |
| commit | 3cd1f9676d5ef6b25711a21ef89a37c7deb152d8 (patch) | |
| tree | b08c5716d66519e4b5103afde86698740cf8e415 /klippy/extras | |
| parent | c8d7e28a35bc3d3699fa5b77327ad194fd3c3105 (diff) | |
| download | kutter-3cd1f9676d5ef6b25711a21ef89a37c7deb152d8.tar.gz kutter-3cd1f9676d5ef6b25711a21ef89a37c7deb152d8.tar.xz kutter-3cd1f9676d5ef6b25711a21ef89a37c7deb152d8.zip | |
pause_resume: Implement send_pause_command()
This allows for pausing from inside a reactor callback.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
Diffstat (limited to 'klippy/extras')
| -rw-r--r-- | klippy/extras/pause_resume.py | 21 | ||||
| -rw-r--r-- | klippy/extras/virtual_sdcard.py | 6 |
2 files changed, 18 insertions, 9 deletions
diff --git a/klippy/extras/pause_resume.py b/klippy/extras/pause_resume.py index 79795ab9..b8164b04 100644 --- a/klippy/extras/pause_resume.py +++ b/klippy/extras/pause_resume.py @@ -13,6 +13,7 @@ class PauseResume: self.captured_speed = 0. self.captured_epos = None self.toolhead = self.v_sd = None + self.pause_command_sent = False self.sd_paused = False self.printer.register_event_handler("klippy:ready", self.handle_ready) self.gcode.register_command("PAUSE", self.cmd_PAUSE) @@ -25,17 +26,22 @@ class PauseResume: return { 'is_paused': paused } + def send_pause_command(self): + # This sends the appropriate pause command from an event. + if not self.pause_command_sent: + if self.v_sd is not None and self.v_sd.is_active(): + # Printing from virtual sd, run pause command + self.sd_paused = True + self.v_sd.do_pause() + else: + self.sd_paused = False + self.gcode.respond_info("action:pause") + self.pause_command_sent = True def cmd_PAUSE(self, params): if self.captured_position is not None: self.gcode.respond_info("Print already paused") return - if self.v_sd is not None and self.v_sd.is_active(): - # Printing from virtual sd, run pause command - self.sd_paused = True - self.v_sd.cmd_M25({}) - else: - self.sd_paused = False - self.gcode.respond_info("action:pause") + self.send_pause_command() self.toolhead.wait_moves() self.captured_position = self.toolhead.get_position() reactor = self.printer.get_reactor() @@ -62,6 +68,7 @@ class PauseResume: self.gcode.run_script_from_command( "G92 E%.6f" % (self.captured_epos)) self.captured_position = self.captured_epos = None + self.pause_command_sent = False if self.sd_paused: # Printing from virtual sd, run pause command self.v_sd.cmd_M24({}) diff --git a/klippy/extras/virtual_sdcard.py b/klippy/extras/virtual_sdcard.py index 91bd31a9..b4ee948c 100644 --- a/klippy/extras/virtual_sdcard.py +++ b/klippy/extras/virtual_sdcard.py @@ -60,6 +60,9 @@ class VirtualSD: return {'progress': progress} def is_active(self): return self.work_timer is not None + def do_pause(self): + if self.work_timer is not None: + self.must_pause_work = True # G-Code commands def cmd_error(self, params): raise self.gcode.error("SD write not supported") @@ -116,8 +119,7 @@ class VirtualSD: self.work_handler, self.reactor.NOW) def cmd_M25(self, params): # Pause SD print - if self.work_timer is not None: - self.must_pause_work = True + self.do_pause() def cmd_M26(self, params): # Set SD position if self.work_timer is not None: |