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

gcode_macro: Parse variable_X parameters using ast.literal_eval()

Browse source 
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2019-06-07 19:30:17 -04:00
parent 01f3b50e73
commit 8b00580884
5 changed files with 32 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
klippy/extras/gcode_macro.py
View file

@ -3,7 +3,7 @@
# Copyright (C) 2018-2019 Kevin O'Connor <kevin@koconnor.net>
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import traceback, logging
import traceback, logging, ast
import jinja2
@ -100,9 +100,16 @@ class GCodeMacro:
prefix = 'default_parameter_'
self.kwparams = { o[len(prefix):].upper(): config.get(o)
for o in config.get_prefix_options(prefix) }
self.variables = {}
prefix = 'variable_'
self.variables = { o[len(prefix):]: config.get(o)
for o in config.get_prefix_options(prefix) }
for option in config.get_prefix_options(prefix):
try:
self.variables[option[len(prefix):]] = ast.literal_eval(
config.get(option))
except ValueError as e:
raise config.error(
"Option '%s' in section '%s' is not a valid literal" % (
option, config.get_name()))
def get_status(self, eventtime):
return dict(self.variables)
cmd_SET_GCODE_VARIABLE_help = "Set the value of a G-Code macro variable"
@ -115,7 +122,12 @@ class GCodeMacro:
return
raise self.gcode.error("Unknown gcode_macro variable '%s'" % (
variable,))
self.variables[variable] = value
try:
literal = ast.literal_eval(value)
except ValueError as e:
raise self.gcode.error("Unable to parse '%s' as a literal" % (
value,))
self.variables[variable] = literal
cmd_desc = "G-Code macro"
def cmd(self, params):
if self.in_script: