From 8b005808848dd5395792dba8b9f470ac441c5e72 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Fri, 7 Jun 2019 19:30:17 -0400 Subject: gcode_macro: Parse variable_X parameters using ast.literal_eval() Signed-off-by: Kevin O'Connor --- test/klippy/macros.cfg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/klippy/macros.cfg b/test/klippy/macros.cfg index 4886425f..8124aa3a 100644 --- a/test/klippy/macros.cfg +++ b/test/klippy/macros.cfg @@ -80,13 +80,13 @@ gcode: {% endif %} [gcode_macro TEST_variable] -variable_t: 12 +variable_t: 12.0 gcode: { printer.gcode.action_respond_info("TEST_variable") } - {% if t|float - 12.0 != printer.toolhead.position.y %} + {% if t - 12.0 != printer.toolhead.position.y %} M112 {% endif %} - {% if printer["gcode_macro TEST_variable"].t|float - 12.0 != 0.0 %} + {% if printer["gcode_macro TEST_variable"].t - 12.0 != 0.0 %} M112 {% endif %} SET_GCODE_VARIABLE MACRO=TEST_variable VARIABLE=t VALUE=17 @@ -95,7 +95,7 @@ gcode: [gcode_macro TEST_variable_part2] gcode: { printer.gcode.action_respond_info("TEST_variable_part2") } - {% if printer["gcode_macro TEST_variable"].t|float != 17.0 %} + {% if printer["gcode_macro TEST_variable"].t != 17.0 %} M112 {% endif %} -- cgit v1.2.3-70-g09d2