diff --git a/cfgs/misc-macros.cfg b/cfgs/misc-macros.cfg index 6e0d4be..5ca1dc1 100644 --- a/cfgs/misc-macros.cfg +++ b/cfgs/misc-macros.cfg @@ -28,11 +28,13 @@ gcode: [gcode_macro _globals] variable_filament_sensor_enabled: 0 # NOTE Enable(1) or disable(0) the filament sensor, if one is connected variable_beeping_enabled: 1 # NOTE Enable(1) or disable(0) beeping everywhere except during gantry calibration -variable_pre_purge_prime_length: 1.4 +variable_bed_temp_over: 10 # NOTE Start print if bed temperature is over by this amount, otherwise wait for temperature drop +variable_pre_purge_prime_length: 1.40 gcode: SET_GCODE_VARIABLE MACRO=_globals VARIABLE=pre_purge_prime_length VALUE={ variable_pre_purge_prime_length } SET_GCODE_VARIABLE MACRO=_globals VARIABLE=filament_sensor_enabled VALUE={ variable_filament_sensor_enabled } SET_GCODE_VARIABLE MACRO=_globals VARIABLE=beeping_enabled VALUE={ variable_beeping_enabled } + SET_GCODE_VARIABLE MACRO=_globals VARIABLE=bed_temp_over VALUE={ variable_bed_temp_over } [gcode_macro CONDITIONAL_BEEP] gcode: @@ -129,7 +131,7 @@ gcode: # Other variables {% set bedtempSlicer = bedtemp %} - {% set bedtempRange = 10 %} + {% set bedtempOver = printer["gcode_macro _globals"].bed_temp_over|default(0)|int %} {% set maxVelocity = printer.configfile.settings.printer.max_velocity|default(200)|int %} {% set maxVelocityAdjusted = (0.90 * maxVelocity * 60)|int %} @@ -142,9 +144,9 @@ gcode: {% set hotendtempStepOne = ((hotendtemp, printer[printer.toolhead.extruder].temperature|int)|min, 150)|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 bed-temp-almost is higher than bed-temp by a maximum of bed-temp-over {% if bedtempAlmost > bedtemp %} - {% if (bedtempAlmost - bedtempRange) <= bedtemp %} + {% if (bedtempAlmost - bedtempOver) <= bedtemp %} {% set bedtemp = bedtempAlmost %} {% endif %} {% endif %}