From 8a20191f01690874c8964515cbce71a6cfcf368f Mon Sep 17 00:00:00 2001 From: Kyle Brown Date: Fri, 17 Dec 2021 17:42:42 -0800 Subject: [PATCH] dwell update, and speeds --- dock_macros.cfg | 4 ++-- macros.cfg | 3 +-- mainsail.cfg | 9 --------- print_start.cfg | 13 +++++++------ printer.cfg | 49 +++++++++++++++++++++---------------------------- 5 files changed, 31 insertions(+), 47 deletions(-) diff --git a/dock_macros.cfg b/dock_macros.cfg index 8134486..7c7fdcf 100644 --- a/dock_macros.cfg +++ b/dock_macros.cfg @@ -182,12 +182,12 @@ gcode: G0 X{ home_x - probe_x_offset } Y{ home_y - probe_y_offset } F { travel_speed } SET_KINEMATIC_POSITION Z={ z_max } - PROBE PROBE_SPEED=10 + PROBE PROBE_SPEED=40 SET_KINEMATIC_POSITION Z={probe_offset_z} G91 G0 Z2 F{ travel_speed } G90 - PROBE PROBE_SPEED=5 + PROBE PROBE_SPEED=20 SET_KINEMATIC_POSITION Z={probe_offset_z} G0 Z{ probe_offset_z + 3 } F{ travel_speed } diff --git a/macros.cfg b/macros.cfg index 048fe3b..bfa7488 100644 --- a/macros.cfg +++ b/macros.cfg @@ -108,7 +108,7 @@ gcode: [gcode_macro UNLOAD] gcode: G91 - G1 E5.0 F1200 + G1 E10.0 F1200 G1 E3.0 F1600 G1 E-13.14 F7000 G1 E-100 F3000 @@ -116,4 +116,3 @@ gcode: [gcode_macro M600] gcode: PAUSE - UNLOAD diff --git a/mainsail.cfg b/mainsail.cfg index 38ffd90..714732e 100644 --- a/mainsail.cfg +++ b/mainsail.cfg @@ -4,12 +4,3 @@ path: /home/pi/gcode_files [pause_resume] [display_status] - -[gcode_macro CANCEL_PRINT] -rename_existing: BASE_CANCEL_PRINT -gcode: - TURN_OFF_HEATERS - CLEAR_PAUSE - SDCARD_RESET_FILE - BASE_CANCEL_PRINT - diff --git a/print_start.cfg b/print_start.cfg index cbe520b..14077eb 100644 --- a/print_start.cfg +++ b/print_start.cfg @@ -3,7 +3,7 @@ gcode: {% set extruderTemp = params.EXTRUDER_TEMP|default(205)|int %} {% set bedTemp = params.BED_TEMP|default(55)|int %} - {% set DWELL = params.DWELL|default(300000)|int %} + {% set DWELL = params.DWELL|default(300)|int %} LIGHT_DISPLAY # Loading extruder and bed temperature @@ -31,11 +31,11 @@ gcode: RESPOND PREFIX= MSG="Moving to prime position" M117 Moving to prime position - PRIME_LINE EXTRUDER_TEMP={extruderTemp} XPAD=0 YPAD=0 LENGTH=50 PRINT_SPEED=30 TRAVEL_SPEED=200 PURGE=8 RETRACT=0.5 EXTRUSION_MULTIPLIER=1.25 PRINT_HANDLE=1 HANDLE_FAN=35 AREA_START={params.AREA_START} + PRIME_LINE EXTRUDER_TEMP={extruderTemp} XPAD=0 YPAD=0 LENGTH=50 PRINT_SPEED=30 TRAVEL_SPEED=200 PURGE=8 RETRACT=0.5 EXTRUSION_MULTIPLIER=1.25 PRINT_HANDLE=0 HANDLE_FAN=35 AREA_START={params.AREA_START} [gcode_macro HEATSOAK] gcode: - G4 P{params.DWELL} + G4 P{params.DWELL|int*1000} [gcode_macro LIGHT_DISPLAY] gcode: @@ -50,7 +50,8 @@ gcode: {% set line = { 'x_padding' : params.XPAD|default(0)|float, # left/right padding around the bed the line can't print into 'y_padding' : params.YPAD|default(0)|float, # top/bottom padding around the bed the line can't print into - 'area_start' : params.AREA_START.split(",")[0]|default(0)|float, # area to start the line + 'area_start_x' : params.AREA_START.split(",")[0]|default(0)|float, # area to start the line + 'area_start_y' : params.AREA_START.split(",")[1]|default(0)|float, # area to start the line 'initial_purge' : params.PURGE|default(8)|int, # mm of filament to purge before printing. set to 0 to disable 'retract_after' : params.RETRACT|default(1)|int, # mm of filament to recract after printing. set to 0 to disable 'length' : params.LENGTH|default(150)|int, @@ -64,7 +65,7 @@ gcode: 'fan_percent' : params.HANDLE_FAN|default(40)|int, # without fan the handle is too small and melty to print upright 'width' : 5.0, 'height' : 5.0, - 'move_away' : 60 # how much to move the toolhead away from the printed handle once done. set 0 to disable + 'move_away' : 40 # how much to move the toolhead away from the printed handle once done. set 0 to disable } %} # sanity check and computed variables @@ -76,7 +77,7 @@ gcode: M117 Prime Line G90 # absolute positioning - G0 X55 Y{line.area_start - 60} Z{line.height} F{line.travel_speed * 60} # move to starting position + G0 X{line.area_start_x} Y{line.area_start_y - 40} Z{line.height} F{line.travel_speed * 60} # move to starting position M109 S{params.EXTRUDER_TEMP|float*0.98} # Wait until 98% of extruder temp is reached, then continue M104 S{params.EXTRUDER_TEMP} # Set printing extruder temp G91 # relative positioning diff --git a/printer.cfg b/printer.cfg index baf23c8..87d38fe 100644 --- a/printer.cfg +++ b/printer.cfg @@ -19,7 +19,7 @@ dir_pin: PB12 enable_pin: !PB14 endstop_pin: ^PC0 rotation_distance: 40 -microsteps: 32 +microsteps: 64 position_endstop: 250 position_min: 0 position_max: 250 @@ -32,8 +32,7 @@ uart_pin: PC11 tx_pin: PC10 uart_address: 0 run_current: .9 -hold_current: 0.5 -interpolate: True +interpolate: False stealthchop_threshold: 0 [stepper_y] @@ -42,7 +41,7 @@ dir_pin: PB2 enable_pin: !PB11 rotation_distance: 40 full_steps_per_rotation: 200 -microsteps: 32 +microsteps: 64 endstop_pin: ^PC1 position_endstop: 230 position_min: -21 @@ -55,8 +54,7 @@ uart_pin: PC11 tx_pin: PC10 uart_address: 2 run_current: .9 -hold_current: 0.5 -interpolate: True +interpolate: False stealthchop_threshold: 0 [stepper_z] @@ -65,7 +63,7 @@ dir_pin: PC5 enable_pin: !PB1 rotation_distance: 40 full_steps_per_rotation: 200 -microsteps: 32 +microsteps: 64 endstop_pin: ^PC2 position_endstop: -2.6 position_max: 250 @@ -77,8 +75,7 @@ uart_pin: PC11 tx_pin: PC10 uart_address: 1 run_current: .9 -hold_current: 0.5 -interpolate: True +interpolate: False stealthchop_threshold: 0 [bed_mesh] @@ -96,7 +93,7 @@ fade_target: 0 pin: PC15 x_offset: 0.0 y_offset: 34.5 -z_offset = 6.15 +#z_offset = 6.163 speed: 25 samples_result: median samples_tolerance: 0.05 @@ -110,7 +107,7 @@ enable_pin: !PD2 rotation_distance: 21.820 # Tune for extruder gear_ratio: 50:17 -microsteps: 32 +microsteps: 64 full_steps_per_rotation: 200 nozzle_diameter: 0.400 filament_diameter: 1.750 @@ -118,8 +115,6 @@ heater_pin: PC8 pressure_advance: 0.05 pressure_advance_smooth_time: 0.040 sensor_type: ATC Semitec 104GT-2 -#sensor_type: EPCOS 100K B57560G104F -#sensor_type: NTC 100K beta 3950 sensor_pin: PA0 control = pid pid_kp = 27.402 @@ -133,8 +128,7 @@ uart_pin: PC11 tx_pin: PC10 uart_address: 3 run_current: 0.6 -hold_current: 0.45 -interpolate: True +interpolate: False [heater_fan basement_fan] pin: PC14 @@ -231,10 +225,10 @@ probe_points: 125,119,20 [input_shaper] -#shaper_type_x = mzv -#shaper_freq_x = 51.2 +shaper_type_x = zv +shaper_freq_x = 56.0 shaper_type_y: zv -shaper_freq_y: 42.0 +shaper_freq_y: 47.2 #*# <---------------------- SAVE_CONFIG ----------------------> #*# DO NOT EDIT THIS BLOCK OR BELOW. The contents are auto-generated. @@ -242,20 +236,19 @@ shaper_freq_y: 42.0 #*# [bed_mesh default] #*# version = 1 #*# points = -#*# -0.003125, -0.012500, 0.034375 -#*# -0.031250, -0.050000, -0.003125 -#*# 0.006250, 0.000000, 0.006250 +#*# -0.009375, 0.000000, 0.015625 +#*# -0.031250, -0.012500, -0.006250 +#*# -0.025000, -0.031250, -0.025000 #*# tension = 0.2 -#*# min_x = 97.3 +#*# min_x = 89.2 #*# algo = lagrange #*# y_count = 3 #*# mesh_y_pps = 2 -#*# min_y = 69.4 +#*# min_y = 81.7 #*# x_count = 3 -#*# max_y = 160.68 +#*# max_y = 148.3 #*# mesh_x_pps = 2 -#*# max_x = 147.68 +#*# max_x = 155.8 #*# -#*# [input_shaper] -#*# shaper_type_x = mzv -#*# shaper_freq_x = 51.8 +#*# [probe] +#*# z_offset = 6.100