From a5e85907ddeaa26eda3a96a8ecaf2b8df40d3956 Mon Sep 17 00:00:00 2001 From: Ilya Gushchin Date: Wed, 27 Dec 2023 15:23:17 +0300 Subject: [PATCH] update temp config --- HTE530-5-4-22.cfg | 2 +- stereotech_config/5xx/main_extruder.cfg | 2 +- stereotech_config/5xx/main_extruder_2.cfg | 57 +++++++++++++++++++++++ stereotech_config/HFE520-5-6-21.cfg | 2 +- stereotech_config/HFE530-5-3-23.cfg | 2 +- stereotech_config/HFE530-5-6-21.cfg | 2 +- stereotech_config/HFE530-5-8-23.cfg | 2 +- stereotech_config/HTE520-5-1-22.cfg | 2 +- stereotech_config/HTE520-5-6-21.cfg | 2 +- stereotech_config/HTE530-5-1-22.cfg | 2 +- stereotech_config/HTE530-5-3-23.cfg | 2 +- stereotech_config/HTE530-5-4-22.cfg | 2 +- stereotech_config/HTE530-5-6-21.cfg | 2 +- stereotech_config/HTE530-5-8-23.cfg | 2 +- stereotech_config/HTE630-0-C-23.cfg | 2 +- 15 files changed, 71 insertions(+), 14 deletions(-) create mode 100644 stereotech_config/5xx/main_extruder_2.cfg diff --git a/HTE530-5-4-22.cfg b/HTE530-5-4-22.cfg index 562d78b400da..b58270770307 100644 --- a/HTE530-5-4-22.cfg +++ b/HTE530-5-4-22.cfg @@ -26,7 +26,7 @@ path: /home/ste/uploads [include stereotech_config/calibrate/probe_v1.cfg] [include stereotech_config/calibrate/probe_v2.cfg] -[include stereotech_config/5xx/main_extruder.cfg] +[include stereotech_config/5xx/main_extruder_2.cfg] [include stereotech_config/5xx/second_extruder.cfg] [include stereotech_config/common/nozzle_offset.cfg] [include stereotech_config/common/extruder_macros.cfg] diff --git a/stereotech_config/5xx/main_extruder.cfg b/stereotech_config/5xx/main_extruder.cfg index a7e18484e25b..35ab32ad69d2 100644 --- a/stereotech_config/5xx/main_extruder.cfg +++ b/stereotech_config/5xx/main_extruder.cfg @@ -14,7 +14,7 @@ pid_Kp: 13.509 pid_Ki: 0.566 pid_Kd: 80.549 min_temp: -150 -max_temp: 320 +max_temp: 330 min_extrude_temp: 100 max_extrude_only_distance: 300.0 max_extrude_cross_section: 2.56 diff --git a/stereotech_config/5xx/main_extruder_2.cfg b/stereotech_config/5xx/main_extruder_2.cfg new file mode 100644 index 000000000000..a7e18484e25b --- /dev/null +++ b/stereotech_config/5xx/main_extruder_2.cfg @@ -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: 7.777 +nozzle_diameter: 0.4 +filament_diameter: 1.75 +heater_pin: main_extruder_heater_pin +sensor_type: NTC 100K MGB18-104F39050L32 +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: 320 +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} diff --git a/stereotech_config/HFE520-5-6-21.cfg b/stereotech_config/HFE520-5-6-21.cfg index 54e9690cca2d..bca21d83e969 100644 --- a/stereotech_config/HFE520-5-6-21.cfg +++ b/stereotech_config/HFE520-5-6-21.cfg @@ -16,7 +16,7 @@ path: /home/ste/uploads [include config/common/printhead.cfg] -[include config/5xx/main_extruder.cfg] +[include config/5xx/main_extruder_2.cfg] [include config/5xx/fiber_extruder.cfg] [include config/common/nozzle_offset.cfg] [include config/common/extruder_macros.cfg] diff --git a/stereotech_config/HFE530-5-3-23.cfg b/stereotech_config/HFE530-5-3-23.cfg index 5a8bc24605c7..63d8cffc47c2 100644 --- a/stereotech_config/HFE530-5-3-23.cfg +++ b/stereotech_config/HFE530-5-3-23.cfg @@ -25,7 +25,7 @@ path: /home/ste/uploads [include config/calibrate/probe_5d_template.cfg] [include config/calibrate/probe_v2.cfg] -[include config/5xx/main_extruder.cfg] +[include config/5xx/main_extruder_2.cfg] [include config/530/fiber_extruder_2.cfg] [include config/common/nozzle_offset.cfg] [include config/common/extruder_macros.cfg] diff --git a/stereotech_config/HFE530-5-6-21.cfg b/stereotech_config/HFE530-5-6-21.cfg index c50fc16b2540..f6d223691f9e 100644 --- a/stereotech_config/HFE530-5-6-21.cfg +++ b/stereotech_config/HFE530-5-6-21.cfg @@ -16,7 +16,7 @@ path: /home/ste/uploads [include config/common/printhead.cfg] -[include config/5xx/main_extruder.cfg] +[include config/5xx/main_extruder_2.cfg] [include config/5xx/fiber_extruder.cfg] [include config/common/nozzle_offset.cfg] [include config/common/extruder_macros.cfg] diff --git a/stereotech_config/HFE530-5-8-23.cfg b/stereotech_config/HFE530-5-8-23.cfg index 2d076f1d467c..e3655fc5f0b6 100644 --- a/stereotech_config/HFE530-5-8-23.cfg +++ b/stereotech_config/HFE530-5-8-23.cfg @@ -26,7 +26,7 @@ path: /home/ste/uploads [include config/calibrate/probe_5d_template.cfg] [include config/calibrate/probe_v2.cfg] -[include config/5xx/main_extruder.cfg] +[include config/5xx/main_extruder_2.cfg] [include config/common/fiber_extruder_3.cfg] [include config/common/nozzle_offset.cfg] [include config/common/extruder_macros.cfg] diff --git a/stereotech_config/HTE520-5-1-22.cfg b/stereotech_config/HTE520-5-1-22.cfg index 3a9ca7880d3c..baf54a0b6793 100644 --- a/stereotech_config/HTE520-5-1-22.cfg +++ b/stereotech_config/HTE520-5-1-22.cfg @@ -16,7 +16,7 @@ path: /home/ste/uploads [include config/common/printhead.cfg] -[include config/5xx/main_extruder.cfg] +[include config/5xx/main_extruder_2.cfg] [include config/5xx/second_extruder.cfg] [include config/common/nozzle_offset.cfg] [include config/common/extruder_macros.cfg] diff --git a/stereotech_config/HTE520-5-6-21.cfg b/stereotech_config/HTE520-5-6-21.cfg index 71545e2fa2ff..55c4f9b3df15 100644 --- a/stereotech_config/HTE520-5-6-21.cfg +++ b/stereotech_config/HTE520-5-6-21.cfg @@ -16,7 +16,7 @@ path: /home/ste/uploads [include config/common/printhead.cfg] -[include config/5xx/main_extruder.cfg] +[include config/5xx/main_extruder_2.cfg] [include config/5xx/second_extruder.cfg] [include config/common/nozzle_offset.cfg] [include config/common/extruder_macros.cfg] diff --git a/stereotech_config/HTE530-5-1-22.cfg b/stereotech_config/HTE530-5-1-22.cfg index 181d1f1b0403..cd6c9c28f383 100644 --- a/stereotech_config/HTE530-5-1-22.cfg +++ b/stereotech_config/HTE530-5-1-22.cfg @@ -16,7 +16,7 @@ path: /home/ste/uploads [include config/common/printhead.cfg] -[include config/5xx/main_extruder.cfg] +[include config/5xx/main_extruder_2.cfg] [include config/5xx/second_extruder.cfg] [include config/common/nozzle_offset.cfg] [include config/common/extruder_macros.cfg] diff --git a/stereotech_config/HTE530-5-3-23.cfg b/stereotech_config/HTE530-5-3-23.cfg index 68c9efa8e97a..9f6044b79690 100644 --- a/stereotech_config/HTE530-5-3-23.cfg +++ b/stereotech_config/HTE530-5-3-23.cfg @@ -25,7 +25,7 @@ path: /home/ste/uploads [include config/calibrate/probe_5d_template.cfg] [include config/calibrate/probe_v2.cfg] -[include config/5xx/main_extruder.cfg] +[include config/5xx/main_extruder_2.cfg] [include config/5xx/second_extruder.cfg] [include config/common/nozzle_offset.cfg] [include config/common/extruder_macros.cfg] diff --git a/stereotech_config/HTE530-5-4-22.cfg b/stereotech_config/HTE530-5-4-22.cfg index b3c9e4efd850..540afe666b6a 100644 --- a/stereotech_config/HTE530-5-4-22.cfg +++ b/stereotech_config/HTE530-5-4-22.cfg @@ -26,7 +26,7 @@ path: /home/ste/uploads [include config/calibrate/probe_v1.cfg] [include config/calibrate/probe_v2.cfg] -[include config/5xx/main_extruder.cfg] +[include config/5xx/main_extruder_2.cfg] [include config/5xx/second_extruder.cfg] [include config/common/nozzle_offset.cfg] [include config/common/extruder_macros.cfg] diff --git a/stereotech_config/HTE530-5-6-21.cfg b/stereotech_config/HTE530-5-6-21.cfg index e7765d3933a6..3e3103de59e2 100644 --- a/stereotech_config/HTE530-5-6-21.cfg +++ b/stereotech_config/HTE530-5-6-21.cfg @@ -16,7 +16,7 @@ path: /home/ste/uploads [include config/common/printhead.cfg] -[include config/5xx/main_extruder.cfg] +[include config/5xx/main_extruder_2.cfg] [include config/5xx/second_extruder.cfg] [include config/common/nozzle_offset.cfg] [include config/common/extruder_macros.cfg] diff --git a/stereotech_config/HTE530-5-8-23.cfg b/stereotech_config/HTE530-5-8-23.cfg index 9caa5be61f1c..5960c58dad66 100644 --- a/stereotech_config/HTE530-5-8-23.cfg +++ b/stereotech_config/HTE530-5-8-23.cfg @@ -26,7 +26,7 @@ path: /home/ste/uploads [include config/calibrate/probe_5d_template.cfg] [include config/calibrate/probe_v2.cfg] -[include config/5xx/main_extruder.cfg] +[include config/5xx/main_extruder_2.cfg] [include config/5xx/second_extruder.cfg] [include config/common/nozzle_offset.cfg] [include config/common/extruder_macros.cfg] diff --git a/stereotech_config/HTE630-0-C-23.cfg b/stereotech_config/HTE630-0-C-23.cfg index b5d194168be6..9833fef63197 100644 --- a/stereotech_config/HTE630-0-C-23.cfg +++ b/stereotech_config/HTE630-0-C-23.cfg @@ -26,7 +26,7 @@ path: /home/ste/uploads [include config/calibrate/probe_5d_template.cfg] [include config/calibrate/probe_v2.cfg] -[include config/5xx/main_extruder.cfg] +[include config/5xx/main_extruder_2.cfg] [include config/5xx/second_extruder.cfg] [include config/common/nozzle_offset.cfg] [include config/common/extruder_macros.cfg]