aboutsummaryrefslogtreecommitdiffstats
path: root/klippy/extras/gcode_macro.py
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2018-09-30 12:32:13 -0400
committerKevin O'Connor <kevin@koconnor.net>2018-09-30 12:43:54 -0400
commitde7c1f76db1c26eb514a435a04a07a884c320d3b (patch)
treef4b121834f21effd9aa90a98348171016d9111c1 /klippy/extras/gcode_macro.py
parentb112cac47a2c5e9919b82dff459dc47c320019a9 (diff)
downloadkutter-de7c1f76db1c26eb514a435a04a07a884c320d3b.tar.gz
kutter-de7c1f76db1c26eb514a435a04a07a884c320d3b.tar.xz
kutter-de7c1f76db1c26eb514a435a04a07a884c320d3b.zip
gcode_macro: Provide more information on a formatting error
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extras/gcode_macro.py')
-rw-r--r--klippy/extras/gcode_macro.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/klippy/extras/gcode_macro.py b/klippy/extras/gcode_macro.py
index 7fe4bfed..3818df7e 100644
--- a/klippy/extras/gcode_macro.py
+++ b/klippy/extras/gcode_macro.py
@@ -3,7 +3,7 @@
# Copyright (C) 2018 Kevin O'Connor <kevin@koconnor.net>
#
# This file may be distributed under the terms of the GNU GPLv3 license.
-import logging
+import traceback, logging
DEFAULT_PREFIX = 'default_parameter_'
@@ -31,8 +31,9 @@ class GCodeMacro:
kwparams.update(params)
try:
script = self.script.format(**kwparams)
- except Exception:
- msg = "Macro %s script formatting failed" % (self.alias,)
+ except Exception as e:
+ msg = "Error evaluating %s: %s" % (
+ self.alias, traceback.format_exception_only(type(e), e)[-1])
logging.exception(msg)
raise self.gcode.error(msg)
self.in_script = True