aboutsummaryrefslogtreecommitdiffstats
path: root/klippy/extras
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2019-06-07 10:55:28 -0400
committerKevin O'Connor <kevin@koconnor.net>2019-06-07 11:38:43 -0400
commit3f4190c792954da13a07bd064d4471478d61d2ab (patch)
tree347a67b9e13f996bb6b77aefed6548c6597ce2d4 /klippy/extras
parente60ee861f883059d80f32f27f254a9a96f1acf16 (diff)
downloadkutter-3f4190c792954da13a07bd064d4471478d61d2ab.tar.gz
kutter-3f4190c792954da13a07bd064d4471478d61d2ab.tar.xz
kutter-3f4190c792954da13a07bd064d4471478d61d2ab.zip
idle_timeout: Use template evaluation on gcode
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extras')
-rw-r--r--klippy/extras/idle_timeout.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/klippy/extras/idle_timeout.py b/klippy/extras/idle_timeout.py
index 24c63da2..d0a062d4 100644
--- a/klippy/extras/idle_timeout.py
+++ b/klippy/extras/idle_timeout.py
@@ -21,7 +21,9 @@ class IdleTimeout:
self.toolhead = self.timeout_timer = None
self.printer.register_event_handler("klippy:ready", self.handle_ready)
self.idle_timeout = config.getfloat('timeout', 600., above=0.)
- self.idle_gcode = config.get('gcode', DEFAULT_IDLE_GCODE).split('\n')
+ gcode_macro = self.printer.try_load_module(config, 'gcode_macro')
+ self.idle_gcode = gcode_macro.load_template(
+ config, 'gcode', DEFAULT_IDLE_GCODE)
self.gcode.register_command(
'SET_IDLE_TIMEOUT', self.cmd_SET_IDLE_TIMEOUT)
self.state = "Idle"
@@ -39,7 +41,8 @@ class IdleTimeout:
def transition_idle_state(self, eventtime):
self.state = "Printing"
try:
- res = self.gcode.process_batch(self.idle_gcode)
+ script = self.idle_gcode.render()
+ res = self.gcode.process_batch(script.split('\n'))
except:
logging.exception("idle timeout gcode execution")
return eventtime + 1.