From a7b54f505fc5f1fde978ca2ecca1b202d404801f Mon Sep 17 00:00:00 2001
From: zkk <1007518571@qq.com>
Date: Tue, 13 May 2025 09:27:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BF=AE=E6=94=B9=E6=8C=A4?=
 =?UTF-8?q?=E5=87=BA=E9=87=8F=E4=B8=BA=E5=85=A8=E5=B1=80=E7=94=9F=E6=95=88?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E7=BB=93=E6=9D=9F=E5=92=8C=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=B6=E9=87=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/CreatBot_D1000/base.cfg       | 3 ++-
 config/CreatBot_D1000_V0/base.cfg    | 3 ++-
 config/CreatBot_D600Pro2/base.cfg    | 3 ++-
 config/CreatBot_D600Pro2_V0/base.cfg | 3 ++-
 config/CreatBot_F430NX/base.cfg      | 2 ++
 klippy/extras/gcode_move.py          | 2 +-
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/config/CreatBot_D1000/base.cfg b/config/CreatBot_D1000/base.cfg
index 8178a6d73..688f53f32 100644
--- a/config/CreatBot_D1000/base.cfg
+++ b/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
diff --git a/config/CreatBot_D1000_V0/base.cfg b/config/CreatBot_D1000_V0/base.cfg
index 9ed9a8543..5bbaa6dce 100644
--- a/config/CreatBot_D1000_V0/base.cfg
+++ b/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
diff --git a/config/CreatBot_D600Pro2/base.cfg b/config/CreatBot_D600Pro2/base.cfg
index e5c6e4d91..1122cbe0f 100644
--- a/config/CreatBot_D600Pro2/base.cfg
+++ b/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
diff --git a/config/CreatBot_D600Pro2_V0/base.cfg b/config/CreatBot_D600Pro2_V0/base.cfg
index 4f10bf87a..9f8ea2579 100644
--- a/config/CreatBot_D600Pro2_V0/base.cfg
+++ b/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
diff --git a/config/CreatBot_F430NX/base.cfg b/config/CreatBot_F430NX/base.cfg
index f40c2d214..8bc05b9a2 100644
--- a/config/CreatBot_F430NX/base.cfg
+++ b/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
diff --git a/klippy/extras/gcode_move.py b/klippy/extras/gcode_move.py
index 098b0b3b6..4e3e7b144 100644
--- a/klippy/extras/gcode_move.py
+++ b/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()