Druk-3D/klipper
1
0
Fork 0
mirror of https://github.com/Klipper3d/klipper.git synced 2025-12-16 05:09:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

8
test/klippy/macros.cfg
View File

@@ -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 %}