From 150e1b74251c865803a76ea91df90c63e5bd2194 Mon Sep 17 00:00:00 2001 From: Bassam Husain Date: Sun, 12 Mar 2023 14:35:13 -0400 Subject: [PATCH] Removed CHECK_PRE_PURGE_PRIME_LENGTH macro. --- cfgs/misc-macros.cfg | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/cfgs/misc-macros.cfg b/cfgs/misc-macros.cfg index c7a8d3e..680ec20 100644 --- a/cfgs/misc-macros.cfg +++ b/cfgs/misc-macros.cfg @@ -52,13 +52,6 @@ gcode: SET_FILAMENT_SENSOR SENSOR=filament_sensor ENABLE={NEWSTATUS} {% endif %} -[gcode_macro CHECK_PRE_PURGE_PRIME_LENGTH] -gcode: - {% set PRE_PURGE_PRIME_LENGTH=printer["gcode_macro _globals"].pre_purge_prime_length %} - {% if not PRE_PURGE_PRIME_LENGTH %} - {action_raise_error('Pre purge prime length not found')} - {% endif %} - [gcode_macro M109] rename_existing: M99109 gcode: @@ -85,8 +78,8 @@ gcode: # 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 %} - CHECK_PRE_PURGE_PRIME_LENGTH + {% set PRE_PURGE_PRIME_LENGTH=printer["gcode_macro _globals"].pre_purge_prime_length|default(1.40)|float %} + ADJUST_FILAMENT_SENSOR_STATUS ENABLE=1 G0 Y0 X0 F4000 ; go to tongue of print bed G1 Z0.4 F500.0 ; move bed to nozzle G92 E0.0 ; reset extruder @@ -112,7 +105,6 @@ gcode: {% set chambertemp = params.CHAMBER|default(0)|int %} ADJUST_FILAMENT_SENSOR_STATUS ENABLE=1 - # SET_FILAMENT_SENSOR SENSOR=filament_sensor ENABLE=1 G28 X Y # @@ -131,7 +123,6 @@ gcode: [gcode_macro PRINT_END] gcode: ADJUST_FILAMENT_SENSOR_STATUS ENABLE=0 - # SET_FILAMENT_SENSOR SENSOR=filament_sensor ENABLE=0 CONDITIONAL_BEEP I=2 DUR=30 FREQ=8500 ; NOTE Comment out this line to stop the beeps at the end of a print {% set PRE_PURGE_PRIME_LENGTH=printer["gcode_macro _globals"].pre_purge_prime_length|default(1.40)|float %} M400 ; wait for buffer to clear @@ -200,7 +191,7 @@ gcode: SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=etemp VALUE={printer['extruder'].target} ; set hotend temp variable for reference in resume macro ADJUST_FILAMENT_SENSOR_STATUS ENABLE=0 - # SET_FILAMENT_SENSOR SENSOR=filament_sensor ENABLE=0 + SAVE_GCODE_STATE NAME=PAUSE ; save current print position for resume BASE_PAUSE ; pause print {% if (printer.gcode_move.position.z + z) < printer.toolhead.axis_maximum.z %} ; check that zhop doesn't exceed z max @@ -227,7 +218,6 @@ gcode: {% if printer['pause_resume'].is_paused|int == 1 %} ADJUST_FILAMENT_SENSOR_STATUS ENABLE=1 - # SET_FILAMENT_SENSOR SENSOR=filament_sensor ENABLE=1 SET_IDLE_TIMEOUT TIMEOUT={printer.configfile.settings.idle_timeout.timeout} ; set timeout back to configured value {% if etemp > 0 %}