Autocommit from 2025-08-18 08:29:51

Klipper version: v0.13.0-154-g9346ad19

Moonraker version: v0.9.3-77-gccbfd64

Mainsail version: v2.14.0

macros/main.cfg

@@ -26,7 +26,6 @@ initial_duration: 1
 gcode: 
   STATUS_READY
   SET_FAN_SPEED FAN=SoC SPEED=0.3
-  #SET_FILAMENT_SENSOR SENSOR=SFS_T0 ENABLE=0
 
 [delayed_gcode _INIT_TIMELAPSE_CHECK_TIME]
 initial_duration: 1
@@ -106,21 +105,7 @@ gcode:
     G28 Z
     G0 Z10 F3600
     STATUS_READY    
-    M117
-    
-[gcode_macro SFS_ENABLE] 
-description: Enable smart filament sensor
-gcode:
-    M117 ENABLING the Smart Filament Sensor
-    G92 E0
-    #SET_FILAMENT_SENSOR SENSOR=SFS_T0 ENABLE=1 
-
-[gcode_macro SFS_DISABLE] 
-description: Disable smart filament sensor 
-gcode:
-    M117 DISABLING the Smart Filament Sensor
-    G92 E0
-    #SET_FILAMENT_SENSOR SENSOR=SFS_T0 ENABLE=0
+    M117  
 
 [gcode_macro PRINT_START]
 gcode:
@@ -129,7 +114,7 @@ gcode:
     {% set BED_TEMP = params.BED|default(60)|float %}
     {% set EXTRUDER_TEMP = params.EXTRUDER|default(210)|float %}
     {% set CHAMBER = params.CHAMBER|default(35)|float %}    
-    {% set USE_PURGE = params.PURGE|default(0)|int %}
+    {% set use_purge = params.PURGE|default(0)|int %}
     {% if params.BED_TYPE %}
       INIT_BED_TYPE BED_TYPE="{params.BED_TYPE}"
     {% endif %}
@@ -155,14 +140,13 @@ gcode:
     Smart_Park    
     M117 Heating...
     #M190 S{BED_TEMP}    
-    M109 S{EXTRUDER_TEMP}               ; M109 heat and wait for it to reach temp
-    SFS_ENABLE
+    M109 S{EXTRUDER_TEMP}               ; M109 heat and wait for it to reach temp  
     {% if BED_TEMP > 100 %}
       _NEVERMORE_ON
     {% endif %}
     M117   
     STATUS_CLEANING
-    {% if USE_PURGE == true %}
+    {% if use_purge %}
       VORON_PURGE
     {% endif %}    
     STATUS_PRINTING
@@ -173,8 +157,22 @@ gcode:
     
 
 [gcode_macro PRINT_END]
-#   Use PRINT_END for the slicer ending script - please customise for your slicer of choice
-variable_retract_amount: 16 #
+gcode:
+    {% set use_park = params.PARK|default(1)|int %}   
+    {% if use_park %}
+      PRINT_END_PARK
+    {% endif %}
+    TURN_OFF_HEATERS
+    M107                           ; turn off fan
+    _NEVERMORE_OFF
+    SET_STEPPER_ENABLE STEPPER=extruder ENABLE=0 #disable stepper
+    STATUS_OFF    
+    INIT_BED_TYPE BED_TYPE="None"    
+    M400    
+    TIMELAPSE_TAKE_FRAME
+
+[gcode_macro PRINT_END_PARK]
+variable_retract_amount: 18 #
 variable_park_speed: 6000 #3600
 variable_park_xy: [350,350]
 variable_up_z: 4 #12
@@ -184,24 +182,13 @@ gcode:
     SET_SKEW CLEAR=1
     M400                           ; wait for buffer to clear
     G92 E0                         ; zero the extruder
-    G1 E-{retract_amount} F3600     ; retract filament {max_velocity}
+    G1 E-{retract_amount} F{max_velocity} ;3600     ; retract filament {max_velocity}
     G91                            ; relative positioning
     G0 Z1.00 X20.0 Y20.0 F20000    ; move nozzle to remove stringing
-    TURN_OFF_HEATERS
-    M107                           ; turn off fan
     G1 Z{up_z} F3000                    ; move nozzle up 2mm
     G90                            ; absolute positioning
     G0 X{park_xy[0]} Y{park_xy[1]} F{park_speed}            ; park nozzle at rear
-    #BED_MESH_CLEAR
-    SFS_DISABLE
-    _NEVERMORE_OFF
-    #M141 S35
-    SET_STEPPER_ENABLE STEPPER=extruder ENABLE=0 #disable stepper
-    STATUS_OFF    
     SET_VELOCITY_DEFAULT
-    INIT_BED_TYPE BED_TYPE="None"    
-    M400    
-    TIMELAPSE_TAKE_FRAME
     
 
 
@@ -256,9 +243,7 @@ gcode:
     
     {% if printer['pause_resume'].is_paused|int == 0 %}     
         SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=zhop VALUE={z}                              ; set z hop variable for reference in resume macro
-        SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=etemp VALUE={printer['extruder'].target}    ; set hotend temp variable for reference in resume macro
-                                
-        SFS_DISABLE                                  ; disable filament sensor       
+        SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=etemp VALUE={printer['extruder'].target}    ; set hotend temp variable for reference in resume macro                                      
         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
@@ -284,7 +269,6 @@ gcode:
     {% set e = params.E|default(2.5)|int %}
     
     {% if printer['pause_resume'].is_paused|int == 1 %}
-        SFS_ENABLE                          ; enable filament sensor
         #RESETRGB                                                                    ; reset LCD color
         SET_IDLE_TIMEOUT TIMEOUT={printer.configfile.settings.idle_timeout.timeout}  ; set timeout back to configured value
         {% if etemp > 0 %}