From e88fb64dddf138c5def521ea55c608a5a299d9fe Mon Sep 17 00:00:00 2001 From: zkk <1007518571@qq.com> Date: Fri, 17 Jan 2025 16:04:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9C=BA=E5=99=A8=E7=9A=84?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=A4=96=E7=BD=AE=E9=A9=B1=E5=8A=A8=E7=9A=84=E4=BD=BF=E8=83=BD?= =?UTF-8?q?=E5=BB=B6=E6=97=B6=E9=97=AE=E9=A2=98=20=E8=A7=A3=E5=86=B3F430NX?= =?UTF-8?q?=E5=88=87=E5=A4=B4=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- printer_config/D1000/base.cfg | 4 ++++ printer_config/D600Pro2/base.cfg | 8 +++++--- printer_config/F430NX/base.cfg | 13 +++++++++---- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/printer_config/D1000/base.cfg b/printer_config/D1000/base.cfg index d0ff4cea..2b7b11de 100644 --- a/printer_config/D1000/base.cfg +++ b/printer_config/D1000/base.cfg @@ -357,6 +357,7 @@ z_hop_speed: 10 gcode: SET_STEPPER_ENABLE STEPPER=stepper_x ENABLE=1 SET_STEPPER_ENABLE STEPPER=stepper_y ENABLE=1 + SET_STEPPER_ENABLE STEPPER=stepper_z ENABLE=1 SET_KINEMATIC_POSITION X=500 Y=500 Z=0 [gcode_macro T0] @@ -554,6 +555,7 @@ gcode: {% if not homing_cmd %} SET_STEPPER_ENABLE STEPPER=stepper_x ENABLE=1 SET_STEPPER_ENABLE STEPPER=stepper_y ENABLE=1 + SET_STEPPER_ENABLE STEPPER=stepper_z ENABLE=1 G4 P300 C28 _ACTIVATE_DEFAULT_EXTRUDER @@ -948,6 +950,8 @@ gcode: {% if hotend == "extruder1" %} {% set z_offset_total = z_offset_total + z_offset %} {% endif %} + SET_STEPPER_ENABLE STEPPER=stepper_z ENABLE=1 + G4 P300 M118 Recovery in progress, please wait RUN_SHELL_COMMAND CMD=_POWER_LOSS_RECOVERY PARAMS="{z_height} \"{last_file}\" \"{z_offset_total}\"" SDCARD_PRINT_FILE FILENAME=.plr/"{last_file}" diff --git a/printer_config/D600Pro2/base.cfg b/printer_config/D600Pro2/base.cfg index 10dbd1f7..2a2d9fe7 100644 --- a/printer_config/D600Pro2/base.cfg +++ b/printer_config/D600Pro2/base.cfg @@ -357,6 +357,7 @@ z_hop_speed: 10 gcode: SET_STEPPER_ENABLE STEPPER=stepper_x ENABLE=1 SET_STEPPER_ENABLE STEPPER=stepper_y ENABLE=1 + SET_STEPPER_ENABLE STEPPER=stepper_z ENABLE=1 SET_KINEMATIC_POSITION X=300 Y=300 Z=0 [gcode_macro T0] @@ -411,7 +412,7 @@ gcode: [gcode_macro PROBE_SERVO_OPEN] gcode: SET_SERVO SERVO=probe_servo angle=15 - G4 P1000 + G4 P2000 [gcode_macro PROBE_SERVO_CLOSE] gcode: @@ -659,7 +660,7 @@ gcode: {% set toolchange = client.change_runout|lower|default("") %} {% set extruder_filament = client.filament_state.extruder %} {% set extruder1_filament = client.filament_state.extruder1 %} - {% set resume_extruder = client.resume_extruder %} + {% set resume_extruder = client.resume_extruder|default("extruder") %} {% if autoshift_on == 'true' %} {% if extruder_filament and extruder1_filament %} @@ -771,7 +772,6 @@ gcode: {% set autoshift = printer.save_variables.variables.auto_change_nozzle|default(False) %} {% set client = printer['gcode_macro _CLIENT_VARIABLE']|default({}) %} {% set do_resume = False %} - {% set prompt_txt = [] %} {% set runout = True %} ##### end of definitions ##### _FILAMENT_UPDATE @@ -943,6 +943,8 @@ gcode: {% if hotend == "extruder1" %} {% set z_offset_total = z_offset_total + z_offset %} {% endif %} + SET_STEPPER_ENABLE STEPPER=stepper_z ENABLE=1 + G4 P300 M118 Recovery in progress, please wait RUN_SHELL_COMMAND CMD=_POWER_LOSS_RECOVERY PARAMS="{z_height} \"{last_file}\" \"{z_offset_total}\"" SDCARD_PRINT_FILE FILENAME=.plr/"{last_file}" diff --git a/printer_config/F430NX/base.cfg b/printer_config/F430NX/base.cfg index b9847801..983a8be5 100644 --- a/printer_config/F430NX/base.cfg +++ b/printer_config/F430NX/base.cfg @@ -418,6 +418,7 @@ z_hop:5 gcode: SET_STEPPER_ENABLE STEPPER=stepper_x ENABLE=1 SET_STEPPER_ENABLE STEPPER=stepper_y ENABLE=1 + SET_STEPPER_ENABLE STEPPER=stepper_z ENABLE=1 SET_KINEMATIC_POSITION X=200 Y=150 Z=0 [gcode_macro _RESTORE_DEFAULT_EXTRUDER] @@ -470,14 +471,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 +503,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 @@ -1164,6 +1167,8 @@ gcode: {% if hotend == "extruder1" %} {% set z_offset_total = z_offset_total + z_offset %} {% endif %} + SET_STEPPER_ENABLE STEPPER=stepper_z ENABLE=1 + G4 P300 M118 Recovery in progress, please wait RUN_SHELL_COMMAND CMD=_POWER_LOSS_RECOVERY PARAMS="{z_height} \"{last_file}\" \"{z_offset_total}\"" SDCARD_PRINT_FILE FILENAME=.plr/"{last_file}"