修复D600pro2、D1000机型断料自动切头时，喷头偏移值未应用的问题

(cherry picked from commit 58678be1f83d74ac0e3c2435ffb5d71078918f47)

config/CreatBot_D1000/base.cfg

@@ -776,6 +776,22 @@ gcode:
     {% endif %}
   {% endif %}
 
+[gcode_macro _REAPPLY_OFFSET]
+gcode:
+    {% set re_extruder = printer['gcode_macro RESUME'].resume_extruder|default("extruder") %}
+    {% set svv = printer.save_variables.variables %}
+    {% set x_offset = svv.nozzle_x_offset_val|default(0)|float %}
+    {% set y_offset = svv.nozzle_y_offset_val|default(0)|float %}
+    {% set z_offset = svv.nozzle_z_offset_val|default(0)|float %}
+    {% set x_offset = x_offset - 59 %}
+    {% set is_extruder = printer.toolhead.extruder == "extruder" %}
+
+    {% if printer.toolhead.extruder!= re_extruder %}
+        SET_GCODE_OFFSET Z={0 if is_extruder else z_offset} MOVE=1
+        SET_GCODE_OFFSET Y={0 if is_extruder else y_offset}
+        SET_GCODE_OFFSET X={0 if is_extruder else x_offset}
+    {% endif %}
+
 [gcode_macro RESUME]
 description: Resume the actual running print
 rename_existing: RESUME_BASE
@@ -845,6 +861,7 @@ gcode:
             {client.user_resume_macro|default("")}
             _CLIENT_EXTRUDE
             RESUME_BASE VELOCITY={params.VELOCITY|default(sp_move)}
+            _REAPPLY_OFFSET
             SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE="None"
         {% else %}
             {% set msg = "Left" if printer.toolhead.extruder == "extruder" else "Right" %}

config/CreatBot_D1000_V0/base.cfg

@@ -706,6 +706,22 @@ gcode:
     {% endif %}
   {% endif %}
 
+[gcode_macro _REAPPLY_OFFSET]
+gcode:
+    {% set re_extruder = printer['gcode_macro RESUME'].resume_extruder|default("extruder") %}
+    {% set svv = printer.save_variables.variables %}
+    {% set x_offset = svv.nozzle_x_offset_val|default(0)|float %}
+    {% set y_offset = svv.nozzle_y_offset_val|default(0)|float %}
+    {% set z_offset = svv.nozzle_z_offset_val|default(0)|float %}
+    {% set x_offset = x_offset - 59 %}
+    {% set is_extruder = printer.toolhead.extruder == "extruder" %}
+
+    {% if printer.toolhead.extruder!= re_extruder %}
+        SET_GCODE_OFFSET Z={0 if is_extruder else z_offset} MOVE=1
+        SET_GCODE_OFFSET Y={0 if is_extruder else y_offset}
+        SET_GCODE_OFFSET X={0 if is_extruder else x_offset}
+    {% endif %}
+
 [gcode_macro RESUME]
 description: Resume the actual running print
 rename_existing: RESUME_BASE
@@ -758,6 +774,7 @@ gcode:
             {client.user_resume_macro|default("")}
             _CLIENT_EXTRUDE
             RESUME_BASE VELOCITY={params.VELOCITY|default(sp_move)}
+            _REAPPLY_OFFSET
             SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE="None"
         {% else %}
             {% set msg = "Left" if printer.toolhead.extruder == "extruder" else "Right" %}

config/CreatBot_D600Pro2/base.cfg

@@ -777,6 +777,22 @@ gcode:
     {% endif %}
   {% endif %}
 
+[gcode_macro _REAPPLY_OFFSET]
+gcode:
+    {% set re_extruder = printer['gcode_macro RESUME'].resume_extruder|default("extruder") %}
+    {% set svv = printer.save_variables.variables %}
+    {% set x_offset = svv.nozzle_x_offset_val|default(0)|float %}
+    {% set y_offset = svv.nozzle_y_offset_val|default(0)|float %}
+    {% set z_offset = svv.nozzle_z_offset_val|default(0)|float %}
+    {% set x_offset = x_offset - 59 %}
+    {% set is_extruder = printer.toolhead.extruder == "extruder" %}
+
+    {% if printer.toolhead.extruder!= re_extruder %}
+        SET_GCODE_OFFSET Z={0 if is_extruder else z_offset} MOVE=1
+        SET_GCODE_OFFSET Y={0 if is_extruder else y_offset}
+        SET_GCODE_OFFSET X={0 if is_extruder else x_offset}
+    {% endif %}
+
 [gcode_macro RESUME]
 description: Resume the actual running print
 rename_existing: RESUME_BASE
@@ -847,6 +863,7 @@ gcode:
             {client.user_resume_macro|default("")}
             _CLIENT_EXTRUDE
             RESUME_BASE VELOCITY={params.VELOCITY|default(sp_move)}
+            _REAPPLY_OFFSET
             SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE="None"
         {% else %}
             {% set msg = "Left" if printer.toolhead.extruder == "extruder" else "Right" %}

config/CreatBot_D600Pro2_V0/base.cfg

@@ -700,6 +700,22 @@ gcode:
     {% endif %}
   {% endif %}
 
+[gcode_macro _REAPPLY_OFFSET]
+gcode:
+    {% set re_extruder = printer['gcode_macro RESUME'].resume_extruder|default("extruder") %}
+    {% set svv = printer.save_variables.variables %}
+    {% set x_offset = svv.nozzle_x_offset_val|default(0)|float %}
+    {% set y_offset = svv.nozzle_y_offset_val|default(0)|float %}
+    {% set z_offset = svv.nozzle_z_offset_val|default(0)|float %}
+    {% set x_offset = x_offset - 59 %}
+    {% set is_extruder = printer.toolhead.extruder == "extruder" %}
+
+    {% if printer.toolhead.extruder!= re_extruder %}
+        SET_GCODE_OFFSET Z={0 if is_extruder else z_offset} MOVE=1
+        SET_GCODE_OFFSET Y={0 if is_extruder else y_offset}
+        SET_GCODE_OFFSET X={0 if is_extruder else x_offset}
+    {% endif %}
+
 [gcode_macro RESUME]
 description: Resume the actual running print
 rename_existing: RESUME_BASE
@@ -753,6 +769,7 @@ gcode:
             {client.user_resume_macro|default("")}
             _CLIENT_EXTRUDE
             RESUME_BASE VELOCITY={params.VELOCITY|default(sp_move)}
+            _REAPPLY_OFFSET
             SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE="None"
         {% else %}
             {% set msg = "Left" if printer.toolhead.extruder == "extruder" else "Right" %}