Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add filament retract and unretract user variables for use in base and helper macros #642

Merged
merged 8 commits into from
Jan 8, 2025
Merged

Add filament retract and unretract user variables for use in base and helper macros #642

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1088b65
Make filament retract user configurable in base macros
tehniemer Aug 26, 2024
88c66e1
Merge branch 'Frix-x:main' into retract-length-base
tehniemer Dec 11, 2024
6d2cdc1
Update prime_line.cfg
tehniemer Jan 6, 2025
be1ae5b
Include parameters in nozzle clean and primeline
tehniemer Jan 7, 2025
43920d7
Merge branch 'main' into retract-length-base
tehniemer Jan 7, 2025
a8ab04c
Update macros/helpers/nozzle_cleaning.cfg
tehniemer Jan 7, 2025
f9edb6b
Update user_templates/variables.cfg
tehniemer Jan 7, 2025
44f1a4f
Cleaned up logic and added additional information
tehniemer Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions macros/base/cancel_print.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ gcode:
{% set filament_sensor_enabled = printer["gcode_macro _USER_VARIABLES"].filament_sensor_enabled %}
{% set filter_default_time = printer["gcode_macro _USER_VARIABLES"].filter_default_time_on_end_print|default(600)|int %}
{% set hotend_fan_tach_enabled = printer["gcode_macro _USER_VARIABLES"].hotend_fan_tach_enabled %}

{% set retract_length = printer["gcode_macro _USER_VARIABLES"].retract_length|default(20)|float %}

PARK

{% if klippain_mmu_enabled and mmu_unload_on_cancel_print %}
Expand All @@ -25,7 +26,7 @@ gcode:
{% elif printer.extruder.can_extrude %}
# Pull back the filament a little bit
G92 E0
G1 E-10 F2100
G1 E-{retract_length} F2100
{% endif %}

{% if turn_off_heaters_in_end_print %}
Expand Down
3 changes: 2 additions & 1 deletion macros/base/end_print.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ gcode:
{% set filter_default_time = printer["gcode_macro _USER_VARIABLES"].filter_default_time_on_end_print|default(600)|int %}
{% set filament_sensor_enabled = printer["gcode_macro _USER_VARIABLES"].filament_sensor_enabled %}
{% set hotend_fan_tach_enabled = printer["gcode_macro _USER_VARIABLES"].hotend_fan_tach_enabled %}
{% set retract_length = printer["gcode_macro _USER_VARIABLES"].retract_length|default(20)|float %}

PARK

Expand All @@ -25,7 +26,7 @@ gcode:
{% elif printer.extruder.can_extrude %}
# pull back the filament a little bit
G92 E0
G1 E-10 F2100
G1 E-{retract_length} F2100
{% endif %}

{% if turn_off_heaters_in_end_print %}
Expand Down
3 changes: 2 additions & 1 deletion macros/helpers/nozzle_cleaning.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ gcode:
{% set OOZE_TIME = params.OOZE_TIME|default(printer["gcode_macro _USER_VARIABLES"].purge_ooze_time)|int %}
{% set TEMP = params.TEMP|default(printer["gcode_macro _USER_VARIABLES"].print_default_extruder_temp)|float %}
{% set Z_DROP = params.Z_DROP|default(1)|int %}
{% set RETRACT = params.RETRACT|default(printer["gcode_macro _USER_VARIABLES"].retract_length)|default(20)|float %}

{% set purge_and_brush_enabled = printer["gcode_macro _USER_VARIABLES"].purge_and_brush_enabled %}
{% set purgeclean_servo_enabled = printer["gcode_macro _USER_VARIABLES"].purgeclean_servo_enabled %}
Expand Down Expand Up @@ -120,7 +121,7 @@ gcode:
# Retract
G92 E0
G1 E-1.7 F2100
G1 E-18.3 F150
G1 E-({RETRACT}-1.7) F150
tehniemer marked this conversation as resolved.
Show resolved Hide resolved
G92 E0

# Wait some time to let the nozzle ooze before cleaning
Expand Down
3 changes: 2 additions & 1 deletion macros/helpers/prime_line.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ gcode:
{% set prime_line_height = params.LINE_HEIGHT|default(printer["gcode_macro _USER_VARIABLES"].prime_line_height)|default(0.6)|float %}
{% set prime_line_adaptive = params.ADAPTIVE_MODE|default(1)|int %}
{% set prime_line_margin = params.LINE_MARGIN|default(printer["gcode_macro _USER_VARIABLES"].prime_line_margin)|default(5.0)|float %} # Used only in adaptive mode
{% set prime_line_unretract_length = printer["gcode_macro _USER_VARIABLES"].unretract_length|default(23)|float %}
{% set prime_line_wipe = printer["gcode_macro _USER_VARIABLES"].prime_line_wipe|default(False) %}
{% set prime_line_wipe_length = prime_line_length * 0.8 %}

Expand Down Expand Up @@ -112,7 +113,7 @@ gcode:

# Add pressure in the nozzle
G92 E0
G1 E18 F300
G1 E{prime_line_unretract_length} F300

# Prime line
G92 E0
Expand Down
6 changes: 6 additions & 0 deletions user_templates/variables.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ variable_prime_line_height: 0.6 # mm, used for actual cross section computation
variable_prime_line_margin: 5 # distance of purge line from fl_size rectangle
variable_prime_line_wipe: False # enable a wipe of the nozzle after completing the prime line

## Length of filament to retract to reduce oozing at end of print and during purge sequence, if enabled (in mm)
variable_retract_length: 20

## Length of filament to pre-prime the nozzle before start print (in mm)
variable_unretract_length: 23
tehniemer marked this conversation as resolved.
Show resolved Hide resolved

## Park position used when pause, end_print, etc...
variable_park_position_xy: -1, -1
variable_park_lift_z: 50
Expand Down