From d6048da6c156288d0484cf9bfbc9fb199145588d Mon Sep 17 00:00:00 2001 From: CChen616 <714434105@qq.com> Date: Tue, 18 Jun 2024 09:52:27 +0800 Subject: [PATCH] V4.4.20 update --- config/gcode_macro.cfg | 280 +++++++++++++---------------------------- config/printer.cfg | 123 +++--------------- 2 files changed, 108 insertions(+), 295 deletions(-) diff --git a/config/gcode_macro.cfg b/config/gcode_macro.cfg index eedb10a..8917434 100644 --- a/config/gcode_macro.cfg +++ b/config/gcode_macro.cfg @@ -1,8 +1,11 @@ # Q1_Pro # V4.4.16 2024-3-14 -# modify: variable change M106 & M141 & M107 +# update: variable change M106 & M141 & M107 # V4.4.16 2024-3-26 -# modify: variable change [homing_override]->add M204 S10000 +# update: variable change [homing_override]->add M204 S10000 +# v4.4.20 2024-6-17 +# update: Z_DOUDONG CLEAR_NOZZLE get_zoffset rewrite +# move_subzoffset added [gcode_macro test_zoffset] gcode: @@ -11,18 +14,30 @@ gcode: G1 X{120 - printer.probe["x_offset"]} Y{120 - printer.probe["y_offset"]} F9000 G1 Z10 F600 probe + M400 + G4 P5000 G1 Z10 F600 +[gcode_macro move_subzoffset] +gcode: + + G1 Z{printer.probe.last_z_result} F600 + [gcode_macro get_zoffset] gcode: G1 Z10 F600 Z_DOUDONG - G4 P500 + ;G4 P500 QIDI_PROBE_PIN_1 - probe probe_speed=10 samples=3 - SET_KINEMATIC_POSITION Z=-0.1 + M204 S30 + G4 P500 + probe probe_speed=5 lift_speed=5 samples=5 sample_retract_dist=5 + move_subzoffset + M114 + SET_KINEMATIC_POSITION Z=-0.07 G1 Z30 F600 QIDI_PROBE_PIN_2 + M204 S10000 [gcode_macro save_zoffset] gcode: @@ -46,8 +61,9 @@ gcode: G1 Z5 F900 G90 {% endif %} - G1 X97 F9000 - G1 Y254 F9000 + G1 X97 F15000 + G1 Y243 F15000 + G1 Y254 F800 M109 S{hotendtemp} @@ -55,22 +71,20 @@ gcode: G1 E80 F400 M106 S255 - G1 X98 F500 + G1 X97 F500 G1 X85 F2000 - G1 X98 F2000 + G1 X97 F2000 G1 X85 F2000 - G1 X98 F2000 + G1 X97 F2000 G1 X85 F2000 - G1 X98 F2000 + G1 X97 F2000 G1 X85 F2000 - G1 X98 F2000 + G1 X97 F2000 G1 X85 F2000 - G1 X98 F2000 + G1 X97 F2000 G1 X85 F2000 - G1 X98 F2000 - G1 Y240 F9000 - - + G1 X97 F2000 + G1 Y240 F800 [gcode_macro CLEAR_NOZZLE] gcode: @@ -82,8 +96,9 @@ gcode: G1 Z5 F900 G90 {% endif %} - G1 X97 F9000 - G1 Y254 F9000 + G1 X97 F15000 + G1 Y243 F15000 + G1 Y254 F800 M109 S{hotendtemp} @@ -93,56 +108,45 @@ gcode: M400 M106 P2 S0 M104 S0 - TEMPERATURE_WAIT SENSOR=extruder MAXIMUM={hotendtemp-30} + TEMPERATURE_WAIT SENSOR=extruder MAXIMUM={hotendtemp-20} G1 X85 F2000 - G1 X98 F2000 - G1 X85 F2000 - G1 X98 F2000 + G1 X97 F2000 G1 X85 F2000 - G1 X98 F2000 + G1 X97 F2000 G1 X85 F2000 - G1 X98 F2000 + G1 X97 F2000 G1 X85 F2000 - G1 X98 F2000 + G1 X97 F2000 G1 X85 F2000 G1 X65 F500 G1 X88 F500 G1 X65 F500 - G1 X88 F500 - G1 X65 F500 - - G1 Y249 F500 - G1 Y254 F500 - G1 Y249 F500 - G1 Y254 F500 - G1 Y249 F500 - G1 Y253.5 F500 - G1 X88 F500 G1 X65 F500 G1 X88 F500 G1 X65 F500 - G1 X85 F500 - - G1 X98 F500 - G1 X85 F2000 - G1 X98 F2000 + G1 X88 F500 + G1 X65 F500 + G1 X97 F500 + G1 X85 F2000 - G1 X98 F2000 + G1 X97 F2000 G1 X85 F2000 - G1 X98 F2000 + G1 X97 F2000 G1 X85 F2000 - G1 X98 F2000 + G1 X97 F2000 G1 X85 F2000 - G1 X98 F2000 + G1 X97 F2000 G1 X85 F2000 - G1 X98 F2000 + G1 X97 F2000 + M400 M118 Nozzle cleared - G1 Y120 F9000 - G1 X230 F9000 + G1 Y240 F800 + G1 Y120 F15000 + G1 X230 F15000 TEMPERATURE_WAIT SENSOR=extruder MAXIMUM=140 M107 M106 P2 S0 @@ -188,7 +192,6 @@ gcode: SET_FILAMENT_SENSOR SENSOR=fila ENABLE=0 DISABLE_FILAMENT_WIDTH_SENSOR - [gcode_macro AUTOTUNE_SHAPERS] variable_autotune_shapers: 'ei' gcode: @@ -212,19 +215,13 @@ gcode: M118 No: CLEAR_LAST_FILE {% endif %} -[delayed_gcode KINEMATIC_POSITION] +[delayed_gcode PRINTER_INIT] initial_duration:0.2 gcode: SET_STEPPER_ENABLE STEPPER=stepper_z enable=1 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 %} [homing_override] axes:xyz @@ -343,9 +340,6 @@ gcode: CLEAR_LAST_FILE BEEP I=2 DUR=500 - - - [gcode_macro CANCEL_PRINT] rename_existing: BASE_CANCEL_PRINT gcode: @@ -417,7 +411,6 @@ gcode: SET_STEPPER_ENABLE STEPPER=extruder enable=0 {% endif %} - [gcode_macro RESUME] rename_existing: BASE_RESUME variable_zhop: 0 @@ -459,8 +452,6 @@ gcode: SET_FILAMENT_SENSOR SENSOR=fila ENABLE=1 ; enable filament sensor {% endif %} - - [gcode_macro BEEP] gcode: {% set i = params.I|default(1)|int %} ; Iterations (number of times to beep). @@ -607,8 +598,6 @@ gcode: [gcode_macro M4028] gcode: - G28 -# Z_TILT_ADJUST G28 get_zoffset M400 @@ -623,16 +612,12 @@ gcode: M118 Position init complete CLEAR_NOZZLE HOTEND=240 -# 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 @@ -640,8 +625,28 @@ gcode: G1 X120 Y120 F9000 G1 Z0 F600 +[gcode_macro M4031] +gcode: + SET_TMC_CURRENT STEPPER=stepper_z CURRENT={printer.configfile.settings['tmc2209 stepper_z'].run_current * 0.8 } + SET_TMC_CURRENT STEPPER=stepper_z1 CURRENT={printer.configfile.settings['tmc2209 stepper_z1'].run_current * 0.8 } + REVERSE_HOMING + SET_TMC_CURRENT STEPPER=stepper_z CURRENT={printer.configfile.settings['tmc2209 stepper_z'].run_current} + SET_TMC_CURRENT STEPPER=stepper_z1 CURRENT={printer.configfile.settings['tmc2209 stepper_z1'].run_current} + G91 + G1 Z-30 F600 + G90 + + SET_TMC_CURRENT STEPPER=stepper_z CURRENT={printer.configfile.settings['tmc2209 stepper_z'].run_current * 0.8 } + SET_TMC_CURRENT STEPPER=stepper_z1 CURRENT={printer.configfile.settings['tmc2209 stepper_z1'].run_current * 0.8 } + REVERSE_HOMING + SET_TMC_CURRENT STEPPER=stepper_z CURRENT={printer.configfile.settings['tmc2209 stepper_z'].run_current} + SET_TMC_CURRENT STEPPER=stepper_z1 CURRENT={printer.configfile.settings['tmc2209 stepper_z1'].run_current} + G91 + G1 Z-30 F600 + G90 + [gcode_macro M603] -description: filament unlode +description: filament unload gcode: M118 Heat up complete G92 E0 @@ -744,126 +749,19 @@ gcode: [gcode_macro Z_DOUDONG] gcode: - m204 S5000 - G91 - G1 X2 F6000 - G1 X-2 F6000 - G1 X2 F6000 - G1 X-2 F6000 - G1 X2 F6000 - G1 X-2 F6000 - G1 X2 F6000 - G1 X-2 F6000 - G1 X2 F6000 - G1 X-2 F6000 - G1 X2 F6000 - G1 X-2 F6000 - - G1 Y2 F6000 - G1 Y-2 F6000 - G1 Y2 F6000 - G1 Y-2 F6000 - G1 Y2 F6000 - G1 Y-2 F6000 - G1 Y2 F6000 - G1 Y-2 F6000 - G1 Y2 F6000 - G1 Y-2 F6000 - G1 Y2 F6000 - G1 Y-2 F6000 - G1 Y2 F6000 - G1 Y-2 F6000 - - G90 - m204 S5000 - SET_Z_VELOCITY_LIMIT VALUE=15 - SET_PIN PIN=ctlyd VALUE=1 - G91 - G1 Z1 F900 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 + M204 S30 G90 + G0 Z1 + G91 + G4 P3000 + SET_PIN PIN=ctlyd VALUE=1 + {% for z in range(1,7) %} + G1 Z10 F900 + G1 Z-10 F900 + {% endfor %} SET_PIN PIN=ctlyd VALUE=0 - SET_Z_VELOCITY_LIMIT VALUE=10 - G4 P500 + G4 P1000 + G1 Z4 + G90 +# M204 S10000 + diff --git a/config/printer.cfg b/config/printer.cfg index 5d9dbae..ee3f019 100644 --- a/config/printer.cfg +++ b/config/printer.cfg @@ -1,17 +1,25 @@ # Q1_Pro # V4.4.14 2024-3-14 -# modify: heater_generic hot -> chamber +# update: heater_generic hot -> chamber # out_put_pin fan0 -> fan_generic cooling_fan # out_put_pin fan2 -> fan_generic auxiliary_cooling_fan # out_put_pin fan3 -> fan_generic chamber_circulation_fan # heater_fan hot -> heater_fan chamber # verify_heater hot -> verify_heater chamber # V4.4.17 2024-3-29 -# modify: delete comments +# update: delete comments # add time_update macro # [bed_mesh] 6,6 ->8,8 -#V4.4.19 2024-4-16 -# modify: add [chamber_fan chamber_fan] +# V4.4.19 2024-4-16 +# update: add [chamber_fan chamber_fan] +# V4.4.20 2024-6-17 +# update: [smart_effector] +# samples_result: average -> submaxmin +# speed: 10 -> 5 +# sample_retract_dist: 3.0 -> 5.0 +# [stepper_x] +# position_max: 245 -> 246 + [include timelapse.cfg] [include Adaptive_Mesh.cfg] [include gcode_macro.cfg] @@ -77,7 +85,6 @@ min_diameter: 0.3 use_current_dia_while_delay: False pause_on_runout:True runout_gcode: - pause RESET_FILAMENT_WIDTH_SENSOR M118 Filament run out event_delay: 3.0 @@ -152,7 +159,7 @@ full_steps_per_rotation:200 #set to 400 for 0.9 degree stepper endstop_pin:tmc2240_stepper_x:virtual_endstop position_min: -5.5 position_endstop: -5.5 -position_max:245 +position_max:246 homing_speed:50 homing_retract_dist:0 homing_positive_dir:False @@ -395,11 +402,12 @@ recovery_time:0 x_offset: 17.6 y_offset: 4.4 z_offset: 0.000001 -speed:10 +speed:5 +lift_speed:5 probe_accel:50 samples: 2 -samples_result: average -sample_retract_dist: 3.0 +samples_result: submaxmin +sample_retract_dist: 5.0 samples_tolerance: 0.05 samples_tolerance_retries:5 @@ -417,105 +425,12 @@ algorithm:bicubic bicubic_tension:0.2 mesh_pps: 2, 2 vibrate_gcode: - G90 - m204 S5000 - SET_Z_VELOCITY_LIMIT VALUE=15 - SET_PIN PIN=ctlyd VALUE=1 - G4 P500 - G91 - G1 Z1 F900 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G1 Z1 - G1 Z-1 - G90 - SET_PIN PIN=ctlyd VALUE=0 - SET_Z_VELOCITY_LIMIT VALUE=10 - G4 P500 + Z_DOUDONG [filament_switch_sensor fila] pause_on_runout: True runout_gcode: - PAUSE + M118 Filament tangle detected event_delay: 3.0 pause_delay: 0.5 switch_pin:U_1:PC3