1、修复F430NX断料自动切头时,喷头偏移值未应用的问题

2、修复喷头一停靠位置不对的问题
This commit is contained in:
魏瑞鹏 2025-01-09 10:09:21 +08:00
parent dda0962b98
commit ea3e219f50

View File

@ -477,7 +477,7 @@ gcode:
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 -x_offset)} F6000
RESTORE_GCODE_STATE NAME=park_extruder1
[gcode_macro T1]
@ -951,6 +951,21 @@ 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 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
@ -1011,6 +1026,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" %}