3D-printing/klipper
1
0
Fork 0
mirror of https://github.com/Klipper3d/klipper.git synced 2025-07-18 20:28:10 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

gcode: Eliminate the process_batch() method

Browse source 
Allow the callers of process_batch() to directly inspect the gcode
mutex.  Those callers can then directly invoke run_script().

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2019-06-09 13:33:21 -04:00
parent 962f7b98bd
commit 30d2ae8f9f
3 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
klippy/extras/idle_timeout.py
View file

@ -42,12 +42,10 @@ class IdleTimeout:
self.state = "Printing"
try:
script = self.idle_gcode.render()
res = self.gcode.process_batch(script.split('\n'))
res = self.gcode.run_script(script)
except:
logging.exception("idle timeout gcode execution")
return eventtime + 1.
if not res:
# Raced with incoming g-code commands
self.state = "Ready"
return eventtime + 1.
print_time = self.toolhead.get_last_move_time()
self.state = "Idle"
@ -64,7 +62,7 @@ class IdleTimeout:
if idle_time < self.idle_timeout:
# Wait for idle timeout
return eventtime + self.idle_timeout - idle_time
if not self.gcode.process_batch([]):
if self.gcode.get_mutex().test():
# Gcode class busy
return eventtime + 1.
# Idle timeout has elapsed
@ -82,7 +80,7 @@ class IdleTimeout:
if buffer_time > -READY_TIMEOUT:
# Wait for ready timeout
return eventtime + READY_TIMEOUT + buffer_time
if not self.gcode.process_batch([]):
if self.gcode.get_mutex().test():
# Gcode class busy
return eventtime + READY_TIMEOUT
# Transition to "ready" state