mirror of
https://github.com/sorted01/Filametrix.git
synced 2026-01-01 04:55:56 -05:00
change all semicolon to # per user feedback
This commit is contained in:
parent
b9cf1129a6
commit
27f8f89f24
1 changed files with 19 additions and 18 deletions
|
|
@ -30,8 +30,8 @@ variable_travel_spd: 7800
|
|||
variable_cut_fast_move_spd: 2000
|
||||
variable_cut_slow_move_spd: 500
|
||||
variable_evacuate_speed: 7800
|
||||
variable_cut_dwell_time: 200 ; time to dwell at the cut point in ms
|
||||
variable_cut_fast_move_fraction: 0.5 ; fraction of the move that uses fast move
|
||||
variable_cut_dwell_time: 200 # time to dwell at the cut point in ms
|
||||
variable_cut_fast_move_fraction: 0.5 # fraction of the move that uses fast move
|
||||
|
||||
# Safety margin for fast vs slow travel
|
||||
# When traveling to the pin location, we make a safer but longer move if we closer to the pin than this specified margin
|
||||
|
|
@ -53,13 +53,13 @@ variable_final_eject: 0
|
|||
# Ideally, we should bring formal support of filament cutters to the ERCF software
|
||||
# In the short term, we perform a "hack" where we wiggle the extruder a little after cutting,
|
||||
# if the extruder did not make enough movement during the filament cutting phase.
|
||||
variable_extruder_minimum_movement: 0 ; the minimum extruder movement required for this tip forming move, this depends on the minimum distance that the encoder can reliably detect
|
||||
; setting it to a lower value requires the ERCF encoder to be more sensitive.
|
||||
variable_extruder_wiggle_length: 10 ; the length to retract -> extrude during a wiggle, this needs to be large enough for the encoder to detect the movement
|
||||
variable_extruder_wiggle_repeat: 3 ; number of repeats for the wiggle
|
||||
variable_extruder_minimum_movement: 0 # the minimum extruder movement required for this tip forming move, this depends on the minimum distance that the encoder can reliably detect
|
||||
# setting it to a lower value requires the ERCF encoder to be more sensitive.
|
||||
variable_extruder_wiggle_length: 10 # the length to retract -> extrude during a wiggle, this needs to be large enough for the encoder to detect the movement
|
||||
variable_extruder_wiggle_repeat: 3 # number of repeats for the wiggle
|
||||
|
||||
# State variables
|
||||
variable_retracted_length_: 0 ; a state variable to keep track of how much we have retracted during the last cut, this is useful for restoring the filament position
|
||||
variable_retracted_length_: 0 # a state variable to keep track of how much we have retracted during the last cut, this is useful for restoring the filament position
|
||||
|
||||
gcode:
|
||||
{% set RETRACT_LENGTH = params.RETRACT_LENGTH | default(printer['gcode_macro CUT_FILAMENT']['retract_length']) | float %}
|
||||
|
|
@ -74,20 +74,20 @@ gcode:
|
|||
{% endif %}
|
||||
|
||||
{% set prev_pa = printer.extruder.pressure_advance %}
|
||||
SET_PRESSURE_ADVANCE ADVANCE=0 ; temporaily disable PA
|
||||
SET_PRESSURE_ADVANCE ADVANCE=0 # temporaily disable PA
|
||||
|
||||
{% set pin_park_x_loc = pin_loc_x + pin_park_x_dist %}
|
||||
{% set pin_park_y_loc = pin_loc_y %}
|
||||
{% set _extruder_moved_dist = 0 %}
|
||||
|
||||
M83 ; relative extrusion
|
||||
M83 # relative extrusion
|
||||
{% if RETRACT_LENGTH > 0 %}
|
||||
G1 E-{RETRACT_LENGTH} F3000 ; retract to save filament waste
|
||||
G1 E-{RETRACT_LENGTH} F3000 # retract to save filament waste
|
||||
{% set _extruder_moved_dist = _extruder_moved_dist + RETRACT_LENGTH %}
|
||||
{% endif %}
|
||||
SET_GCODE_VARIABLE macro=CUT_FILAMENT variable=retracted_length_ value={RETRACT_LENGTH}
|
||||
|
||||
G90 ; absolute positioning
|
||||
G90 # absolute positioning
|
||||
_MOVE_TO_CUTTER_PIN PIN_PARK_X_LOC={pin_park_x_loc} PIN_PARK_Y_LOC={pin_park_y_loc}
|
||||
|
||||
# Make the main cut
|
||||
|
|
@ -112,7 +112,7 @@ gcode:
|
|||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
SET_PRESSURE_ADVANCE ADVANCE={prev_pa} ; restore PA
|
||||
SET_PRESSURE_ADVANCE ADVANCE={prev_pa} # restore PA
|
||||
RESTORE_GCODE_STATE NAME=cut_filament_state
|
||||
|
||||
[gcode_macro _MOVE_TO_CUTTER_PIN]
|
||||
|
|
@ -124,7 +124,7 @@ gcode:
|
|||
{% set pin_park_x_loc = params.PIN_PARK_X_LOC | float %}
|
||||
{% set pin_park_y_loc = params.PIN_PARK_Y_LOC | float %}
|
||||
|
||||
G90 ; absolute positioning
|
||||
G90 # absolute positioning
|
||||
{% if ((printer.gcode_move.gcode_position.x - pin_park_x_loc) | abs < safe_margin_x) or ((printer.gcode_move.gcode_position.y - pin_park_y_loc | float) | abs < safe_margin_y) %}
|
||||
# Make a safe but slower travel move
|
||||
G1 X{pin_park_x_loc} F{travel_spd}
|
||||
|
|
@ -144,22 +144,23 @@ gcode:
|
|||
{% set evacuate_speed = printer['gcode_macro CUT_FILAMENT']['evacuate_speed'] | float %}
|
||||
{% set pin_park_x_loc = params.PIN_PARK_X_LOC | float %}
|
||||
{% set fast_slow_transition_loc = (pin_loc_x_compressed - pin_park_x_loc) * cut_fast_move_fraction + pin_park_x_loc | float %}
|
||||
G1 X{fast_slow_transition_loc} F{cut_fast_move_spd} ; make a fast move to initiate contact of the blade with the filament
|
||||
G1 X{pin_loc_x_compressed} F{cut_slow_move_spd} ; do the cut in slow move
|
||||
G1 X{fast_slow_transition_loc} F{cut_fast_move_spd} # make a fast move to initiate contact of the blade with the filament
|
||||
G1 X{pin_loc_x_compressed} F{cut_slow_move_spd} # do the cut in slow move
|
||||
G4 P{cut_dwell_time}
|
||||
G1 X{pin_park_x_loc} F{evacuate_speed} ; evacuate
|
||||
G1 X{pin_park_x_loc} F{evacuate_speed} # evacuate
|
||||
|
||||
[gcode_macro restore_cutted_filament]
|
||||
description: extrudes an amount equal (or proportional) to the retraction during the last cut
|
||||
gcode:
|
||||
SAVE_GCODE_STATE NAME=restore_cutted_filament_state
|
||||
{% set RETRACTED_LENGTH = printer['gcode_macro CUT_FILAMENT']['retracted_length_'] | float %}
|
||||
M83 ; relative extrusion
|
||||
M83 # relative extrusion
|
||||
G1 E{RETRACTED_LENGTH} F3000
|
||||
SET_GCODE_VARIABLE macro=CUT_FILAMENT variable=retracted_length_ value=0 ; clear the retracted amount
|
||||
SET_GCODE_VARIABLE macro=CUT_FILAMENT variable=retracted_length_ value=0 # clear the retracted amount
|
||||
RESTORE_GCODE_STATE NAME=restore_cutted_filament_state
|
||||
|
||||
|
||||
[gcode_macro _ERCF_FORM_TIP_STANDALONE]
|
||||
gcode:
|
||||
CUT_FILAMENT {rawparams}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue