修复F430NX停靠喷头与偏移值的计算逻辑
This commit is contained in:
parent
75da8e8e63
commit
32fc128f99
@ -470,14 +470,15 @@ gcode:
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
[gcode_macro _PARK_extruder1]
|
[gcode_macro _PARK_extruder1]
|
||||||
|
variable_x_offset: 0
|
||||||
gcode:
|
gcode:
|
||||||
{% set svv = printer.save_variables.variables %}
|
|
||||||
{% set x_offset = svv.nozzle_x_offset_val|default(0)|float %}
|
|
||||||
ACTIVATE_EXTRUDER EXTRUDER=extruder1
|
ACTIVATE_EXTRUDER EXTRUDER=extruder1
|
||||||
SET_DUAL_CARRIAGE CARRIAGE=1
|
SET_DUAL_CARRIAGE CARRIAGE=1
|
||||||
SAVE_GCODE_STATE NAME=park_extruder1
|
SAVE_GCODE_STATE NAME=park_extruder1
|
||||||
G90
|
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
|
RESTORE_GCODE_STATE NAME=park_extruder1
|
||||||
|
|
||||||
[gcode_macro T1]
|
[gcode_macro T1]
|
||||||
@ -501,7 +502,8 @@ gcode:
|
|||||||
SET_DUAL_CARRIAGE CARRIAGE=1
|
SET_DUAL_CARRIAGE CARRIAGE=1
|
||||||
SAVE_GCODE_STATE NAME=park1
|
SAVE_GCODE_STATE NAME=park1
|
||||||
G90
|
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
|
RESTORE_GCODE_STATE NAME=park1
|
||||||
{% if "z" in printer.toolhead.homed_axes | lower %}
|
{% if "z" in printer.toolhead.homed_axes | lower %}
|
||||||
SET_GCODE_OFFSET Z={z_offset} MOVE=1
|
SET_GCODE_OFFSET Z={z_offset} MOVE=1
|
||||||
|
Loading…
x
Reference in New Issue
Block a user