CreatBot/CreatBotKlipper
CreatBot/CreatBotKlipper
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipper into develop

Browse Source
This commit is contained in:
张开科 2025-01-10 13:38:31 +08:00
commit c7326be183
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
config/CreatBot_F430NX/base.cfg
View File

@ -478,7 +478,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]
@ -952,6 +952,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
@ -1012,6 +1027,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" %}
@ -1070,6 +1086,7 @@ gcode:
{% set svv = printer.save_variables.variables %}
{% set autoshift_extruder = svv.auto_change_nozzle|default(False) %}
{% set filament_state = printer['gcode_macro RESUME'].filament_state.runout|default(False) %}
{% set extruder_runout = printer['gcode_macro RESUME'].filament_state.extruder|default(False) %}
{% set target_extruder = "extruder1" if printer.toolhead.extruder == "extruder" else "extruder" %}
{% set idex = False %}
{% if printer["dual_carriage"] is defined %}
@ -1087,7 +1104,7 @@ gcode:
RESPOND TYPE=error MSG='{"Noting! All extruders filament has been run out."}'
{% endif %}
{% else %}
{% set msg = "Left" if printer.toolhead.extruder == "extruder" else "Right" %}
{% set msg = "Right" if extruder_runout else "Left" %}
RESPOND TYPE=error MSG='{"Noting! %s extruder filament has been run out." % msg}'
{% endif %}
{% endif %}