From d9c586544f7232d137c9ae07b2e5bb84724c53b1 Mon Sep 17 00:00:00 2001
From: Torsten <torsten@rubydesign.fi>
Date: Mon, 30 Jan 2023 15:47:53 +0200
Subject: [PATCH] more unification

---
 printer.cfg | 152 ++++++++++++----------------------------------------
 1 file changed, 34 insertions(+), 118 deletions(-)

diff --git a/printer.cfg b/printer.cfg
index 3ee70f0..c2a5e01 100644
--- a/printer.cfg
+++ b/printer.cfg
@@ -78,49 +78,49 @@ pin: PD12
 # Modify printer.cfg to tune acceleration.
 [printer]
 kinematics: corexy
-max_velocity: 300
-max_accel: 1500
+max_velocity: 150
+max_accel: 500
 max_accel_to_decel: 750
 max_z_velocity: 15
 max_z_accel: 20
 
-[printer]
-max_velocity: 150
-max_accel: 500
-max_accel_to_decel: 500
-max_z_velocity: 15
-max_z_accel: 20
-
-
 #############################################################################################################
 ### STEPPER MOTORS, DRIVERS & SPEED LIMITS
 ### Pick the drivers and stepper motors you're using. See the RatOS documentation for custom combinations.
 #############################################################################################################
 [stepper_x]
-step_pin: PF13
-dir_pin: PF12
 enable_pin: !PF14
+dir_pin: PF12
+step_pin: PF13
+endstop_pin: PG6
+
+position_endstop: 0 # Adjust this to your setup
+position_max: 500
 rotation_distance: 40
 microsteps: 64
 homing_speed: 50
-homing_retract_dist: 0
-position_max: 500
+homing_retract_dist: 5.0
 
 [stepper_y]
-position_max: 500
-step_pin: PG0
-dir_pin: PG1
 enable_pin: !PF15
+step_pin: PG0
+endstop_pin: PG9
+dir_pin: PG1
+
+position_min: 5
+position_endstop: 480
+position_max: 500
 rotation_distance: 40
 microsteps: 64
 homing_speed: 50
-homing_retract_dist: 0
+homing_positive_dir: true
+homing_retract_dist: 5.0
 
 [stepper_z]
 endstop_pin: probe:z_virtual_endstop
-step_pin: PC13
-dir_pin: PF0
 enable_pin: !PF1
+step_pin: PC13
+dir_pin: !PF0 # Add ! in front of pin name to reverse Z stepper direction
 rotation_distance: 4
 microsteps: 64
 position_min: -5 # Needed for z-offset calibration and tilt_adjust.
@@ -128,28 +128,21 @@ homing_speed: 10
 position_max: 500
 
 [stepper_z1]
-step_pin: PE2
-dir_pin: PE3
+endstop_pin: probe: z_virtual_endstop
 enable_pin: !PD4
+step_pin: PE2
+dir_pin: !PE3 # Add ! in front of pin name to reverse Z1 direction
 rotation_distance: 4
 microsteps: 64
 
 [stepper_z2]
-step_pin: PE6
-dir_pin: PA14
+endstop_pin: probe: z_virtual_endstop
 enable_pin: !PE0
+step_pin: PE6
+dir_pin: !PA14 # Add ! in front of pin name to reverse Z2 direction
 rotation_distance: 4
 microsteps: 64
-
-[extruder]
-step_pin: PF11
-dir_pin: !PG3
-enable_pin: !PG5
-microsteps: 64
-
-# UNCOOLED TMC 2209 + LDO-42STH48-2504AC
-[bed_mesh]
-speed: 200
+rotation_distance: 4 # 4 for TR8*4 lead screws
 
 [z_tilt]
 speed: 200
@@ -232,15 +225,7 @@ pin_up_touch_mode_reports_triggered: True
 x_offset: -28
 y_offset: -13
 
-# Physical endstops
-[stepper_x]
-endstop_pin: PG6
-homing_retract_dist: 5.0
 
-[stepper_y]
-endstop_pin: PG9
-homing_positive_dir: true
-homing_retract_dist: 5.0
 
 [safe_z_home]
 home_xy_position: 150,150
@@ -257,11 +242,11 @@ z_hop: 12
 
 [bed_mesh]
 horizontal_move_z: 5
-mesh_min: 20,20
+mesh_min: 15,15
 mesh_max:465,460
-probe_count: 7,7
+probe_count: 28,13
 fade_start: 1.0
-fade_end: 10.0
+fade_end: 100.0
 mesh_pps: 2,2
 algorithm: bicubic
 bicubic_tension: .2
@@ -287,6 +272,10 @@ retry_tolerance: 0.02
 #############################################################################################################
 
 [extruder]
+step_pin: PF11
+dir_pin: !PG3
+enable_pin: !PG5
+microsteps: 64
 rotation_distance: 4.63
 full_steps_per_rotation: 200
 filament_diameter: 1.750
@@ -373,51 +362,6 @@ variable_pause_print_park_in: "back"
 variable_macro_travel_speed: 100
 
 
-#############################################################################################################
-### PRINTER CONFIGURATION
-### Customize the defaults to your specific build
-#############################################################################################################
-[stepper_x]
-dir_pin: PF12 # Add ! in front of pin name to reverse X stepper direction
-rotation_distance: 40 # 40 for 20 tooth 2GT pulleys, 32 for 16 tooth 2GT pulleys
-position_endstop: 0 # Adjust this to your setup
-#x_offset: -27.0
-
-
-
-[stepper_y]
-dir_pin: PG1 # Add ! in front of pin name to reverse Y stepper direction
-rotation_distance: 40 # 40 for 20 tooth 2GT pulleys, 32 for 16 tooth 2GT pulleys
-position_endstop: 480  # 300mm printer
-position_min: 5
-#y_offset: -21.0
-
-
-#position_endstop: 400 # 400mm printer
-#position_endstop: 500 # 500mm printer
-
-[stepper_z]
-dir_pin: !PF0 # Add ! in front of pin name to reverse Z stepper direction
-rotation_distance: 4 # 4 for TR8*4 lead screws
-endstop_pin: probe: z_virtual_endstop
-
-[stepper_z1]
-dir_pin: !PE3 # Add ! in front of pin name to reverse Z1 direction
-rotation_distance: 4 # 4 for TR8*4 lead screws
-endstop_pin: probe: z_virtual_endstop
-
-[stepper_z2]
-dir_pin: !PA14 # Add ! in front of pin name to reverse Z2 direction
-rotation_distance: 4 # 4 for TR8*4 lead screws
-endstop_pin: probe: z_virtual_endstop
-
-
-# [probe]
-# z_offset: 1.0 # Adjust this to fit your setup -> "1.0" is placeholder!
-# pin: ^PB7 # For NPN NC probes such as the Super Pinda / Vinda / SupCR / Decoprobe probes.
-#pin: ^!PB7 # NPN NO (refer to the specs on your probe)
-#pin: PB7 # PNP NO (refer to the specs on your probe)
-#pin: !PB7 # PNP NC (refer to the specs on your probe)
 
 # Safe Z Home (Physical endstops only)
 [safe_z_home]
@@ -431,34 +375,6 @@ z_hop_speed: 5
 #home_xy_position: 200,200 # 400mm printer
 #home_xy_position: 250,250 # 500mm printer
 
-[extruder]
-# Check https://www.klipper3d.org/Pressure_Advance.html for pressure advance tuning.
-#pressure_advance: 0.05
-nozzle_diameter: 0.4 # Remember to change this if you change nozzle diameter.
-dir_pin: PG3 # Remove ! in front of pin name to reverse extruder direction
-#control: pid
-#pid_kp: 28.413
-#pid_ki: 1.334
-#pid_kd: 151.300
-
-
-# [bed_mesh]
-# speed: 30
-# horizontal_move_z: 10
-# mesh_min: 15, 15
-# mesh_max: 450, 450
-# probe_count: 5 , 5
-
-[bed_mesh]
-horizontal_move_z: 5
-mesh_min: 15,15
-mesh_max:465,460
-probe_count: 28,13
-fade_start: 1.0
-fade_end: 100.0
-mesh_pps: 2,2
-algorithm: bicubic
-bicubic_tension: .2
 
 #############################################################################################################
 ### INPUT SHAPER