From ccf77a5daebd2c9b1a41acb0ad61e4504755c9d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 23 Nov 2016 17:41:43 +0100 Subject: [PATCH] Restrict pause_position and cancel_position to relevant GCODE scripts --- src/octoprint/util/comm.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/octoprint/util/comm.py b/src/octoprint/util/comm.py index b4cc9c0f..dd0ab9c6 100644 --- a/src/octoprint/util/comm.py +++ b/src/octoprint/util/comm.py @@ -678,10 +678,14 @@ class MachineCom(object): context.update(replacements) context.update(dict( printer_profile=self._printerProfileManager.get_current_or_default(), - last_position=self.last_position, - pause_position=self.pause_position + last_position=self.last_position )) + if scriptName == "afterPrintPaused" or scriptName == "beforePrintResumed": + context.update(dict(pause_position=self.pause_position)) + elif scriptName == "afterPrintCancelled": + context.update(dict(cancel_position=self.cancel_position)) + template = settings().loadScript("gcode", scriptName, context=context) if template is None: scriptLines = []