Skip to content

Commit

Permalink
Macros: quote CHIPS
Browse files Browse the repository at this point in the history
  • Loading branch information
@miklschmidt
miklschmidt committed Dec 8, 2024
1 parent d9f31a2 commit d7608b2
Showing 1 changed file with 30 additions and 30 deletions.
60 changes: 30 additions & 30 deletions configuration/macros/idex/idex_is.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ gcode:
G1 X{probe_points[0]} Y{probe_points[1]} F{speed}
{% if idex_mode == 'copy' %}
{% if measure_t0 == true %}
TEST_RESONANCES AXIS=X CHIPS={adxl_chip[0]} NAME=t0_copy FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=X CHIPS="{adxl_chip[0]}" NAME=t0_copy FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
{% endif %}
{% if measure_t1 == true %}
TEST_RESONANCES AXIS=X CHIPS={adxl_chip[1]} NAME=t1_copy FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=X CHIPS="{adxl_chip[1]}" NAME=t1_copy FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
{% endif %}
{% if measure_t0 == true %}
RUN_SHELL_COMMAND CMD=generate_shaper_graphs PARAMS="{"x 0 1 %s %s %s" % ('%0.3f'|format(probe_points[0] - copy_mode_offset), '%0.3f'|format(probe_points[1]), '%0.3f'|format(probe_points[2]))}"
Expand All @@ -88,10 +88,10 @@ gcode:
{% endif %}
{% elif idex_mode == 'mirror' %}
{% if measure_t0 == true %}
TEST_RESONANCES AXIS=X CHIPS={adxl_chip[0]} NAME=t0_mirror FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=X CHIPS="{adxl_chip[0]}" NAME=t0_mirror FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
{% endif %}
{% if measure_t1 == true %}
TEST_RESONANCES AXIS=X CHIPS={adxl_chip[1]} NAME=t1_mirror FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=X CHIPS="{adxl_chip[1]}" NAME=t1_mirror FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
{% endif %}
{% if measure_t0 == true %}
RUN_SHELL_COMMAND CMD=generate_shaper_graphs PARAMS="{"x 0 2 %s %s %s" % ('%0.3f'|format(probe_points[0] - copy_mode_offset), '%0.3f'|format(probe_points[1]), '%0.3f'|format(probe_points[2]))}"
Expand All @@ -104,11 +104,11 @@ gcode:
G1 X{probe_points[0]} Y{probe_points[1]} F{speed}
{% if measure_t0 == true %}
_SELECT_TOOL T=0 X={probe_points[0]} Y={probe_points[1]}
TEST_RESONANCES AXIS=X CHIPS={adxl_chip[0]} NAME=t0 FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0]},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=X CHIPS="{adxl_chip[0]}" NAME=t0 FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0]},{probe_points[1]},{probe_points[2]}
{% endif %}
{% if measure_t1 == true %}
_SELECT_TOOL T=1 X={probe_points[0]} Y={probe_points[1]}
TEST_RESONANCES AXIS=X CHIPS={adxl_chip[1]} NAME=t1 FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0]},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=X CHIPS="{adxl_chip[1]}" NAME=t1 FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0]},{probe_points[1]},{probe_points[2]}
{% endif %}
G4 P5000
{% if measure_t0 == true and measure_t1 == false %}
Expand All @@ -130,10 +130,10 @@ gcode:
G1 X{probe_points[0]} Y{probe_points[1]} F{speed}
{% if idex_mode == 'copy' %}
{% if measure_t0 == true %}
TEST_RESONANCES AXIS=Y CHIPS={adxl_chip[0]} NAME=t0_copy FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=Y CHIPS="{adxl_chip[0]}" NAME=t0_copy FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
{% endif %}
{% if measure_t1 == true %}
TEST_RESONANCES AXIS=Y CHIPS={adxl_chip[1]} NAME=t1_copy FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=Y CHIPS="{adxl_chip[1]}" NAME=t1_copy FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
{% endif %}
{% if measure_t0 == true %}
RUN_SHELL_COMMAND CMD=generate_shaper_graphs PARAMS="{"y 0 1 %s %s %s" % ('%0.3f'|format(probe_points[0] - copy_mode_offset), '%0.3f'|format(probe_points[1]), '%0.3f'|format(probe_points[2]))}"
Expand All @@ -143,10 +143,10 @@ gcode:
{% endif %}
{% elif idex_mode == 'mirror' %}
{% if measure_t0 == true %}
TEST_RESONANCES AXIS=Y CHIPS={adxl_chip[0]} NAME=t0_mirror FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=Y CHIPS="{adxl_chip[0]}" NAME=t0_mirror FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
{% endif %}
{% if measure_t1 == true %}
TEST_RESONANCES AXIS=Y CHIPS={adxl_chip[1]} NAME=t1_mirror FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=Y CHIPS="{adxl_chip[1]}" NAME=t1_mirror FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
{% endif %}
{% if measure_t0 == true %}
RUN_SHELL_COMMAND CMD=generate_shaper_graphs PARAMS="{"y 0 2 %s %s %s" % ('%0.3f'|format(probe_points[0] - copy_mode_offset), '%0.3f'|format(probe_points[1]), '%0.3f'|format(probe_points[2]))}"
Expand All @@ -159,11 +159,11 @@ gcode:
G1 X{probe_points[0]} Y{probe_points[1]} F{speed}
{% if measure_t0 == true %}
_SELECT_TOOL T=0 X={probe_points[0]} Y={probe_points[1]}
TEST_RESONANCES AXIS=Y CHIPS={adxl_chip[0]} NAME=t0 FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0]},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=Y CHIPS="{adxl_chip[0]}" NAME=t0 FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0]},{probe_points[1]},{probe_points[2]}
{% endif %}
{% if measure_t1 == true %}
_SELECT_TOOL T=1 X={probe_points[0]} Y={probe_points[1]}
TEST_RESONANCES AXIS=Y CHIPS={adxl_chip[1]} NAME=t1 FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0]},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=Y CHIPS="{adxl_chip[1]}" NAME=t1 FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0]},{probe_points[1]},{probe_points[2]}
{% endif %}
G4 P5000
{% if measure_t0 == true and measure_t1 == false %}
Expand All @@ -188,12 +188,12 @@ gcode:
G1 X{probe_points[0]} Y{probe_points[1]} F{speed}
{% if idex_mode == 'copy' %}
{% if measure_t0 == true %}
TEST_RESONANCES AXIS=X CHIPS={adxl_chip[0]} NAME=t0_copy FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=Y CHIPS={adxl_chip[0]} NAME=t0_copy FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=X CHIPS="{adxl_chip[0]}" NAME=t0_copy FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=Y CHIPS="{adxl_chip[0]}" NAME=t0_copy FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
{% endif %}
{% if measure_t1 == true %}
TEST_RESONANCES AXIS=X CHIPS={adxl_chip[1]} NAME=t1_copy FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=Y CHIPS={adxl_chip[1]} NAME=t1_copy FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=X CHIPS="{adxl_chip[1]}" NAME=t1_copy FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=Y CHIPS="{adxl_chip[1]}" NAME=t1_copy FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
{% endif %}
{% if measure_t0 == true %}
RUN_SHELL_COMMAND CMD=generate_shaper_graphs PARAMS="{"x 0 1 %s %s %s" % ('%0.3f'|format(probe_points[0] - copy_mode_offset), '%0.3f'|format(probe_points[1]), '%0.3f'|format(probe_points[2]))}"
Expand All @@ -205,12 +205,12 @@ gcode:
{% endif %}
{% elif idex_mode == 'mirror' %}
{% if measure_t0 == true %}
TEST_RESONANCES AXIS=X CHIPS={adxl_chip[0]} NAME=t0_mirror FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=Y CHIPS={adxl_chip[0]} NAME=t0_mirror FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=X CHIPS="{adxl_chip[0]}" NAME=t0_mirror FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=Y CHIPS="{adxl_chip[0]}" NAME=t0_mirror FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
{% endif %}
{% if measure_t1 == true %}
TEST_RESONANCES AXIS=X CHIPS={adxl_chip[1]} NAME=t1_mirror FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=Y CHIPS={adxl_chip[1]} NAME=t1_mirror FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=X CHIPS="{adxl_chip[1]}" NAME=t1_mirror FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=Y CHIPS="{adxl_chip[1]}" NAME=t1_mirror FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0] - copy_mode_offset},{probe_points[1]},{probe_points[2]}
{% endif %}
{% if measure_t0 == true %}
RUN_SHELL_COMMAND CMD=generate_shaper_graphs PARAMS="{"x 0 2 %s %s %s" % ('%0.3f'|format(probe_points[0] - copy_mode_offset), '%0.3f'|format(probe_points[1]), '%0.3f'|format(probe_points[2]))}"
Expand All @@ -225,13 +225,13 @@ gcode:
G1 X{probe_points[0]} Y{probe_points[1]} F{speed}
{% if measure_t0 == true %}
_SELECT_TOOL T=0 X={probe_points[0]} Y={probe_points[1]}
TEST_RESONANCES AXIS=X CHIPS={adxl_chip[0]} NAME=t0 FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0]},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=Y CHIPS={adxl_chip[0]} NAME=t0 FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0]},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=X CHIPS="{adxl_chip[0]}" NAME=t0 FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0]},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=Y CHIPS="{adxl_chip[0]}" NAME=t0 FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0]},{probe_points[1]},{probe_points[2]}
{% endif %}
{% if measure_t1 == true %}
_SELECT_TOOL T=1 X={probe_points[0]} Y={probe_points[1]}
TEST_RESONANCES AXIS=X CHIPS={adxl_chip[1]} NAME=t1 FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0]},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=Y CHIPS={adxl_chip[1]} NAME=t1 FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0]},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=X CHIPS="{adxl_chip[1]}" NAME=t1 FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0]},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=Y CHIPS="{adxl_chip[1]}" NAME=t1 FREQ_START={freq_start} FREQ_END={freq_end} HZ_PER_SEC={hz_per_sec} POINT={probe_points[0]},{probe_points[1]},{probe_points[2]}
{% endif %}
G4 P5000
{% if measure_t0 == true and measure_t1 == false %}
Expand Down Expand Up @@ -319,11 +319,11 @@ gcode:
{% if axis == 'x' %}
{% if measure_t1 == true %}
_SELECT_TOOL T=1 X={probe_points[0]} Y={probe_points[1]}
TEST_RESONANCES AXIS=X CHIPS={adxl_chip[1]} OUTPUT=raw_data NAME=t1 FREQ_START={freq_start} FREQ_END={freq_end} POINT={probe_points[0]},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=X CHIPS="{adxl_chip[1]}" OUTPUT=raw_data NAME=t1 FREQ_START={freq_start} FREQ_END={freq_end} POINT={probe_points[0]},{probe_points[1]},{probe_points[2]}
{% endif %}
{% if measure_t0 == true %}
_SELECT_TOOL T=0 X={probe_points[0]} Y={probe_points[1]}
TEST_RESONANCES AXIS=X CHIPS={adxl_chip[0]} OUTPUT=raw_data NAME=t0 FREQ_START={freq_start} FREQ_END={freq_end} POINT={probe_points[0]},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=X CHIPS="{adxl_chip[0]}" OUTPUT=raw_data NAME=t0 FREQ_START={freq_start} FREQ_END={freq_end} POINT={probe_points[0]},{probe_points[1]},{probe_points[2]}
{% endif %}
G4 P5000
{% if measure_t1 == true and measure_t0 == false %}
Expand All @@ -339,7 +339,7 @@ gcode:
{action_raise_error("Axis specified. Not supported for belt tension on Y.")}
{% else %}
_SELECT_TOOL T=1 X={parking_position_t1} Y={probe_points[1]}
TEST_RESONANCES AXIS=Y CHIPS={adxl_chip[1]},{adxl_chip[0]} OUTPUT=raw_data NAME=t2 POINT={parking_position_t1},{probe_points[1]},{probe_points[2]} FREQ_START={freq_start} FREQ_END={freq_end}
TEST_RESONANCES AXIS=Y CHIPS="{adxl_chip[1]},{adxl_chip[0]}" OUTPUT=raw_data NAME=t2 POINT={parking_position_t1},{probe_points[1]},{probe_points[2]} FREQ_START={freq_start} FREQ_END={freq_end}
G4 P5000
RUN_SHELL_COMMAND CMD=generate_tension_graphs PARAMS="y 2"
PARK_TOOLHEAD
Expand All @@ -350,16 +350,16 @@ gcode:
{% else %}
{% if measure_t1 == true %}
_SELECT_TOOL T=1 X={probe_points[0]} Y={probe_points[1]}
TEST_RESONANCES AXIS=X CHIPS={adxl_chip[1]} OUTPUT=raw_data NAME=t1 FREQ_START={freq_start} FREQ_END={freq_end} POINT={probe_points[0]},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=X CHIPS="{adxl_chip[1]}" OUTPUT=raw_data NAME=t1 FREQ_START={freq_start} FREQ_END={freq_end} POINT={probe_points[0]},{probe_points[1]},{probe_points[2]}
{% endif %}
{% if measure_t0 == true %}
_SELECT_TOOL T=0 X={probe_points[0]} Y={probe_points[1]}
TEST_RESONANCES AXIS=X CHIPS={adxl_chip[0]} OUTPUT=raw_data NAME=t0 FREQ_START={freq_start} FREQ_END={freq_end} POINT={probe_points[0]},{probe_points[1]},{probe_points[2]}
TEST_RESONANCES AXIS=X CHIPS="{adxl_chip[0]}" OUTPUT=raw_data NAME=t0 FREQ_START={freq_start} FREQ_END={freq_end} POINT={probe_points[0]},{probe_points[1]},{probe_points[2]}
{% endif %}
{% if params.TOOLHEAD is not defined %}
_SELECT_TOOL T=1 X={parking_position_t1} Y={probe_points[1]}
G1 X{parking_position_t1} F{speed}
TEST_RESONANCES AXIS=Y CHIPS={adxl_chip[1]},{adxl_chip[0]} OUTPUT=raw_data NAME=t2 POINT={parking_position_t1},{probe_points[1]},{probe_points[2]} FREQ_START={freq_start} FREQ_END={freq_end}
TEST_RESONANCES AXIS=Y CHIPS="{adxl_chip[1]},{adxl_chip[0]}" OUTPUT=raw_data NAME=t2 POINT={parking_position_t1},{probe_points[1]},{probe_points[2]} FREQ_START={freq_start} FREQ_END={freq_end}
{% endif %}
G4 P5000
{% if measure_t1 == true and measure_t0 == false %}
Expand Down

0 comments on commit d7608b2

Please sign in to comment.