diff --git a/macros.cfg b/macros.cfg index c7a6c85..fa13380 100644 --- a/macros.cfg +++ b/macros.cfg @@ -1,11 +1,11 @@ [gcode_macro G32] gcode: - BED_MESH_CLEAR # clear bed_mesh profile + BED_MESH_CLEAR M117 > home G28 - M117 > QGL + M117 > qgl QUAD_GANTRY_LEVEL - M117 > HOME + M117 > home G28 M117 > bed mesh calibrate BED_MESH_CALIBRATE @@ -18,7 +18,6 @@ description: Change filament gcode: SAVE_GCODE_STATE NAME=M600_state PAUSE - FILAMENT_UNLOAD M117 > change filament RESTORE_GCODE_STATE NAME=M600_state @@ -28,6 +27,7 @@ description: Cancel the actual running print rename_existing: CANCEL_PRINT_BASE gcode: TURN_OFF_HEATERS + PARK CANCEL_PRINT_BASE @@ -35,8 +35,33 @@ gcode: gcode: {% set X=params.X|default(150) %} {% set Y=params.Y|default(150) %} + {% set Z=params.Z|default(25) %} {% if "xyz" in printer.toolhead.homed_axes %} - G0 X{X} Y{Y} F10000 + G0 X{X} Y{Y} Z{Z} F10000 + {% else %} + {action_respond_info("Printer not homed")} + {% endif %} + +[gcode_macro PARK] +gcode: + {% if "xyz" in printer.toolhead.homed_axes %} + # set park positon for x and y + ## close to max + {% set x_park = printer.toolhead.axis_maximum.x|float - 5.0 %} + ## close to min + {% set y_park = printer.toolhead.axis_minimum.y|float + 5.0 %} + # calculate save lift position + {% set max_z = printer.toolhead.axis_maximum.z|float %} + {% set act_z = printer.toolhead.position.z|float %} + {% if act_z < (max_z - 20.0) %} + {% set z_safe = 20.0 %} + {% else %} + {% set z_safe = max_z - act_z %} + {% endif %} + G91 + G0 Z{z_safe} F900 + G90 + G0 X{x_park} Y{y_park} F6000 {% else %} {action_respond_info("Printer not homed")} {% endif %} @@ -50,35 +75,18 @@ variable_extrude: 1.0 gcode: # read E from pause macro {% set E = printer["gcode_macro PAUSE"].extrude|float %} - # set park positon for x and y - ## close to max - {% set x_park = printer.toolhead.axis_maximum.x|float - 5.0 %} - ## close to min - {% set y_park = printer.toolhead.axis_minimum.y|float + 5.0 %} - # calculate save lift position - {% set max_z = printer.toolhead.axis_maximum.z|float %} - {% set act_z = printer.toolhead.position.z|float %} - {% if act_z < (max_z - 2.0) %} - {% set z_safe = 2.0 %} - {% else %} - {% set z_safe = max_z - act_z %} - {% endif %} # end of definitions M117 > pause PAUSE_BASE - G91 {% if printer.extruder.can_extrude|lower == 'true' %} + G91 G1 E-{E} F2100 + G90 {% else %} {action_respond_info("Extruder not hot enough")} {% endif %} - {% if "xyz" in printer.toolhead.homed_axes %} - G1 Z{z_safe} F900 - G90 - G1 X{x_park} Y{y_park} F6000 - {% else %} - {action_respond_info("Printer not homed")} - {% endif %} + PARK + [gcode_macro RESUME] description: Resume the actual running print @@ -102,64 +110,6 @@ gcode: {% endif %} RESUME_BASE {get_params} -[gcode_macro PREHEAT] -description: set bed and extruder temperature -gcode: - {% set BED_TEMP = params.BED_TEMP|default(0)|float %} - {% set EXTRUDER_TEMP = params.EXTRUDER_TEMP|default(190)|float %} - M117 > start heating - M140 S{BED_TEMP} # start bed heating - M104 S{EXTRUDER_TEMP} # start extruder heating - M109 S{EXTRUDER_TEMP} # set and wait for nozzle temperature - M117 > done - -[gcode_macro FILAMENT_UNLOAD] -description: unload filament -gcode: - {% if printer.extruder.can_extrude|lower == 'true' %} - M83 # e relative coordinates - G0 E-75 F3000 # unload - M82 # e absolute coordinates - {% else %} - {action_respond_info("extruder not hot enough")} - {% endif %} - - -[gcode_macro FILAMENT_LOAD] -description: load filament -gcode: - {% if printer.extruder.can_extrude|lower == 'true' %} - M83 # e relative coordinates - G0 E50 F3000 # load fast - G4 P1000 # wait 1s - G0 E35 F300 # load slow - M82 # e absolute coordinates - {% else %} - {action_respond_info("extruder not hot enough")} - {% endif %} - - -[gcode_macro FILAMENT_PURGE] -description: purge filament -gcode: - {% set e = params.e|default(10)|float %} - {% if printer.extruder.can_extrude|lower == 'true' %} - M83 # e relative coordinates - G1 E{e} F300 - M82 # e absolute coordinates - {% else %} - {action_respond_info("extruder not hot enough")} - {% endif %} - - -[gcode_macro HOME] -gcode: - M117 > homing - G28 - M117 > moving - G0 X150 Y25 Z30 F10000 - M117 > homing done - [gcode_macro PRINT_START] gcode: @@ -188,6 +138,8 @@ gcode: M117 > starting SET_LED LED=caselight RED=0.50 GREEN=0.50 BLUE=0.50 G4 P2000 + SET_FAN_SPEED FAN=exhaust_fan SPEED=0.5 + CLEAN_NOZZLE [gcode_macro PRINT_LAYER_CHANGE] gcode: @@ -198,30 +150,26 @@ gcode: [gcode_macro CLEAN_NOZZLE] gcode: - {% set y0=params.y0|default(15) %} - {% set y1=params.y1|default(15.8) %} {% set x0=params.x0|default(75) %} {% set x1=params.x1|default(225) %} + {% set y0=params.y0|default(15) %} + {% set y1=params.y1|default(15.8) %} M117 > clean nozzle G0 Z5 F300 # move Z to travel height G0 X{x0} Y{y0} F5000 # move to x0/y0 G0 Z0.2 F1500 # lower Z G0 X{x1} E30 # draw line G0 Y{y1} # move to y1 - G0 X{y0} E15 # draw fine line + G0 X{x0} E15 # draw fine line [gcode_macro PRINT_END] gcode: M117 > finished - M400 ; wait for buffer to clear - G92 E0 ; zero the extruder - G1 E-10.0 F3600 ; retract filament - G91 ; relative positioning - G0 Z1.00 X20.0 Y20.0 F20000 ; move nozzle to remove stringing + M400 ; wait for buffer to clear + G92 E0 ; zero the extruder + G1 E-10.0 F3600 ; retract filament TURN_OFF_HEATERS - M107 ; turn off fan - G1 Z2 F3000 ; move nozzle up 2mm - G90 ; absolute positioning - G0 X125 Y250 F3600 ; park nozzle at rear - BED_MESH_CLEAR + M107 ; turn off fan + SET_FAN_SPEED FAN=exhaust_fan SPEED=0 + PARK