forked from Klipper3d/klipper
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #236 from stereotech/STEAPP-881
STEAPP-881, STEAPP-886: Changed configuration for extruders, printer v630
- Loading branch information
Showing
4 changed files
with
192 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| [extruder] | ||
| step_pin: main_extruder_step_pin | ||
| dir_pin: main_extruder_dir_pin | ||
| enable_pin: !main_extruder_enable_pin | ||
| microsteps: 16 | ||
| rotation_distance: 3.750 | ||
| nozzle_diameter: 0.4 | ||
| filament_diameter: 1.75 | ||
| heater_pin: main_extruder_heater_pin | ||
| sensor_type: Trianglelab T-D500 | ||
| sensor_pin: main_extruder_sensor_pin | ||
| control: pid | ||
| pid_Kp: 13.509 | ||
| pid_Ki: 0.566 | ||
| pid_Kd: 80.549 | ||
| min_temp: -150 | ||
| max_temp: 500 | ||
| min_extrude_temp: 100 | ||
| max_extrude_only_distance: 300.0 | ||
| max_extrude_cross_section: 2.56 | ||
| fiber: false | ||
|
|
||
| [gcode_macro T0] | ||
| variable_flow: 100.0 | ||
| gcode: | ||
| M117 set_extruder | ||
| {% if printer["gcode_macro T1"].t1_offset_enabled > 0 %} | ||
| SET_GCODE_OFFSET X_ADJUST={0.0 - printer["gcode_macro SET_NOZZLE_OFFSET"].offset_x|default(0.0)} Y_ADJUST={0.0 - printer["gcode_macro SET_NOZZLE_OFFSET"].offset_y|default(0.0)} | ||
| SET_GCODE_VARIABLE MACRO=T1 VARIABLE=t1_offset_enabled VALUE=0 | ||
| {% endif %} | ||
| {% set current_wcs = printer.gcode_move.current_wcs %} | ||
| {% set move = params.MOVE|default(1)|int %} | ||
| {% if move %} | ||
| {% if "x" in printer.toolhead.homed_axes and "y" in printer.toolhead.homed_axes and "z" in printer.toolhead.homed_axes and printer.toolhead.extruder != 'extruder' %} | ||
| G54 | ||
| MOVE_DOWN_Z_AXIS Z=5 | ||
| G0 X10 Y2 F3600 | ||
| {% endif %} | ||
| {% endif %} | ||
| SAVE_EXTRUDER_FLOW | ||
| ACTIVATE_EXTRUDER extruder=extruder | ||
| RESTORE_EXTRUDER_FLOW EXTRUDER=extruder | ||
| SET_WCS WCS={current_wcs} | ||
| M117 | ||
|
|
||
| [gcode_macro SAVE_EXTRUDER_FLOW] | ||
| gcode: | ||
| {% set current_ex = printer.toolhead.extruder %} | ||
| {% set index_ex = '0' if current_ex == 'extruder' else current_ex[8]|int %} | ||
| {% set current_ex_factor = printer.gcode_move.extrude_factor|float %} | ||
| SET_GCODE_VARIABLE MACRO=T{index_ex} VARIABLE=flow VALUE={current_ex_factor * 100.0} | ||
|
|
||
| [gcode_macro RESTORE_EXTRUDER_FLOW] | ||
| gcode: | ||
| {% set extruder = params.EXTRUDER|default('extruder') %} | ||
| {% set index_ex = '0' if extruder == 'extruder' else extruder[8]|int %} | ||
| M221 S{printer["gcode_macro T" ~ index_ex].flow} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| [extruder1] | ||
| step_pin: second_extruder_step_pin | ||
| dir_pin: second_extruder_dir_pin | ||
| enable_pin: !second_extruder_enable_pin | ||
| microsteps: 16 | ||
| rotation_distance: 7.777 | ||
| nozzle_diameter: 0.4 | ||
| filament_diameter: 1.75 | ||
| heater_pin: second_extruder_heater_pin | ||
| sensor_type: Trianglelab T-D500 | ||
| sensor_pin: second_extruder_sensor_pin | ||
| control: pid | ||
| pid_Kp: 13.509 | ||
| pid_Ki: 0.566 | ||
| pid_Kd: 80.549 | ||
| min_temp: -150 | ||
| max_temp: 500 | ||
| min_extrude_temp: 100 | ||
| max_extrude_only_distance: 300.0 | ||
| max_extrude_cross_section: 2.56 | ||
| fiber: false | ||
| offsets: -53.5, 0.0, 0.0 | ||
|
|
||
| [gcode_macro T1] | ||
| variable_flow: 100.0 | ||
| variable_t1_offset_enabled: 0 | ||
| gcode: | ||
| M117 set_extruder1 | ||
| {% if printer["gcode_macro T1"].t1_offset_enabled < 1 %} | ||
| SET_GCODE_OFFSET X_ADJUST={printer["gcode_macro SET_NOZZLE_OFFSET"].offset_x|default(0.0)} Y_ADJUST={printer["gcode_macro SET_NOZZLE_OFFSET"].offset_y|default(0.0)} | ||
| SET_GCODE_VARIABLE MACRO=T1 VARIABLE=t1_offset_enabled VALUE=1 | ||
| {% endif %} | ||
| {% set current_wcs = printer.gcode_move.current_wcs %} | ||
| {% set move = params.MOVE|default(1)|int %} | ||
| {% if move %} | ||
| {% if "x" in printer.toolhead.homed_axes and "y" in printer.toolhead.homed_axes and "z" in printer.toolhead.homed_axes and printer.toolhead.extruder != 'extruder1' %} | ||
| G54 | ||
| MOVE_DOWN_Z_AXIS Z=5 | ||
| G0 X10 Y2 F3600 | ||
| {% endif %} | ||
| {% endif %} | ||
| SAVE_EXTRUDER_FLOW | ||
| ACTIVATE_EXTRUDER extruder=extruder1 | ||
| RESTORE_EXTRUDER_FLOW EXTRUDER=extruder1 | ||
| SET_WCS WCS={current_wcs} | ||
| M117 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters