From d1d606ada4dc34d964e625847fbf144148df81df Mon Sep 17 00:00:00 2001 From: CChen616 <714434105@qq.com> Date: Fri, 3 May 2024 09:56:18 +0800 Subject: [PATCH] Update config files --- config/gcode_macro.cfg | 104 ++++++++++++++++++++++++++++++++--------- config/printer.cfg | 20 ++++++-- 2 files changed, 97 insertions(+), 27 deletions(-) diff --git a/config/gcode_macro.cfg b/config/gcode_macro.cfg index 51c46ed..eedb10a 100644 --- a/config/gcode_macro.cfg +++ b/config/gcode_macro.cfg @@ -35,10 +35,17 @@ gcode: {% set z = printer.save_variables.variables.z_offset %} SET_GCODE_OFFSET Z={z} MOVE=0 -[gcode_macro CLEAR_NOZZLE] +[gcode_macro CLEAR_NOZZLE_PLR] gcode: - {% set hotendtemp = params.HOTEND|int %} - G1 Z60 F600 + {% set hotendtemp = params.HOTEND|default(250)|int %} + {% if (printer.gcode_move.position.z ) < 35 %} + G90 + G1 Z35 F900 + {% else %} + G91 + G1 Z5 F900 + G90 + {% endif %} G1 X97 F9000 G1 Y254 F9000 @@ -47,6 +54,43 @@ gcode: G92 E0 G1 E80 F400 M106 S255 + + G1 X98 F500 + G1 X85 F2000 + G1 X98 F2000 + G1 X85 F2000 + G1 X98 F2000 + G1 X85 F2000 + G1 X98 F2000 + G1 X85 F2000 + G1 X98 F2000 + G1 X85 F2000 + G1 X98 F2000 + G1 X85 F2000 + G1 X98 F2000 + G1 Y240 F9000 + + + +[gcode_macro CLEAR_NOZZLE] +gcode: + {% set hotendtemp = params.HOTEND|int %} + {% if (printer.gcode_move.position.z ) < 35 %} + G1 Z35 F900 + {% else %} + G91 + G1 Z5 F900 + G90 + {% endif %} + G1 X97 F9000 + G1 Y254 F9000 + + M109 S{hotendtemp} + + G92 E0 + G1 E80 F400 + M106 S255 + M400 M106 P2 S0 M104 S0 TEMPERATURE_WAIT SENSOR=extruder MAXIMUM={hotendtemp-30} @@ -120,7 +164,7 @@ gcode: CLEAR_NOZZLE HOTEND={hotendtemp} M190 S{bedtemp} - Z_TILT_ADJUST +# Z_TILT_ADJUST G29 G0 Z50 F600 G0 X0 Y0 F6000 @@ -129,11 +173,21 @@ gcode: M109 S{hotendtemp} M204 S10000 + ENABLE_ALL_SENSOR + save_last_file + +[gcode_macro ENABLE_ALL_SENSOR] +gcode: ENABLE_FILAMENT_WIDTH_SENSOR RESET_FILAMENT_WIDTH_SENSOR query_filament_width SET_FILAMENT_SENSOR SENSOR=fila ENABLE=1 - save_last_file + +[gcode_macro DISABLE_ALL_SENSOR] +gcode: + SET_FILAMENT_SENSOR SENSOR=fila ENABLE=0 + DISABLE_FILAMENT_WIDTH_SENSOR + [gcode_macro AUTOTUNE_SHAPERS] variable_autotune_shapers: 'ei' @@ -149,7 +203,7 @@ gcode: SET_STEPPER_ENABLE STEPPER=stepper_z1 enable=1 SET_STEPPER_ENABLE STEPPER=extruder enable=0 -[gcode_macro KINEMATIC_POSITION] +[gcode_macro DETECT_INTERRUPTION] gcode: {% set was_interrupted = printer.save_variables.variables.was_interrupted %} {% if was_interrupted %} @@ -165,12 +219,12 @@ gcode: SET_STEPPER_ENABLE STEPPER=stepper_z1 enable=1 BED_MESH_CLEAR SET_FILAMENT_SENSOR SENSOR=fila ENABLE=0 - {% set was_interrupted = printer.save_variables.variables.was_interrupted %} - {% if was_interrupted %} - M118 Detected unexpected interruption during the last print. Do you want to resume printing? (Do not move the extruder before resuming.) - M118 Yes: RESUME_INTERRUPTED - M118 No: CLEAR_LAST_FILE - {% endif %} + # {% set was_interrupted = printer.save_variables.variables.was_interrupted %} + # {% if was_interrupted %} + # M118 Detected unexpected interruption during the last print. Do you want to resume printing? (Do not move the extruder before resuming.) + # M118 Yes: RESUME_INTERRUPTED + # M118 No: CLEAR_LAST_FILE + # {% endif %} [homing_override] axes:xyz @@ -214,9 +268,9 @@ gcode: {% if params.Z is undefined %} SET_KINEMATIC_POSITION X=0 SET_KINEMATIC_POSITION Y=0 - SET_KINEMATIC_POSITION Z={printer.toolhead.axis_maximum.z-5} + SET_KINEMATIC_POSITION Z={printer.toolhead.axis_maximum.z-10} G91 - G1 Z5 F600 + G1 Z7 F600 G1 X10 F2400 G1 Y10 F2400 G4 P2000 @@ -239,7 +293,7 @@ gcode: BEEP I=1 DUR=100 G1 X10 F1200 - SET_KINEMATIC_POSITION Z={printer.toolhead.axis_maximum.z-5} + SET_KINEMATIC_POSITION Z={printer.toolhead.axis_maximum.z-10} G90 G1 X120 Y120 F7800 @@ -282,8 +336,7 @@ gcode: SET_STEPPER_ENABLE STEPPER=stepper_z1 enable=1 SET_STEPPER_ENABLE STEPPER=extruder enable=0 - SET_FILAMENT_SENSOR SENSOR=fila ENABLE=0 - DISABLE_FILAMENT_WIDTH_SENSOR + DISABLE_ALL_SENSOR SET_GCODE_OFFSET Z=0 MOVE=0 BED_MESH_CLEAR G31 @@ -321,8 +374,7 @@ gcode: SET_STEPPER_ENABLE STEPPER=stepper_z1 enable=1 SET_STEPPER_ENABLE STEPPER=extruder enable=0 - SET_FILAMENT_SENSOR SENSOR=fila ENABLE=0 - DISABLE_FILAMENT_WIDTH_SENSOR + DISABLE_ALL_SENSOR SET_GCODE_OFFSET Z=0 MOVE=0 BED_MESH_CLEAR G31 @@ -345,6 +397,8 @@ gcode: SET_FILAMENT_SENSOR SENSOR=fila ENABLE=0 ; disable filament sensor SAVE_GCODE_STATE NAME=PAUSE ; save current print position for resume BASE_PAUSE ; pause print + G92 E0 + G1 E-5 F1800 {% if (printer.gcode_move.position.z ) < z %} G91 ; relative positioning G1 Z{z} F900 ; raise Z up by z hop amount @@ -554,7 +608,7 @@ gcode: [gcode_macro M4028] gcode: G28 - Z_TILT_ADJUST +# Z_TILT_ADJUST G28 get_zoffset M400 @@ -569,12 +623,16 @@ gcode: M118 Position init complete CLEAR_NOZZLE HOTEND=240 - Z_TILT_ADJUST +# Z_TILT_ADJUST G28 get_zoffset [gcode_macro M4030] gcode: + REVERSE_HOMING + G91 + G1 Z-30 + G90 BED_MESH_CLEAR SET_GCODE_OFFSET Z=0 MOVE=0 G28 @@ -590,7 +648,7 @@ gcode: G0 E15 F400 G4 P1000 G92 E0 - G1 E-80 F800 + G1 E-90 F800 M400 M118 Unload finish @@ -603,7 +661,7 @@ gcode: M118 Load finish [output_pin sound] -pin: U_1:PA13 +pin: gpio8 value:0 [gcode_macro beep_on] diff --git a/config/printer.cfg b/config/printer.cfg index 2d9e38e..82ff99f 100644 --- a/config/printer.cfg +++ b/config/printer.cfg @@ -10,6 +10,8 @@ # modify: delete comments # add time_update macro # [bed_mesh] 6,6 ->8,8 +#V4.4.19 2024-4-16 +# modify: add [chamber_fan chamber_fan] [include timelapse.cfg] [include Adaptive_Mesh.cfg] [include gcode_macro.cfg] @@ -180,13 +182,17 @@ microsteps: 128 rotation_distance: 4 full_steps_per_rotation: 200 endstop_pin:probe:z_virtual_endstop #U_1:PC3 for Z-max +endstop_pin_reverse:tmc2209_stepper_z:virtual_endstop position_endstop:-0.2 +position_endstop_reverse:248 position_max:248 -position_min: -6 +position_min: -4 homing_speed: 8 +homing_speed_reverse: 8 second_homing_speed: 10 homing_retract_dist: 5.0 homing_positive_dir:false +homing_positive_dir_reverse:true step_pulse_duration:0.0000001 [stepper_z1] @@ -197,6 +203,7 @@ microsteps: 128 rotation_distance: 4 full_steps_per_rotation: 200 step_pulse_duration:0.0000001 +endstop_pin_reverse:tmc2209_stepper_z1:virtual_endstop [z_tilt] z_positions: @@ -244,6 +251,8 @@ run_current: 0.6 #hold_current: 0.17 interpolate: True stealthchop_threshold: 9999999999 +diag_pin:^U_1:PC12 +driver_SGTHRS:140 [tmc2209 stepper_z1] uart_pin:U_1: PB7 @@ -251,6 +260,8 @@ run_current: 0.6 #hold_current: 0.17 interpolate: True stealthchop_threshold: 9999999999 +diag_pin:^U_1:PA13 +driver_SGTHRS:140 [heater_bed] heater_pin: U_1:PB10 @@ -312,15 +323,16 @@ hardware_pwm: false kick_start_time: 0.100 off_below: 0.0 -[heater_fan chamber_fan] +[chamber_fan chamber_fan] pin:U_1:PA4 max_power: 1.0 shutdown_speed: 0 kick_start_time: 0.5 -heater: chamber -heater_temp: 35 +heater:chamber fan_speed: 1.0 off_below: 0 +idle_timeout:60 +idle_speed:1.0 [heater_fan hotend_fan] pin:gpio25