v2.4: change output add layer_change macro to be called from sliced gcode

This commit is contained in:
Konstantin Koslowski 2021-10-05 19:15:25 +02:00
parent 2671986e61
commit b4b6ffbb40

View file

@ -13,7 +13,7 @@ gcode:
SAVE_GCODE_STATE NAME=M600_state SAVE_GCODE_STATE NAME=M600_state
PAUSE PAUSE
FILAMENT_UNLOAD FILAMENT_UNLOAD
M117 >> change filament M117 > change filament
RESTORE_GCODE_STATE NAME=M600_state RESTORE_GCODE_STATE NAME=M600_state
@ -56,7 +56,7 @@ gcode:
{% set z_safe = max_z - act_z %} {% set z_safe = max_z - act_z %}
{% endif %} {% endif %}
# end of definitions # end of definitions
M117 >> pause M117 > pause
PAUSE_BASE PAUSE_BASE
G91 G91
{% if printer.extruder.can_extrude|lower == 'true' %} {% if printer.extruder.can_extrude|lower == 'true' %}
@ -85,7 +85,7 @@ gcode:
{% set get_params = "" %} {% set get_params = "" %}
{% endif %} {% endif %}
# end of definitions # end of definitions
M117 >> resume M117 > resume
{% if printer.extruder.can_extrude|lower == 'true' %} {% if printer.extruder.can_extrude|lower == 'true' %}
G91 G91
G1 E{E} F6000 G1 E{E} F6000
@ -136,16 +136,16 @@ gcode:
[gcode_macro HOME] [gcode_macro HOME]
gcode: gcode:
M117 >> homing M117 > homing
G28 G28
M117 >> moving M117 > moving
G0 X150 Y25 Z30 F10000 G0 X150 Y25 Z30 F10000
M117 >> homing done M117 > homing done
[gcode_macro PRINT_START] [gcode_macro PRINT_START]
gcode: gcode:
M117 >> configuring M117 > configuring
SET_LED LED=caselight RED=0.00 GREEN=0.00 BLUE=0.50 SET_LED LED=caselight RED=0.00 GREEN=0.00 BLUE=0.50
M140 S{BED} # start bed heating M140 S{BED} # start bed heating
M104 S{EXTRUDER} # start extruder heating M104 S{EXTRUDER} # start extruder heating
@ -155,19 +155,25 @@ gcode:
M83 # use relative distances for extrusion M83 # use relative distances for extrusion
G4 P1000 G4 P1000
M117 >> homing M117 > homing
SET_LED LED=caselight RED=0.00 GREEN=0.50 BLUE=0.00 SET_LED LED=caselight RED=0.00 GREEN=0.50 BLUE=0.00
G32 # home all axes G32 # home all axes
M117 >> heating M117 > heating
SET_LED LED=caselight RED=0.50 GREEN=0.00 BLUE=0.00 SET_LED LED=caselight RED=0.50 GREEN=0.00 BLUE=0.00
G92 E0 # reset extruder G92 E0 # reset extruder
M190 S{BED} # set and wait for bed temperature M190 S{BED} # set and wait for bed temperature
M109 S{EXTRUDER} # set and wait for nozzle temperature M109 S{EXTRUDER} # set and wait for nozzle temperature
M117 >> starting M117 > starting
SET_LED LED=caselight RED=0.50 GREEN=0.50 BLUE=0.50 SET_LED LED=caselight RED=0.50 GREEN=0.50 BLUE=0.50
[gcode_macro PRINT_LAYER_CHANGE]
gcode:
{% set layer=params.LAYER|default(0) %}
{% set layer_z=params.LAYER_Z|default(0) %}
M117 > layer {layer}/{layer_z}mm
[gcode_macro CLEAN_NOZZLE] [gcode_macro CLEAN_NOZZLE]
gcode: gcode:
@ -175,7 +181,7 @@ gcode:
{% set y1=params.y1|default(15.8) %} {% set y1=params.y1|default(15.8) %}
{% set x0=params.x0|default(75) %} {% set x0=params.x0|default(75) %}
{% set x1=params.x1|default(225) %} {% set x1=params.x1|default(225) %}
M117 >> clean nozzle M117 > clean nozzle
G0 Z5 F300 # move Z to travel height G0 Z5 F300 # move Z to travel height
G0 X{x0} Y{y0} F5000 # move to x0/y0 G0 X{x0} Y{y0} F5000 # move to x0/y0
G0 Z0.2 F1500 # lower Z G0 Z0.2 F1500 # lower Z
@ -186,7 +192,7 @@ gcode:
[gcode_macro PRINT_END] [gcode_macro PRINT_END]
gcode: gcode:
M117 >> finished M117 > finished
M400 ; wait for buffer to clear M400 ; wait for buffer to clear
G92 E0 ; zero the extruder G92 E0 ; zero the extruder
G1 E-10.0 F3600 ; retract filament G1 E-10.0 F3600 ; retract filament