优化修改挤出量为全局生效打印结束和取消打印时重置

config/CreatBot_D1000/base.cfg

@@ -445,7 +445,7 @@ gcode:
 [gcode_macro _CANCEL_PRINT_BASE]
 description: Call when cancelled to print
 gcode:
-    # Nothing
+    M221 S100
 
 [gcode_macro START_PRINT]
 gcode:
@@ -489,6 +489,7 @@ gcode:
 [gcode_macro END_PRINT]
 gcode:
     M400
+    M221 S100
     G92 E0
     G1 E-10.0 F3600
     G91

config/CreatBot_D1000_V0/base.cfg

@@ -377,7 +377,7 @@ gcode:
 [gcode_macro _CANCEL_PRINT_BASE]
 description: Call when cancelled to print
 gcode:
-    # Nothing
+    M221 S100
 
 [gcode_macro START_PRINT]
 gcode:
@@ -421,6 +421,7 @@ gcode:
 [gcode_macro END_PRINT]
 gcode:
     M400
+    M221 S100
     G92 E0
     G1 E-10.0 F3600
     G91

config/CreatBot_D600Pro2/base.cfg

@@ -445,7 +445,7 @@ gcode:
 [gcode_macro _CANCEL_PRINT_BASE]
 description: Call when cancelled to print
 gcode:
-    # Nothing
+    M221 S100
 
 [gcode_macro START_PRINT]
 gcode:
@@ -489,6 +489,7 @@ gcode:
 [gcode_macro END_PRINT]
 gcode:
     M400
+    M221 S100
     G92 E0
     G1 E-10.0 F3600
     G91

config/CreatBot_D600Pro2_V0/base.cfg

@@ -378,7 +378,7 @@ gcode:
 [gcode_macro _CANCEL_PRINT_BASE]
 description: Call when cancelled to print
 gcode:
-    # Nothing
+    M221 S100
 
 [gcode_macro START_PRINT]
 gcode:
@@ -422,6 +422,7 @@ gcode:
 [gcode_macro END_PRINT]
 gcode:
     M400
+    M221 S100
     G92 E0
     G1 E-10.0 F3600
     G91

config/CreatBot_F430NX/base.cfg

@@ -592,6 +592,7 @@ gcode:
 [gcode_macro _CANCEL_PRINT_BASE]
 description: Call when cancelled to print
 gcode:
+    M221 S100
     _ACTIVATE_PRIMARY_MODE
 
 [gcode_macro START_PRINT]
@@ -638,6 +639,7 @@ gcode:
     {% set svv = printer.save_variables.variables %}
     {% set y_offset = svv.nozzle_y_offset_val|default(0)|float %}
     M400
+    M221 S100
     G92 E0
     G1 E-10.0 F3600
     G91

klippy/extras/gcode_move.py

@@ -69,7 +69,7 @@ class GCodeMove:
                      self.extrude_factor, self.speed)
     def _handle_activate_extruder(self):
         self.reset_last_position()
-        self.extrude_factor = 1.
+        # self.extrude_factor = 1.
         self.base_position[3] = self.last_position[3]
     def _handle_home_rails_end(self, homing_state, rails):
         self.reset_last_position()