From 682e343d6176c1c0764a7befd12d7971374b2b29 Mon Sep 17 00:00:00 2001
From: ruipeng <1041589370@qq.com>
Date: Mon, 30 Dec 2024 17:27:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BF=85=E9=A1=BB=E5=9B=9E?=
 =?UTF-8?q?=E9=9B=B6=E5=90=8E=E6=89=8D=E8=83=BD=E5=8F=96=E6=B6=88=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/CreatBot_D1000/base.cfg       | 6 ++++--
 config/CreatBot_D1000_V0/base.cfg    | 6 ++++--
 config/CreatBot_D600Pro2/base.cfg    | 6 ++++--
 config/CreatBot_D600Pro2_V0/base.cfg | 6 ++++--
 config/CreatBot_F430NX/base.cfg      | 6 ++++--
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/config/CreatBot_D1000/base.cfg b/config/CreatBot_D1000/base.cfg
index 3a4b2b846..01936157e 100644
--- a/config/CreatBot_D1000/base.cfg
+++ b/config/CreatBot_D1000/base.cfg
@@ -716,8 +716,10 @@ gcode:
 
 [gcode_macro _USER_CANCEL]
 gcode:
-    G91
-    G1 Z30 F600 ; lift nozzle
+    {% if 'z' in printer.toolhead.homed_axes %}
+        G91
+        G1 Z30 F600 ; lift nozzle
+    {% endif %}
     M84
 
 [gcode_macro _CLIENT_EXTRUDE]
diff --git a/config/CreatBot_D1000_V0/base.cfg b/config/CreatBot_D1000_V0/base.cfg
index 058208929..5bf8e9134 100644
--- a/config/CreatBot_D1000_V0/base.cfg
+++ b/config/CreatBot_D1000_V0/base.cfg
@@ -652,8 +652,10 @@ gcode:
 
 [gcode_macro _USER_CANCEL]
 gcode:
-    G91
-    G1 Z30 F600 ; lift nozzle
+    {% if 'z' in printer.toolhead.homed_axes %}
+        G91
+        G1 Z30 F600 ; lift nozzle
+    {% endif %}
     M84
 
 [gcode_macro _CLIENT_EXTRUDE]
diff --git a/config/CreatBot_D600Pro2/base.cfg b/config/CreatBot_D600Pro2/base.cfg
index 8d9fc7c34..ae9fcd4ea 100644
--- a/config/CreatBot_D600Pro2/base.cfg
+++ b/config/CreatBot_D600Pro2/base.cfg
@@ -709,8 +709,10 @@ gcode:
 
 [gcode_macro _USER_CANCEL]
 gcode:
-    G91
-    G1 Z30 F600 ; lift nozzle
+    {% if 'z' in printer.toolhead.homed_axes %}
+        G91
+        G1 Z30 F600 ; lift nozzle
+    {% endif %}
     M84
 
 [gcode_macro _CLIENT_EXTRUDE]
diff --git a/config/CreatBot_D600Pro2_V0/base.cfg b/config/CreatBot_D600Pro2_V0/base.cfg
index 3a2b8e3d6..11c8ac34f 100644
--- a/config/CreatBot_D600Pro2_V0/base.cfg
+++ b/config/CreatBot_D600Pro2_V0/base.cfg
@@ -645,8 +645,10 @@ gcode:
 
 [gcode_macro _USER_CANCEL]
 gcode:
-    G91
-    G1 Z30 F600 ; lift nozzle
+    {% if 'z' in printer.toolhead.homed_axes %}
+        G91
+        G1 Z30 F600 ; lift nozzle
+    {% endif %}
     M84
 
 [gcode_macro _CLIENT_EXTRUDE]
diff --git a/config/CreatBot_F430NX/base.cfg b/config/CreatBot_F430NX/base.cfg
index 6356e7df8..77c41837b 100644
--- a/config/CreatBot_F430NX/base.cfg
+++ b/config/CreatBot_F430NX/base.cfg
@@ -888,8 +888,10 @@ gcode:
 
 [gcode_macro _USER_CANCEL]
 gcode:
-    G91
-    G1 Z30 F600 ; lift nozzle
+    {% if 'z' in printer.toolhead.homed_axes %}
+        G91
+        G1 Z30 F600 ; lift nozzle
+    {% endif %}
     M84
 
 [gcode_macro _CLIENT_EXTRUDE]