support turning off heaters and fans as well as motors for canceling …

…a print

k1/start_end.cfg

@@ -53,8 +53,8 @@ variable_speed_unretract: 35.0
 variable_speed_hop: 15.0
 # move speed in mm/s
 variable_speed_move: 100.0
-# do not change this, it forces cancel print to turn the motors off at the end
-variable_user_cancel_macro: "M84"
+# do not change this, this handles cancel print
+variable_user_cancel_macro: "_ON_CANCEL"
 gcode:
 
 [virtual_pins]
@@ -82,6 +82,20 @@ gcode:
     {% endif %}
 
 
+[gcode_macro _ON_CANCEL]
+gcode:
+    # if there is an outstanding end print going on, we need to cancel it
+    UPDATE_DELAYED_GCODE ID=wait_for_end_print_cooldown DURATION=0
+
+    {% if printer["gcode_macro _SAF_ON_CANCEL"] != null %}
+        _SAF_ON_CANCEL
+    {% endif %}
+
+    TURN_OFF_HEATERS
+    TURN_OFF_FANS
+    M84
+
+
 [gcode_macro START_PRINT]
 gcode:
     {% set BED_TEMP=params.BED_TEMP|default(65)|float %}