Pulling in print_start from master branch.

This commit is contained in:
Bassam Husain
2023-05-21 17:33:25 -04:00
parent b83a7c96b7
commit 89d6c0d09f

View File

@@ -128,6 +128,9 @@ gcode:
{% set hotendtemp = params.HOTEND|int %} {% set hotendtemp = params.HOTEND|int %}
{% set chambertemp = params.CHAMBER|default(0)|int %} {% set chambertemp = params.CHAMBER|default(0)|int %}
# Other variables
{% set bedtempSlicer = bedtemp %}
{% set bedtempRange = 10 %}
{% set maxVelocity = printer.configfile.settings.printer.max_velocity|default(200)|int %} {% set maxVelocity = printer.configfile.settings.printer.max_velocity|default(200)|int %}
{% set maxVelocityAdjusted = (0.90 * maxVelocity * 60)|int %} {% set maxVelocityAdjusted = (0.90 * maxVelocity * 60)|int %}
@@ -136,10 +139,17 @@ gcode:
{% set startY = printer.configfile.settings.safe_z_home.home_xy_position[1]|float %} {% set startY = printer.configfile.settings.safe_z_home.home_xy_position[1]|float %}
{% endif %} {% endif %}
{% set bedtempAlmost = (bedtemp - 2, 0)|max %} {% set bedtempAlmost = ((bedtemp - 2, 0, printer.heater_bed.temperature|int)|max, bedtemp)|max %}
{% set hotendtempStepOne = ((hotendtemp, printer[printer.toolhead.extruder].temperature|int)|min, 150)|max %} {% set hotendtempStepOne = ((hotendtemp, printer[printer.toolhead.extruder].temperature|int)|min, 150)|max %}
{% set hotendtempStepTwo = ((hotendtemp, printer[printer.toolhead.extruder].temperature|int)|min, 170)|max %} {% set hotendtempStepTwo = ((hotendtemp, printer[printer.toolhead.extruder].temperature|int)|min, 170)|max %}
# If bed-temp-almost is higher than bed-temp by a maximum of 10C
{% if bedtempAlmost > bedtemp %}
{% if (bedtempAlmost - bedtempRange) <= bedtemp %}
{% set bedtemp = bedtempAlmost %}
{% endif %}
{% endif %}
BED_MESH_PROFILE LOAD=default ; NOTE if not using a mesh, comment out this line BED_MESH_PROFILE LOAD=default ; NOTE if not using a mesh, comment out this line
ADJUST_FILAMENT_SENSOR_STATUS ENABLE=1 ADJUST_FILAMENT_SENSOR_STATUS ENABLE=1
@@ -154,6 +164,7 @@ gcode:
M190 S{bedtempAlmost} ; set & wait for bed temp M190 S{bedtempAlmost} ; set & wait for bed temp
M104 S{hotendtempStepTwo} ; set & don't wait for hotend temp M104 S{hotendtempStepTwo} ; set & don't wait for hotend temp
M190 S{bedtemp} ; set & wait for bed temp M190 S{bedtemp} ; set & wait for bed temp
M140 S{bedtempSlicer} ; set & don't wait for bed temp ; set temp to sliced setting regardless
M104 S{hotendtemp} ; set & don't wait for hotend temp M104 S{hotendtemp} ; set & don't wait for hotend temp
G28 Z ; final z homing G28 Z ; final z homing