diff --git a/basic_macros.cfg b/basic_macros.cfg index 5de6f4c..9fe4af1 100644 --- a/basic_macros.cfg +++ b/basic_macros.cfg @@ -7,8 +7,8 @@ gcode: {% set chamberTemp = params.CHAMBER|default(0)|int %} # User Parameters - {% set x_park = 0 %} - {% set y_park = 20 %} + {% set x_park = 20 %} + {% set y_park = 0 %} {% set z_park = 0.3 %} {% set travel_speed = 300 %} # in mm/s {% set z_speed = 5 %} # in mm/s @@ -26,6 +26,8 @@ gcode: SET_DOCKABLE_PROBE AUTO_ATTACH_DETACH=1 # Disable probe attach/detach ATTACH_PROBE FAST_TILT # Z-Tilt after soak + ATTACH_PROBE + BED_MESH_CALIBRATE DETACH_PROBE # Ensure probe is detached SET_DOCKABLE_PROBE AUTO_ATTACH_DETACH=1 # Enable probe attach/detach G90 # Absolute positioning @@ -72,16 +74,16 @@ gcode: {% set max_z = printer.configfile.config["stepper_z"]["position_max"]|float %} # Check end position to determine safe direction to move - {% if printer.toolhead.position.x < (max_x - 20) %} - {% set x_safe = 20.0 %} + {% if printer.toolhead.position.x < (max_x - 30) %} + {% set x_safe = 30.0 %} {% else %} - {% set x_safe = -20.0 %} + {% set x_safe = -30.0 %} {% endif %} - {% if printer.toolhead.position.y < (max_y - 200) %} - {% set y_safe = 20.0 %} + {% if printer.toolhead.position.y < (max_y - 90) %} + {% set y_safe = 30.0 %} {% else %} - {% set y_safe = -20.0 %} + {% set y_safe = -30.0 %} {% endif %} {% if printer.toolhead.position.z < (max_z -30) %} # Overshoot for homing retract @@ -160,9 +162,9 @@ gcode: M117 Purging Nozzle... G1 X{x_start} Y{y_start} Z{z} # Go to starting position G1 E10 F{10*60} # Prepurge in place before line - G1 X{x_start + length} Y{y_start} E15 F{10*60} # Purge length in positive Y - G1 X{x_start + length} Y{y_start + 0.5} F{10*60} # Move 0.5 positive in X for return line - G1 X{x_start + length / 2} Y{y_start + 0.5} E10 F{10*60} # Purge half a line the other direction + G1 X{x_start + length} Y{y_start} E20 F{15*60} # Purge length in positive Y + G1 X{x_start + length} Y{y_start + 0.5} E20 F{15*60} # Move 0.5 positive in X for return line + G1 X{x_start + length / 2} Y{y_start + 0.5} E20 F{10*60} # Purge half a line the other direction G92 E0 # Reset extruder position [gcode_macro PURGE_Y] @@ -178,9 +180,9 @@ gcode: M117 Purging Nozzle... G1 X{x_start} Y{y_start} Z{z} # Go to starting position G1 E10 F{10*60} # Prepurge in place before line - G1 X{x_start} Y{y_start + length} E15 F{10*60} # Purge length in positive Y - G1 X{x_start + 0.5} Y{y_start + length} F{10*60} # Move 0.5 positive in X for return line - G1 X{x_start + 0.5} Y{y_start + length / 2} E10 F{10*60} # Purge half a line the other direction + G1 X{x_start} Y{y_start + length} E20 F{15*60} # Purge length in positive Y + G1 X{x_start + 0.5} Y{y_start + length} E20 F{15*60} # Move 0.5 positive in X for return line + G1 X{x_start + 0.5} Y{y_start + length / 2} E20 F{15*60} # Purge half a line the other direction G92 E0 # Reset extruder position [gcode_macro PID_HOTEND] @@ -231,7 +233,7 @@ gcode: [gcode_macro CALIBRATE_PROBE] gcode: G90 - G0 X76 Y43 + G0 X50 Y60.4 PROBE_CALIBRATE [gcode_macro BATCH_PRINT_MODE] diff --git a/printer.cfg b/printer.cfg index a03954b..b8de328 100644 --- a/printer.cfg +++ b/printer.cfg @@ -37,7 +37,7 @@ serial: /dev/serial/by-id/usb-Klipper_stm32g0b1xx_32002C000750414235363020-if00 kinematics: corexy max_velocity: 800 max_accel: 20000 -minimum_cruise_ratio: 0 +minimum_cruise_ratio: 0.5 max_z_velocity: 15 max_z_accel: 45 square_corner_velocity: 8 @@ -220,32 +220,33 @@ timeout: 1800 [dockable_probe] pin: skrPico:gpio25 -dock_position: 120, 115.5 -approach_position: 90, 115.5 +dock_position: 120, 115.9 +approach_position: 90, 115.9 detach_position: 120, 80 z_hop: 20.0 dock_retries: 3 -attach_speed: 50 +attach_speed: 100 detach_speed: 15 travel_speed: 500 auto_attach_detach: True check_open_attach: True -sample_retract_dist: 4.0 -samples: 1 +sample_retract_dist: 1 +samples: 3 +speed: 3 # z speed -x_offset: 30 +x_offset: 13.7 y_offset: -2.4 -z_offset = 9.355 +z_offset = 15 [bed_mesh] speed: 300 horizontal_move_z: 16 zero_reference_position: 60, 60 -mesh_min: 8, 22.4 -mesh_max: 110, 105 +mesh_min: 15, 28 +mesh_max: 95, 95 probe_count: 3,3 algorithm: bicubic -bicubic_tension: 0.2 +bicubic_tension: 0.1 [gcode_arcs] resolution: 0.1 diff --git a/sensorless.cfg b/sensorless.cfg index 5290ba6..7fac61f 100644 --- a/sensorless.cfg +++ b/sensorless.cfg @@ -66,7 +66,7 @@ gcode: {% if home_all or 'Z' in params %} G90 # Absolute positioning # park above bed center - G1 X{(printer.toolhead.axis_maximum.x/2)-30} Y{(printer.toolhead.axis_maximum.y/2)+2.4} + G1 X{(printer.toolhead.axis_maximum.x/2)-10} Y{(printer.toolhead.axis_maximum.y/2)+2.4} G28 Z G91 {% endif %} diff --git a/tri_zero.cfg b/tri_zero.cfg index 4cdf149..9fb2fab 100644 --- a/tri_zero.cfg +++ b/tri_zero.cfg @@ -20,7 +20,7 @@ rotation_distance: 80 endstop_pin: probe:z_virtual_endstop position_max: 110 position_min: -3 -homing_speed: 10 +homing_speed: 20 second_homing_speed: 3 homing_retract_dist: 8 homing_positive_dir: False @@ -70,16 +70,16 @@ stealthchop_threshold: 0 [z_tilt] z_positions: -47.5, 15 - 60, 141 + 60, 115 167.5, 15 points: - 0, 26 - 30, 90 - 80, 24 + 0, 28 + 50, 108 + 95, 28 speed: 500 horizontal_move_z: 18 retries: 15 -retry_tolerance: 0.0125 +retry_tolerance: 0.0200 [gcode_macro FAST_TILT] gcode: @@ -93,4 +93,3 @@ gcode: Z_TILT_ADJUST horizontal_move_z=16 G28 Z DETACH_PROBE -