diff options
| -rw-r--r-- | klippy/extras/idle_timeout.py | 18 | ||||
| -rw-r--r-- | klippy/extras/virtual_sdcard.py | 2 | ||||
| -rw-r--r-- | klippy/gcode.py | 29 |
3 files changed, 26 insertions, 23 deletions
diff --git a/klippy/extras/idle_timeout.py b/klippy/extras/idle_timeout.py index 7ead83e2..39563b12 100644 --- a/klippy/extras/idle_timeout.py +++ b/klippy/extras/idle_timeout.py @@ -15,7 +15,7 @@ class IdleTimeout: self.toolhead = None self.last_timeout = 0. self.idle_timeout = config.getfloat('timeout', 600., above=0.) - self.idle_script = config.get('gcode', DEFAULT_IDLE_GCODE) + self.idle_gcode = config.get('gcode', DEFAULT_IDLE_GCODE).split('\n') def printer_state(self, state): if state == 'ready': self.toolhead = self.printer.lookup_object('toolhead') @@ -23,14 +23,14 @@ class IdleTimeout: reactor.register_timer(self.timeout_handler, reactor.NOW) def run_idle_script(self): gcode = self.printer.lookup_object('gcode') - for line in self.idle_script.split('\n'): - try: - res = gcode.process_batch(line) - except: - break - if not res: - # Raced with incoming g-code commands - return + try: + res = gcode.process_batch(self.idle_gcode) + except: + logging.exception("idle timeout gcode execution") + return + if not res: + # Raced with incoming g-code commands + return self.last_timeout = self.toolhead.get_last_move_time() def timeout_handler(self, eventtime): info = self.toolhead.get_status(eventtime) diff --git a/klippy/extras/virtual_sdcard.py b/klippy/extras/virtual_sdcard.py index d7a1fd72..1a0fc2a8 100644 --- a/klippy/extras/virtual_sdcard.py +++ b/klippy/extras/virtual_sdcard.py @@ -164,7 +164,7 @@ class VirtualSD: continue # Dispatch command try: - res = self.gcode.process_batch(lines[-1]) + res = self.gcode.process_batch([lines[-1]]) if not res: self.reactor.pause(self.reactor.monotonic() + 0.100) continue diff --git a/klippy/gcode.py b/klippy/gcode.py index f6f8796a..06a2fd48 100644 --- a/klippy/gcode.py +++ b/klippy/gcode.py @@ -247,16 +247,20 @@ class GCodeParser: pending_commands = self.pending_commands if self.fd_handle is None: self.fd_handle = self.reactor.register_fd(self.fd, self.process_data) - def process_batch(self, command): + def process_batch(self, commands): if self.is_processing_data: return False self.is_processing_data = True try: - self.process_commands([command], need_ack=False) - finally: + self.process_commands(commands, need_ack=False) + except error as e: if self.pending_commands: self.process_pending() self.is_processing_data = False + raise + if self.pending_commands: + self.process_pending() + self.is_processing_data = False return True def run_script_from_command(self, script): prev_need_ack = self.need_ack @@ -265,16 +269,15 @@ class GCodeParser: finally: self.need_ack = prev_need_ack def run_script(self, script): - curtime = self.reactor.monotonic() - for line in script.split('\n'): - while 1: - try: - res = self.process_batch(line) - except: - break - if res: - break - curtime = self.reactor.pause(curtime + 0.100) + commands = script.split('\n') + curtime = None + while 1: + res = self.process_batch(commands) + if res: + break + if curtime is None: + curtime = self.reactor.monotonic() + curtime = self.reactor.pause(curtime + 0.100) # Response handling def ack(self, msg=None): if not self.need_ack or self.is_fileinput: |