Merge branch 'bed-temp' into personal

This commit is contained in:
Bassam Husain
2023-05-10 18:50:02 -04:00

View File

@@ -124,10 +124,12 @@ gcode:
gcode: gcode:
# Parameters # Parameters
{% set bedtemp = params.BED|int %} {% set bedtemp = params.BED|int %}
{% set bedtempSlicer = bedtemp %}
{% 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 %}
@@ -140,33 +142,36 @@ gcode:
{% 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 > bedtemp %}
{% set bedtemp = bedtempAlmost %} {% if (bedtempAlmost - bedtempRange) <= bedtemp %}
{% set bedtemp = bedtempAlmost %}
{% endif %}
{% 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
G90 ; absolute positioning G90 ; absolute positioning
M140 S{bedtempAlmost} ; set & don't wait for bed temp M140 S{bedtempAlmost} ; set & don't wait for bed temp
M104 S{hotendtempStepOne} ; set & don't wait for hotend temp M104 S{hotendtempStepOne} ; set & don't wait for hotend temp
G28 X Y G28 X Y
{% if printer.configfile.settings.safe_z_home %} {% if printer.configfile.settings.safe_z_home %}
G1 X{startX} Y{startY} F{maxVelocityAdjusted} G1 X{startX} Y{startY} F{maxVelocityAdjusted}
{% endif %} {% endif %}
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 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
G1 X0 Y0 F{maxVelocityAdjusted} G1 X0 Y0 F{maxVelocityAdjusted}
M109 S{hotendtemp} ; set & wait for hotend temp M109 S{hotendtemp} ; set & wait for hotend temp
G1 Z20 F3000 ; move nozzle away from bed G1 Z20 F3000 ; move nozzle away from bed
[gcode_macro PRINT_END] [gcode_macro PRINT_END]
gcode: gcode: