From 385adb528345e4bb1ebadb72adb7ca850117b6e3 Mon Sep 17 00:00:00 2001 From: MangaValk Date: Wed, 11 Nov 2026 23:04:36 +0100 Subject: [PATCH] SpoolSense UPDATE_TAG also on a cancelled print Moved from PRINT_END to _PRINT_CLEANUP, which PRINT_END and CANCEL_PRINT both run, so a cancelled print's filament is deducted too. Co-Authored-By: Claude Opus 5.5 --- macros/print/print_start_end.cfg | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/macros/print/print_start_end.cfg b/macros/print/print_start_end.cfg index d058e3b..5dcb64d 100644 --- a/macros/print/print_start_end.cfg +++ b/macros/print/print_start_end.cfg @@ -348,16 +348,10 @@ gcode: RESTORE_GCODE_STATE NAME=STATE_PRINT_END # After the restore: RESTORE_GCODE_STATE also restores the flow (M221) _PRINT_CLEANUP - # SpoolSense (spoolsense.cfg in the config folder, not in this repo): the - # middleware deducts this print's filament and writes it to the spool's - # NFC tag at its next scan - {% if 'gcode_macro UPDATE_TAG' in printer %} - UPDATE_TAG - {% endif %} # End-of-print cleanup shared by PRINT_END and CANCEL_PRINT [gcode_macro _PRINT_CLEANUP] -description: Heaters (incl. chamber heater) and part fan off, flow back to 100%, bdwidth off, mesh and skew cleared, nozzle guard off, AFC runouts cleared, auto-resume off +description: Heaters (incl. chamber heater) and part fan off, flow back to 100%, bdwidth off, mesh and skew cleared, nozzle guard off, AFC runouts cleared, auto-resume off, SpoolSense tag update gcode: _GUARD_OFF ; a print start that failed while it was armed _BED_CHECK_RESET ; cancelled while the bed check had it paused @@ -384,6 +378,12 @@ gcode: SET_RUNOUT LANE={lane} RUNOUT=NONE {% endfor %} {% endif %} + # SpoolSense (spoolsense.cfg in the config folder, not in this repo): the + # middleware deducts the filament of this print (also a cancelled one) and + # writes it to the spool's NFC tag at its next scan + {% if 'gcode_macro UPDATE_TAG' in printer %} + UPDATE_TAG + {% endif %} # AFC buffer fault detection (filament_error_sensitivity, 0-10, higher = # pauses sooner) with its own value during the first layer.