CreatBot/GeneralKlipperScreen
7
0
Fork 0
forked from CreatBot/CreatBotKlipperScreen
Code Pull Requests Activity

Merge commit '628358b38a26e9d2113e809898dc8ac0f6e66265' into release

Browse Source
This commit is contained in:
张开科 2025-02-14 17:42:01 +08:00
commit acca7d7eab
3 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
printer_config/D1000/base.cfg
View File

@ -337,6 +337,7 @@ minimum_pulse_width: 0.000900
maximum_pulse_width: 0.002100
initial_angle: 130
steps_decomposed: 60
signal_duration: 0.1
# initial_pulse_width:
[servo switch_nozzle]
@ -357,6 +358,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]
@ -416,6 +418,7 @@ gcode:
[gcode_macro PROBE_SERVO_CLOSE]
gcode:
SET_SERVO SERVO=probe_servo angle=130
G4 P2000
[gcode_macro _START_PRINT_BASE]
description: Call when starting to print
@ -554,6 +557,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 +952,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}"

10
printer_config/D600Pro2/base.cfg
View File

@ -337,6 +337,7 @@ minimum_pulse_width: 0.000900
maximum_pulse_width: 0.002100
initial_angle: 130
steps_decomposed: 60
signal_duration: 0.1
# initial_pulse_width:
[servo switch_nozzle]
@ -357,6 +358,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,11 +413,12 @@ gcode:
[gcode_macro PROBE_SERVO_OPEN]
gcode:
SET_SERVO SERVO=probe_servo angle=15
G4 P1000
G4 P2000
[gcode_macro PROBE_SERVO_CLOSE]
gcode:
SET_SERVO SERVO=probe_servo angle=130
G4 P2000
[gcode_macro _START_PRINT_BASE]
description: Call when starting to print
@ -659,7 +662,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 +774,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 +945,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}"

23
printer_config/F430NX/base.cfg
View File

@ -337,6 +337,7 @@ minimum_pulse_width: 0.000900
maximum_pulse_width: 0.002100
initial_angle: 165
steps_decomposed: 60
signal_duration: 0.1
# initial_pulse_width:
@ -418,6 +419,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 +472,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 +504,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
@ -561,12 +565,12 @@ gcode:
[gcode_macro PROBE_SERVO_OPEN]
gcode:
SET_SERVO SERVO=probe_servo angle=45
G4 P500
G4 P2000
[gcode_macro PROBE_SERVO_CLOSE]
gcode:
G4 P500
SET_SERVO SERVO=probe_servo angle=165
G4 P2000
[gcode_macro _START_PRINT_BASE]
description: Call when starting to print
@ -620,6 +624,8 @@ gcode:
[gcode_macro END_PRINT]
gcode:
{% set svv = printer.save_variables.variables %}
{% set y_offset = svv.nozzle_y_offset_val|default(0)|float %}
M400
G92 E0
G1 E-10.0 F3600
@ -628,6 +634,7 @@ gcode:
{% set dual_mode = printer['gcode_macro _SET_DUAL_MODE'].dual_mode|default("primary") %}
{% if dual_mode == "copy" or dual_mode == "mirror" %}
G0 Z1.00 F6000
_ACTIVATE_PRIMARY_MODE
G90
_PARK_extruder
_PARK_extruder1
@ -640,7 +647,7 @@ gcode:
M107
G1 Z2 F3000
G90
G0 Y300 F3600
G0 Y{300-(y_offset if printer.toolhead.extruder == 'extruder1' else 0)} F3600
# BED_MESH_CLEAR
[gcode_macro PRINT_END]
@ -1164,6 +1171,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}"