From 5ae49893586cf11c8aa9290ac61a0da0b4bda025 Mon Sep 17 00:00:00 2001 From: ruipeng <1041589370@qq.com> Date: Wed, 19 Mar 2025 16:50:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DD600pro2=E3=80=81D1000?= =?UTF-8?q?=E6=9C=BA=E5=9E=8B=E6=96=AD=E6=96=99=E8=87=AA=E5=8A=A8=E5=88=87?= =?UTF-8?q?=E5=A4=B4=E6=97=B6=EF=BC=8C=E5=96=B7=E5=A4=B4=E5=81=8F=E7=A7=BB?= =?UTF-8?q?=E5=80=BC=E6=9C=AA=E5=BA=94=E7=94=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 58678be1f83d74ac0e3c2435ffb5d71078918f47) --- config/CreatBot_D1000/base.cfg | 17 +++++++++++++++++ config/CreatBot_D1000_V0/base.cfg | 17 +++++++++++++++++ config/CreatBot_D600Pro2/base.cfg | 17 +++++++++++++++++ config/CreatBot_D600Pro2_V0/base.cfg | 17 +++++++++++++++++ 4 files changed, 68 insertions(+) diff --git a/config/CreatBot_D1000/base.cfg b/config/CreatBot_D1000/base.cfg index 91744bd8b..e76b6d622 100644 --- a/config/CreatBot_D1000/base.cfg +++ b/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" %} diff --git a/config/CreatBot_D1000_V0/base.cfg b/config/CreatBot_D1000_V0/base.cfg index cc11818bd..94cd88782 100644 --- a/config/CreatBot_D1000_V0/base.cfg +++ b/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" %} diff --git a/config/CreatBot_D600Pro2/base.cfg b/config/CreatBot_D600Pro2/base.cfg index f132ce3aa..d4b73d583 100644 --- a/config/CreatBot_D600Pro2/base.cfg +++ b/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" %} diff --git a/config/CreatBot_D600Pro2_V0/base.cfg b/config/CreatBot_D600Pro2_V0/base.cfg index 2bf7a611a..74356a1fa 100644 --- a/config/CreatBot_D600Pro2_V0/base.cfg +++ b/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" %}