From d227fcb58fe110af5655fa3b36a3985e3c5380d8 Mon Sep 17 00:00:00 2001 From: Bassam Husain Date: Mon, 27 Mar 2023 16:57:42 -0400 Subject: [PATCH] Re-added temperature_wait. --- cfgs/misc-macros.cfg | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/cfgs/misc-macros.cfg b/cfgs/misc-macros.cfg index 117bce1..39b5675 100644 --- a/cfgs/misc-macros.cfg +++ b/cfgs/misc-macros.cfg @@ -52,31 +52,29 @@ gcode: SET_FILAMENT_SENSOR SENSOR=filament_sensor ENABLE={NEWSTATUS} {% endif %} -# [gcode_macro M109] -# rename_existing: M99109 -# gcode: -# #Parameters -# {% set s = params.S|float %} +[gcode_macro M109] +rename_existing: M99109 +gcode: + #Parameters + {% set s = params.S|float %} -# M104 {% for p in params %}{'%s%s' % (p, params[p])}{% endfor %} ; Set hotend temp -# {% if s != 0 %} -# TEMPERATURE_WAIT SENSOR=extruder MINIMUM={s} MAXIMUM={s+1} ; Wait for hotend temp (within 1 degree) -# {% endif %} + M104 {% for p in params %}{'%s%s' % (p, params[p])}{% endfor %} ; Set hotend temp + {% if s != 0 %} + TEMPERATURE_WAIT SENSOR=extruder MINIMUM={s} MAXIMUM={s+1} ; Wait for hotend temp (within 1 degree) + {% endif %} -# [gcode_macro M190] -# rename_existing: M99190 -# gcode: -# #Parameters -# {% set s = params.S|float %} +[gcode_macro M190] +rename_existing: M99190 +gcode: + #Parameters + {% set s = params.S|float %} -# M140 {% for p in params %}{'%s%s' % (p, params[p])}{% endfor %} ; Set bed temp -# {% if s != 0 %} -# TEMPERATURE_WAIT SENSOR=heater_bed MINIMUM={s} MAXIMUM={s+1} ; Wait for bed temp (within 1 degree) -# {% endif %} + M140 {% for p in params %}{'%s%s' % (p, params[p])}{% endfor %} ; Set bed temp + {% if s != 0 %} + TEMPERATURE_WAIT SENSOR=heater_bed MINIMUM={s} MAXIMUM={s+1} ; Wait for bed temp (within 1 degree) + {% endif %} [gcode_macro PURGE_LINE] -# https://github.com/JoeCat1207/V0.1-Purge-line-SuperSlicer/blob/main/Purgeline.txt -# https://github.com/VoronDesign/Voron-Switchwire/blob/200cdae033c59ef81f67c4235469da7ca66d53a1/Firmware/skr_mini_e3_v2_config.cfg gcode: {% set PRE_PURGE_PRIME_LENGTH=printer["gcode_macro _globals"].pre_purge_prime_length|default(1.40)|float %} ADJUST_FILAMENT_SENSOR_STATUS ENABLE=1