From 75da8e8e634d4b65f1c8834421ae5638c7b479e0 Mon Sep 17 00:00:00 2001
From: ruipeng <1041589370@qq.com>
Date: Fri, 17 Jan 2025 09:10:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8DV0=E7=89=88=E6=9C=BA?=
 =?UTF-8?q?=E5=9E=8BT=5Ffan=E9=80=BB=E8=BE=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/CreatBot_D1000_V0/base.cfg    | 2 +-
 config/CreatBot_D600Pro2_V0/base.cfg | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/CreatBot_D1000_V0/base.cfg b/config/CreatBot_D1000_V0/base.cfg
index a9a85bf55..4ee46ef9b 100644
--- a/config/CreatBot_D1000_V0/base.cfg
+++ b/config/CreatBot_D1000_V0/base.cfg
@@ -173,7 +173,7 @@ max_power: 1.0
 pin:PC6
 max_power: 1.0
 kick_start_time: 0.5
-heater: extruder
+heater: extruder, extruder1
 off_below: 0.10
 heater_temp: 100
 
diff --git a/config/CreatBot_D600Pro2_V0/base.cfg b/config/CreatBot_D600Pro2_V0/base.cfg
index b93483986..71dfaf638 100644
--- a/config/CreatBot_D600Pro2_V0/base.cfg
+++ b/config/CreatBot_D600Pro2_V0/base.cfg
@@ -163,6 +163,7 @@ runout_gcode: _RUNOUT_HANDLE
 event_delay: 3.0
 pause_delay: 0.5
 switch_pin: ^PC15
+
 [fan]
 pin:PC7
 kick_start_time: 0.5
@@ -173,7 +174,7 @@ max_power: 1.0
 pin:PC6
 max_power: 1.0
 kick_start_time: 0.5
-heater: extruder
+heater: extruder, extruder1
 off_below: 0.10
 heater_temp: 100
 

From 32fc128f991b4a336793a451da30273652b827f7 Mon Sep 17 00:00:00 2001
From: ruipeng <1041589370@qq.com>
Date: Fri, 17 Jan 2025 10:42:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8DF430NX=E5=81=9C=E9=9D=A0?=
 =?UTF-8?q?=E5=96=B7=E5=A4=B4=E4=B8=8E=E5=81=8F=E7=A7=BB=E5=80=BC=E7=9A=84?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/CreatBot_F430NX/base.cfg | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/config/CreatBot_F430NX/base.cfg b/config/CreatBot_F430NX/base.cfg
index 131829e7b..09485c007 100644
--- a/config/CreatBot_F430NX/base.cfg
+++ b/config/CreatBot_F430NX/base.cfg
@@ -470,14 +470,15 @@ gcode:
     {% endif %}
 
 [gcode_macro _PARK_extruder1]
+variable_x_offset: 0
 gcode:
-    {% set svv = printer.save_variables.variables %}
-    {% set x_offset = svv.nozzle_x_offset_val|default(0)|float %}
     ACTIVATE_EXTRUDER EXTRUDER=extruder1
     SET_DUAL_CARRIAGE CARRIAGE=1
     SAVE_GCODE_STATE NAME=park_extruder1
     G90
-    G1 X{475 + (x_offset if x_offset >= 0 else -x_offset)} F6000
+    G1 X{475 - (x_offset if x_offset >= 0 else 0)} F6000
+    G91
+    G1 X{0 if x_offset >= 0 else -x_offset} F6000
     RESTORE_GCODE_STATE NAME=park_extruder1
 
 [gcode_macro T1]
@@ -501,7 +502,8 @@ gcode:
             SET_DUAL_CARRIAGE CARRIAGE=1
             SAVE_GCODE_STATE NAME=park1
             G90
-            G1 X{455 + (x_offset if x_offset >= 0 else -x_offset)} F6000
+            G1 X{455-x_offset} F6000
+            SET_GCODE_VARIABLE MACRO=_PARK_extruder1 VARIABLE=x_offset VALUE="{x_offset}"
             RESTORE_GCODE_STATE NAME=park1
             {% if "z" in printer.toolhead.homed_axes | lower %}
                 SET_GCODE_OFFSET Z={z_offset} MOVE=1