v2.4: update macros, always perform qgl

This commit is contained in:
Konstantin Koslowski 2021-10-29 16:12:12 +02:00
parent 05a1eb30e1
commit 830ceb1e3f

View file

@ -95,15 +95,16 @@ gcode:
## PRINT_ ## PRINT_
[gcode_macro PRINT_START] [gcode_macro PRINT_START]
gcode: gcode:
{% set BED=params.BED|default(100) %} {% set BED=params.BED|default(100)|int %}
{% set EXTRUDER=params.EXTRUDER|default(250) %} {% set EXTRUDER=params.EXTRUDER|default(250)|int %}
{% set QGL=params.QGL|default(1)|int %} {% set CHAMBER=params.CHAMBER|default(0)|int %}
{% set BMC=params.BMC|default(0)|int %} {% set BMC=params.BMC|default(0)|int %}
{% set PURGE=params.PURGE|default(1)|int %} {% set PURGE=params.PURGE|default(1)|int %}
{% set SOAK=params.SOAK|default(0)|int * 1000 * 60 %} {% set SOAK=params.SOAK|default(0)|int * 1000 * 60 %}
{% set Z_ADJUST=params.Z_ADJUST|default(0.0)|float %} {% set Z_ADJUST=params.Z_ADJUST|default(0.0)|float %}
# TODO # TODO
{% set ERCF=params.ERCF|default(0) %} {% set ERCF=params.ERCF|default(0) %}
{action_respond_info("starting print BED=%d, EXTRUDER=%d, BMC=%d, PURGE=%d, SOAK=%d, Z_AJUST=%f" % (BED, EXTRUDER, BMC, PURGE, SOAK, Z_ADJUST))}
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
G4 P2000 G4 P2000
@ -123,10 +124,8 @@ gcode:
{% endif %} {% endif %}
M117 > home M117 > home
G28 G28
{% if QGL %} M117 > qgl
M117 > qgl QUAD_GANTRY_LEVEL
QUAD_GANTRY_LEVEL
{% endif %}
M117 > brushie M117 > brushie
BRUSHIE BRUSHIE
M117 > calibrate z M117 > calibrate z
@ -145,6 +144,7 @@ gcode:
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
TEMPERATURE_WAIT SENSOR="temperature_sensor chamber" MINIMUM={CHAMBER} # wait for chamber temp
{% if SOAK > 0 %} {% if SOAK > 0 %}
M117 > soaking for {SOAK/1000/60|int} min M117 > soaking for {SOAK/1000/60|int} min
G4 P{SOAK} G4 P{SOAK}