From 245ef01a565aa73ab74877aac50ceb896854ee7f Mon Sep 17 00:00:00 2001 From: Kyle Brown Date: Wed, 19 Jul 2023 20:58:52 -0700 Subject: [PATCH] macro cleanup --- calibration_macros.cfg | 376 ----------------------------------------- 1 file changed, 376 deletions(-) diff --git a/calibration_macros.cfg b/calibration_macros.cfg index 2341646..302ba50 100644 --- a/calibration_macros.cfg +++ b/calibration_macros.cfg @@ -49,99 +49,6 @@ gcode: PID_CALIBRATE HEATER=heater_bed TARGET=110 -[gcode_macro TEST_SPEED] -gcode: - # Example: TEST_SPEED SPEED=300 ACCEL=5000 ITERATIONS=10 Z=10 - # Speed - {% set speed = params.SPEED|default(printer.configfile.settings.printer.max_velocity)|int %} - # Iterations - {% set iterations = params.ITERATIONS|default(1)|int %} - # Acceleration - {% set accel = params.ACCEL|default(printer.configfile.settings.printer.max_accel)|int %} - # Bounding inset for large pattern (helps prevent slamming the toolhead into the sides after small skips, and helps to account for machines with imperfectly set dimensions) - {% set bound = params.BOUND|default(30)|int %} - # Size for small pattern box - {% set smallpatternsize = SMALLPATTERNSIZE|default(20)|int %} - {% set z_pos = params.ZPOS|default(10)|int %} - - # Large pattern - # Max positions, inset by BOUND - {% set x_min = printer.toolhead.axis_minimum.x + bound %} - {% set x_max = printer.toolhead.axis_maximum.x - bound %} - {% set y_min = printer.toolhead.axis_minimum.y + bound %} - {% set y_max = printer.toolhead.axis_maximum.y - bound %} - - # Small pattern at center - # Find X/Y center point - {% set x_center = (printer.toolhead.axis_minimum.x|float + printer.toolhead.axis_maximum.x|float ) / 2 %} - {% set y_center = (printer.toolhead.axis_minimum.y|float + printer.toolhead.axis_maximum.y|float ) / 2 %} - - # Set small pattern box around center point - {% set x_center_min = x_center - (smallpatternsize/2) %} - {% set x_center_max = x_center + (smallpatternsize/2) %} - {% set y_center_min = y_center - (smallpatternsize/2) %} - {% set y_center_max = y_center + (smallpatternsize/2) %} - - # Home first - G28 - - # Save current gcode state (absolute/relative, etc) - SAVE_GCODE_STATE NAME=TEST_SPEED - - # Output parameters to g-code terminal - { action_respond_info("TEST_SPEED: starting %d iterations at speed %d, accel %d" % (iterations, speed, accel)) } - - # Absolute positioning - G90 - - # Set new limits - SET_VELOCITY_LIMIT VELOCITY={speed} ACCEL={accel} ACCEL_TO_DECEL={accel} - - - # Go to starting position - G0 X{x_min} Y{y_min} Z{z_pos} F{speed*60} - - {% for i in range(iterations) %} - # Large pattern - # Diagonals - G0 X{x_min} Y{y_min} F{speed*60} - G0 X{x_max} Y{y_max} F{speed*60} - G0 X{x_min} Y{y_min} F{speed*60} - G0 X{x_max} Y{y_min} F{speed*60} - G0 X{x_min} Y{y_max} F{speed*60} - G0 X{x_max} Y{y_min} F{speed*60} - - # Box - G0 X{x_min} Y{y_min} F{speed*60} - G0 X{x_min} Y{y_max} F{speed*60} - G0 X{x_max} Y{y_max} F{speed*60} - G0 X{x_max} Y{y_min} F{speed*60} - - # Small pattern - # Small diagonals - G0 X{x_center_min} Y{y_center_min} F{speed*60} - G0 X{x_center_max} Y{y_center_max} F{speed*60} - G0 X{x_center_min} Y{y_center_min} F{speed*60} - G0 X{x_center_max} Y{y_center_min} F{speed*60} - G0 X{x_center_min} Y{y_center_max} F{speed*60} - G0 X{x_center_max} Y{y_center_min} F{speed*60} - - # Small box - {% for i in range(4) %} - G0 X{x_center_min} Y{y_center_min} F{speed*60} - G0 X{x_center_min} Y{y_center_max} F{speed*60} - G0 X{x_center_max} Y{y_center_max} F{speed*60} - G0 X{x_center_max} Y{y_center_min} F{speed*60} - {% endfor %} - {% endfor %} - - # Restore max speed/accel/accel_to_decel to their configured values - SET_VELOCITY_LIMIT VELOCITY={printer.configfile.settings.printer.max_velocity} ACCEL={printer.configfile.settings.printer.max_accel} ACCEL_TO_DECEL={printer.configfile.settings.printer.max_accel_to_decel} - - # Restore previous gcode state (absolute/relative, etc) - RESTORE_GCODE_STATE NAME=TEST_SPEED - - [gcode_macro TEST_AXIS_SPEED] gcode: # Example: TEST_AXIS_SPEED SPEED=300 X_ACCEL=5000 Y_ACCEL=2000 ITERATIONS=10 Z=10 @@ -236,286 +143,3 @@ gcode: # Restore previous gcode state (absolute/relative, etc) RESTORE_GCODE_STATE NAME=TEST_SPEED -[gcode_macro TEST_CARDINAL_SPEED] -gcode: - # Example: TEST_CARDINAL_SPEED SPEED=300 ACCEL=5000 ITERATIONS=10 ZPOS=10 - # Speed - {% set speed = params.SPEED|default(printer.configfile.settings.printer.max_velocity)|int %} - # Iterations - {% set iterations = params.ITERATIONS|default(1)|int %} - # Acceleration - {% set accel = params.ACCEL|default(printer.configfile.settings.printer.max_accel)|int %} - # Bounding inset for large pattern (helps prevent slamming the toolhead into the sides after small skips, and helps to account for machines with imperfectly set dimensions) - {% set bound = params.BOUND|default(30)|int %} - # Size for small pattern box - {% set smallpatternsize = SMALLPATTERNSIZE|default(20)|int %} - {% set z_pos = params.ZPOS|default(10)|int %} - - # Large pattern - # Max positions, inset by BOUND - {% set x_min = printer.toolhead.axis_minimum.x + bound %} - {% set x_max = printer.toolhead.axis_maximum.x - bound %} - {% set y_min = printer.toolhead.axis_minimum.y + bound %} - {% set y_max = printer.toolhead.axis_maximum.y - bound %} - - # Small pattern at center - # Find X/Y center point - {% set x_center = (printer.toolhead.axis_minimum.x|float + printer.toolhead.axis_maximum.x|float ) / 2 %} - {% set y_center = (printer.toolhead.axis_minimum.y|float + printer.toolhead.axis_maximum.y|float ) / 2 %} - - # Set small pattern box around center point - {% set x_center_min = x_center - (smallpatternsize/2) %} - {% set x_center_max = x_center + (smallpatternsize/2) %} - {% set y_center_min = y_center - (smallpatternsize/2) %} - {% set y_center_max = y_center + (smallpatternsize/2) %} - - # Home first - G28 - - # Save current gcode state (absolute/relative, etc) - SAVE_GCODE_STATE NAME=TEST_SPEED - - # Output parameters to g-code terminal - { action_respond_info("TEST_CARDINAL_SPEED: starting %d iterations at speed %d, accel %d" % (iterations, speed, accel)) } - - # Absolute positioning - G90 - - # Set new limits - SET_VELOCITY_LIMIT VELOCITY={speed} ACCEL={accel} ACCEL_TO_DECEL={accel} - - - # Go to starting position - # Drop accel to half for a potential diag movement - SET_VELOCITY_LIMIT VELOCITY={speed} ACCEL={accel/2} ACCEL_TO_DECEL={accel/2} - G0 X{x_min} Y{y_min} Z{z_pos} F{speed*60} - # Restore accel - SET_VELOCITY_LIMIT VELOCITY={speed} ACCEL={accel} ACCEL_TO_DECEL={accel} - - {% for i in range(iterations) %} - # Large pattern - # Box - G0 X{x_min} Y{y_min} F{speed*60} - G0 X{x_min} Y{y_max} F{speed*60} - G0 X{x_max} Y{y_max} F{speed*60} - G0 X{x_max} Y{y_min} F{speed*60} - - # Drop accel to half for a diag movement - SET_VELOCITY_LIMIT VELOCITY={speed} ACCEL={accel/2} ACCEL_TO_DECEL={accel/2} - G0 X{x_center_min} Y{y_center_min} F{speed*60} - # Restore accel - SET_VELOCITY_LIMIT VELOCITY={speed} ACCEL={accel} ACCEL_TO_DECEL={accel} - # Small pattern - # Small box - {% for i in range(4) %} - G0 X{x_center_min} Y{y_center_min} F{speed*60} - G0 X{x_center_min} Y{y_center_max} F{speed*60} - G0 X{x_center_max} Y{y_center_max} F{speed*60} - G0 X{x_center_max} Y{y_center_min} F{speed*60} - {% endfor %} - {% endfor %} - - # Restore max speed/accel/accel_to_decel to their configured values - SET_VELOCITY_LIMIT VELOCITY={printer.configfile.settings.printer.max_velocity} ACCEL={printer.configfile.settings.printer.max_accel} ACCEL_TO_DECEL={printer.configfile.settings.printer.max_accel_to_decel} - - # Restore previous gcode state (absolute/relative, etc) - RESTORE_GCODE_STATE NAME=TEST_SPEED - - -[gcode_macro TEST_DIAG_SPEED] -gcode: - # Example: TEST_DIAG_SPEED SPEED=300 ACCEL=5000 ITERATIONS=10 ZPOS=10 - # Speed - {% set speed = params.SPEED|default(printer.configfile.settings.printer.max_velocity)|int %} - # Iterations - {% set iterations = params.ITERATIONS|default(1)|int %} - # Acceleration - {% set accel = params.ACCEL|default(printer.configfile.settings.printer.max_accel)|int %} - # Bounding inset for large pattern (helps prevent slamming the toolhead into the sides after small skips, and helps to account for machines with imperfectly set dimensions) - {% set bound = params.BOUND|default(30)|int %} - # Size for small pattern box - {% set smallpatternsize = SMALLPATTERNSIZE|default(20)|int %} - {% set z_pos = params.ZPOS|default(10)|int %} - - # Large pattern - # Max positions, inset by BOUND - {% set x_min = printer.toolhead.axis_minimum.x + bound %} - {% set x_max = printer.toolhead.axis_maximum.x - bound %} - {% set y_min = printer.toolhead.axis_minimum.y + bound %} - {% set y_max = printer.toolhead.axis_maximum.y - bound %} - - # Small pattern at center - # Find X/Y center point - {% set x_center = (printer.toolhead.axis_minimum.x|float + printer.toolhead.axis_maximum.x|float ) / 2 %} - {% set y_center = (printer.toolhead.axis_minimum.y|float + printer.toolhead.axis_maximum.y|float ) / 2 %} - - # Set small pattern box around center point - {% set x_center_min = x_center - (smallpatternsize/2) %} - {% set x_center_max = x_center + (smallpatternsize/2) %} - {% set y_center_min = y_center - (smallpatternsize/2) %} - {% set y_center_max = y_center + (smallpatternsize/2) %} - - # Home first - G28 - - # Save current gcode state (absolute/relative, etc) - SAVE_GCODE_STATE NAME=TEST_SPEED - - # Output parameters to g-code terminal - { action_respond_info("TEST_DIAG_SPEED: starting %d iterations at speed %d, accel %d" % (iterations, speed, accel)) } - - # Absolute positioning - G90 - - # Set new limits - SET_VELOCITY_LIMIT VELOCITY={speed} ACCEL={accel} ACCEL_TO_DECEL={accel} - - - # Go to starting position - G0 X{x_min} Y{y_min} Z{z_pos} F{speed*60} - - {% for i in range(iterations) %} - # Large pattern - # Diagonals - G0 X{x_min} Y{y_min} F{speed*60} - G0 X{x_max} Y{y_max} F{speed*60} - G0 X{x_min} Y{y_min} F{speed*60} - G0 X{x_max} Y{y_min} F{speed*60} - G0 X{x_min} Y{y_max} F{speed*60} - G0 X{x_max} Y{y_min} F{speed*60} - - # Small pattern - # Small diagonals - G0 X{x_center_min} Y{y_center_min} F{speed*60} - G0 X{x_center_max} Y{y_center_max} F{speed*60} - G0 X{x_center_min} Y{y_center_min} F{speed*60} - G0 X{x_center_max} Y{y_center_min} F{speed*60} - G0 X{x_center_min} Y{y_center_max} F{speed*60} - G0 X{x_center_max} Y{y_center_min} F{speed*60} - {% endfor %} - - # Restore max speed/accel/accel_to_decel to their configured values - SET_VELOCITY_LIMIT VELOCITY={printer.configfile.settings.printer.max_velocity} ACCEL={printer.configfile.settings.printer.max_accel} ACCEL_TO_DECEL={printer.configfile.settings.printer.max_accel_to_decel} - - # Restore previous gcode state (absolute/relative, etc) - RESTORE_GCODE_STATE NAME=TEST_SPEED - -[gcode_macro TEST_X_SPEED] -gcode: - # Example: TEST_X_SPEED SPEED=300 ACCEL=5000 ITERATIONS=10 ZPOS=10 - # Speed - {% set speed = params.SPEED|default(printer.configfile.settings.printer.max_velocity)|int %} - # Iterations - {% set iterations = params.ITERATIONS|default(1)|int %} - # Acceleration - {% set accel = params.ACCEL|default(printer.configfile.settings.printer.max_accel)|int %} - # Bounding inset for large pattern (helps prevent slamming the toolhead into the sides after small skips, and helps to account for machines with imperfectly set dimensions) - {% set bound = params.BOUND|default(30)|int %} - # Size for small pattern box - {% set smallpatternsize = SMALLPATTERNSIZE|default(20)|int %} - {% set z_pos = params.ZPOS|default(10)|int %} - - # Large pattern - # Max positions, inset by BOUND - {% set x_min = printer.toolhead.axis_minimum.x + bound %} - {% set x_max = printer.toolhead.axis_maximum.x - bound %} - - # Small pattern at center - # Find X/Y center point - {% set x_center = (printer.toolhead.axis_minimum.x|float + printer.toolhead.axis_maximum.x|float ) / 2 %} - {% set y_center = (printer.toolhead.axis_minimum.y|float + printer.toolhead.axis_maximum.y|float ) / 2 %} - - # Home first - G28 - - # Save current gcode state (absolute/relative, etc) - SAVE_GCODE_STATE NAME=TEST_SPEED - - # Output parameters to g-code terminal - { action_respond_info("TEST_X_SPEED: starting %d iterations at speed %d, accel %d" % (iterations, speed, accel)) } - - # Absolute positioning - G90 - - # Set new limits - SET_VELOCITY_LIMIT VELOCITY={speed} ACCEL={accel} ACCEL_TO_DECEL={accel} - - - # Go to starting position - # Drop accel to half for a potential diag movement - SET_VELOCITY_LIMIT VELOCITY={speed} ACCEL={accel/2} ACCEL_TO_DECEL={accel/2} - G0 X{x_min} Y{y_center} Z{z_pos} F{speed*60} - # Restore accel - SET_VELOCITY_LIMIT VELOCITY={speed} ACCEL={accel} ACCEL_TO_DECEL={accel} - - {% for i in range(iterations) %} - G0 X{x_min} Y{y_center} F{speed*60} - G0 X{x_min} Y{y_center} F{speed*60} - - {% endfor %} - - # Restore max speed/accel/accel_to_decel to their configured values - SET_VELOCITY_LIMIT VELOCITY={printer.configfile.settings.printer.max_velocity} ACCEL={printer.configfile.settings.printer.max_accel} ACCEL_TO_DECEL={printer.configfile.settings.printer.max_accel_to_decel} - - # Restore previous gcode state (absolute/relative, etc) - RESTORE_GCODE_STATE NAME=TEST_SPEED - -[gcode_macro TEST_Y_SPEED] -gcode: - # Example: TEST_Y_SPEED SPEED=300 ACCEL=5000 ITERATIONS=10 ZPOS=10 - # Speed - {% set speed = params.SPEED|default(printer.configfile.settings.printer.max_velocity)|int %} - # Iterations - {% set iterations = params.ITERATIONS|default(1)|int %} - # Acceleration - {% set accel = params.ACCEL|default(printer.configfile.settings.printer.max_accel)|int %} - # Bounding inset for large pattern (helps prevent slamming the toolhead into the sides after small skips, and helps to account for machines with imperfectly set dimensions) - {% set bound = params.BOUND|default(30)|int %} - # Size for small pattern box - {% set smallpatternsize = SMALLPATTERNSIZE|default(20)|int %} - {% set z_pos = params.ZPOS|default(10)|int %} - - # Large pattern - # Max positions, inset by BOUND - {% set x_min = printer.toolhead.axis_minimum.x + bound %} - {% set x_max = printer.toolhead.axis_maximum.x - bound %} - - # Small pattern at center - # Find X/Y center point - {% set x_center = (printer.toolhead.axis_minimum.x|float + printer.toolhead.axis_maximum.x|float ) / 2 %} - {% set y_center = (printer.toolhead.axis_minimum.y|float + printer.toolhead.axis_maximum.y|float ) / 2 %} - - # Home first - G28 - - # Save current gcode state (absolute/relative, etc) - SAVE_GCODE_STATE NAME=TEST_SPEED - - # Output parameters to g-code terminal - { action_respond_info("TEST_Y_SPEED: starting %d iterations at speed %d, accel %d" % (iterations, speed, accel)) } - - # Absolute positioning - G90 - - # Set new limits - SET_VELOCITY_LIMIT VELOCITY={speed} ACCEL={accel} ACCEL_TO_DECEL={accel} - - - # Go to starting position - # Drop accel to half for a potential diag movement - SET_VELOCITY_LIMIT VELOCITY={speed} ACCEL={accel/2} ACCEL_TO_DECEL={accel/2} - G0 X{x_min} Y{y_center} Z{z_pos} F{speed*60} - # Restore accel - SET_VELOCITY_LIMIT VELOCITY={speed} ACCEL={accel} ACCEL_TO_DECEL={accel} - - {% for i in range(iterations) %} - G0 X{x_center} Y{y_min} F{speed*60} - G0 X{x_center} Y{y_max} F{speed*60} - - {% endfor %} - - # Restore max speed/accel/accel_to_decel to their configured values - SET_VELOCITY_LIMIT VELOCITY={printer.configfile.settings.printer.max_velocity} ACCEL={printer.configfile.settings.printer.max_accel} ACCEL_TO_DECEL={printer.configfile.settings.printer.max_accel_to_decel} - - # Restore previous gcode state (absolute/relative, etc) - RESTORE_GCODE_STATE NAME=TEST_SPEED