From f013b7bae6597e106fcade946b2494be682798b3 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Sun, 24 Oct 2021 20:53:36 -0400 Subject: [PATCH] test: Update test cases to use rotation_distance Remove all users of step_distance from test configs. Signed-off-by: Kevin O'Connor --- test/klippy/bed_screws.cfg | 9 ++++++--- test/klippy/bltouch.cfg | 12 ++++++++---- test/klippy/delta_calibrate.cfg | 9 ++++++--- test/klippy/dual_carriage.cfg | 18 ++++++++++++------ test/klippy/extruders.cfg | 15 ++++++++++----- test/klippy/gcode_arcs.cfg | 12 ++++++++---- test/klippy/macros.cfg | 12 ++++++++---- test/klippy/manual_stepper.cfg | 6 ++++-- test/klippy/multi_z.cfg | 18 ++++++++++++------ test/klippy/screws_tilt_adjust.cfg | 12 ++++++++---- test/klippy/sdcard_loop.cfg | 12 ++++++++---- test/klippy/temperature.cfg | 12 ++++++++---- test/klippy/tmc.cfg | 24 ++++++++++++------------ test/klippy/z_tilt.cfg | 21 ++++++++++++++------- test/klippy/z_virtual_endstop.cfg | 12 ++++++++---- 15 files changed, 132 insertions(+), 72 deletions(-) diff --git a/test/klippy/bed_screws.cfg b/test/klippy/bed_screws.cfg index 5033e317..a38ae7e8 100644 --- a/test/klippy/bed_screws.cfg +++ b/test/klippy/bed_screws.cfg @@ -3,7 +3,8 @@ step_pin: ar54 dir_pin: ar55 enable_pin: !ar38 -step_distance: .0125 +rotation_distance: 40 +microsteps: 16 endstop_pin: ^ar3 position_endstop: 0 position_max: 200 @@ -13,7 +14,8 @@ homing_speed: 50 step_pin: ar60 dir_pin: !ar61 enable_pin: !ar56 -step_distance: .0125 +rotation_distance: 40 +microsteps: 16 endstop_pin: ^ar14 position_endstop: 0 position_max: 200 @@ -23,7 +25,8 @@ homing_speed: 50 step_pin: ar46 dir_pin: ar48 enable_pin: !ar62 -step_distance: .0025 +rotation_distance: 8 +microsteps: 16 endstop_pin: ^ar18 position_endstop: 0.5 position_max: 200 diff --git a/test/klippy/bltouch.cfg b/test/klippy/bltouch.cfg index 6390b598..8e9a9dc1 100644 --- a/test/klippy/bltouch.cfg +++ b/test/klippy/bltouch.cfg @@ -3,7 +3,8 @@ step_pin: ar54 dir_pin: ar55 enable_pin: !ar38 -step_distance: .0125 +microsteps: 16 +rotation_distance: 40 endstop_pin: ^ar3 position_endstop: 0 position_max: 200 @@ -13,7 +14,8 @@ homing_speed: 50 step_pin: ar60 dir_pin: !ar61 enable_pin: !ar56 -step_distance: .0125 +microsteps: 16 +rotation_distance: 40 endstop_pin: ^ar14 position_endstop: 0 position_max: 200 @@ -23,7 +25,8 @@ homing_speed: 50 step_pin: ar46 dir_pin: ar48 enable_pin: !ar62 -step_distance: .0025 +microsteps: 16 +rotation_distance: 8 endstop_pin: probe:z_virtual_endstop position_max: 200 @@ -31,7 +34,8 @@ position_max: 200 step_pin: ar26 dir_pin: ar28 enable_pin: !ar24 -step_distance: .002 +microsteps: 16 +rotation_distance: 33.5 nozzle_diameter: 0.400 filament_diameter: 1.750 heater_pin: ar10 diff --git a/test/klippy/delta_calibrate.cfg b/test/klippy/delta_calibrate.cfg index 666b09a2..c29ca39a 100644 --- a/test/klippy/delta_calibrate.cfg +++ b/test/klippy/delta_calibrate.cfg @@ -3,7 +3,8 @@ step_pin: ar54 dir_pin: ar55 enable_pin: !ar38 -step_distance: .000100 +microsteps: 16 +rotation_distance: 0.32 endstop_pin: ^ar2 homing_speed: 50 #position_endstop: 297.05 @@ -13,14 +14,16 @@ homing_speed: 50 step_pin: ar60 dir_pin: ar61 enable_pin: !ar56 -step_distance: .000100 +microsteps: 16 +rotation_distance: 0.32 endstop_pin: ^ar15 [stepper_c] step_pin: ar46 dir_pin: ar48 enable_pin: !ar62 -step_distance: .000100 +microsteps: 16 +rotation_distance: 0.32 endstop_pin: ^ar19 [mcu] diff --git a/test/klippy/dual_carriage.cfg b/test/klippy/dual_carriage.cfg index a9d3746e..298e0e30 100644 --- a/test/klippy/dual_carriage.cfg +++ b/test/klippy/dual_carriage.cfg @@ -3,7 +3,8 @@ step_pin: ar54 dir_pin: ar55 enable_pin: !ar38 -step_distance: .0125 +microsteps: 16 +rotation_distance: 40 endstop_pin: ^ar3 position_endstop: 0 position_max: 200 @@ -14,7 +15,8 @@ axis: x step_pin: ar16 dir_pin: ar17 enable_pin: !ar23 -step_distance: .0125 +microsteps: 16 +rotation_distance: 40 endstop_pin: ^ar2 position_endstop: 200 position_max: 200 @@ -24,7 +26,8 @@ homing_speed: 50 step_pin: ar60 dir_pin: !ar61 enable_pin: !ar56 -step_distance: .0125 +microsteps: 16 +rotation_distance: 40 endstop_pin: ^ar14 position_endstop: 0 position_max: 200 @@ -34,7 +37,8 @@ homing_speed: 50 step_pin: ar46 dir_pin: ar48 enable_pin: !ar62 -step_distance: .0025 +microsteps: 16 +rotation_distance: 8 endstop_pin: ^ar18 position_endstop: 0.5 position_max: 200 @@ -43,7 +47,8 @@ position_max: 200 step_pin: ar26 dir_pin: ar28 enable_pin: !ar24 -step_distance: .002 +microsteps: 16 +rotation_distance: 33.5 nozzle_diameter: 0.400 filament_diameter: 1.750 heater_pin: ar10 @@ -71,7 +76,8 @@ gcode: step_pin: ar36 dir_pin: ar34 enable_pin: !ar30 -step_distance: .002 +microsteps: 16 +rotation_distance: 33.5 nozzle_diameter: 0.400 filament_diameter: 1.750 heater_pin: ar11 diff --git a/test/klippy/extruders.cfg b/test/klippy/extruders.cfg index 5d61141c..41d6df55 100644 --- a/test/klippy/extruders.cfg +++ b/test/klippy/extruders.cfg @@ -3,7 +3,8 @@ step_pin: ar54 dir_pin: ar55 enable_pin: !ar38 -step_distance: .0125 +microsteps: 16 +rotation_distance: 40 endstop_pin: ^ar3 position_endstop: 0 position_max: 200 @@ -13,7 +14,8 @@ homing_speed: 50 step_pin: ar60 dir_pin: !ar61 enable_pin: !ar56 -step_distance: .0125 +microsteps: 16 +rotation_distance: 40 endstop_pin: ^ar14 position_endstop: 0 position_max: 200 @@ -23,7 +25,8 @@ homing_speed: 50 step_pin: ar46 dir_pin: ar48 enable_pin: !ar62 -step_distance: .0025 +microsteps: 16 +rotation_distance: 8 endstop_pin: ^ar18 position_endstop: 0.5 position_max: 200 @@ -32,7 +35,8 @@ position_max: 200 step_pin: ar26 dir_pin: ar28 enable_pin: !ar24 -step_distance: .004242 +microsteps: 16 +rotation_distance: 33.5 nozzle_diameter: 0.500 filament_diameter: 3.500 heater_pin: ar10 @@ -49,7 +53,8 @@ max_temp: 210 step_pin: ar8 dir_pin: ar9 enable_pin: !ar11 -step_distance: .002 +microsteps: 16 +rotation_distance: 28.2 [mcu] serial: /dev/ttyACM0 diff --git a/test/klippy/gcode_arcs.cfg b/test/klippy/gcode_arcs.cfg index ac9d089e..5339fc76 100644 --- a/test/klippy/gcode_arcs.cfg +++ b/test/klippy/gcode_arcs.cfg @@ -5,7 +5,8 @@ step_pin: ar54 dir_pin: ar55 enable_pin: !ar38 -step_distance: .0125 +microsteps: 16 +rotation_distance: 40 endstop_pin: ^ar3 position_endstop: 0 position_max: 200 @@ -15,7 +16,8 @@ homing_speed: 50 step_pin: ar60 dir_pin: !ar61 enable_pin: !ar56 -step_distance: .0125 +microsteps: 16 +rotation_distance: 40 endstop_pin: ^ar14 position_endstop: 0 position_max: 200 @@ -25,7 +27,8 @@ homing_speed: 50 step_pin: ar46 dir_pin: ar48 enable_pin: !ar62 -step_distance: .0025 +microsteps: 16 +rotation_distance: 8 endstop_pin: ^ar18 position_endstop: 0.5 position_max: 200 @@ -34,7 +37,8 @@ position_max: 200 step_pin: ar26 dir_pin: ar28 enable_pin: !ar24 -step_distance: .004242 +microsteps: 16 +rotation_distance: 33.5 nozzle_diameter: 0.500 filament_diameter: 3.500 heater_pin: ar10 diff --git a/test/klippy/macros.cfg b/test/klippy/macros.cfg index a3488c21..9ecf0228 100644 --- a/test/klippy/macros.cfg +++ b/test/klippy/macros.cfg @@ -3,7 +3,8 @@ step_pin: ar54 dir_pin: ar55 enable_pin: !ar38 -step_distance: .0125 +microsteps: 16 +rotation_distance: 40 endstop_pin: ^ar3 position_endstop: 0 position_max: 200 @@ -13,7 +14,8 @@ homing_speed: 50 step_pin: ar60 dir_pin: !ar61 enable_pin: !ar56 -step_distance: .0125 +microsteps: 16 +rotation_distance: 40 endstop_pin: ^ar14 position_endstop: 0 position_max: 200 @@ -23,7 +25,8 @@ homing_speed: 50 step_pin: ar46 dir_pin: ar48 enable_pin: !ar62 -step_distance: .0025 +microsteps: 16 +rotation_distance: 8 endstop_pin: ^ar18 position_endstop: 0.5 position_max: 200 @@ -32,7 +35,8 @@ position_max: 200 step_pin: ar26 dir_pin: ar28 enable_pin: !ar24 -step_distance: .004242 +microsteps: 16 +rotation_distance: 33.5 nozzle_diameter: 0.500 filament_diameter: 3.500 heater_pin: ar10 diff --git a/test/klippy/manual_stepper.cfg b/test/klippy/manual_stepper.cfg index 2c65b33d..e7d41778 100644 --- a/test/klippy/manual_stepper.cfg +++ b/test/klippy/manual_stepper.cfg @@ -3,7 +3,8 @@ step_pin: ar54 dir_pin: ar55 enable_pin: !ar38 -step_distance: .0125 +microsteps: 16 +rotation_distance: 40 velocity: 7 accel: 500 @@ -11,7 +12,8 @@ accel: 500 step_pin: ar60 dir_pin: !ar61 enable_pin: !ar56 -step_distance: .0125 +microsteps: 16 +rotation_distance: 40 endstop_pin: ^ar14 [mcu] diff --git a/test/klippy/multi_z.cfg b/test/klippy/multi_z.cfg index e06a42b8..e6d52197 100644 --- a/test/klippy/multi_z.cfg +++ b/test/klippy/multi_z.cfg @@ -3,7 +3,8 @@ step_pin: ar54 dir_pin: ar55 enable_pin: !ar38 -step_distance: .0125 +microsteps: 16 +rotation_distance: 40 endstop_pin: ^ar3 position_endstop: 0 position_max: 200 @@ -13,7 +14,8 @@ homing_speed: 50 step_pin: ar60 dir_pin: !ar61 enable_pin: !ar56 -step_distance: .0125 +microsteps: 16 +rotation_distance: 40 endstop_pin: ^ar14 position_endstop: 0 position_max: 200 @@ -23,7 +25,8 @@ homing_speed: 50 step_pin: ar46 dir_pin: ar48 enable_pin: !ar62 -step_distance: .0025 +microsteps: 16 +rotation_distance: 8 endstop_pin: ^ar18 position_endstop: 0.5 position_max: 200 @@ -32,14 +35,16 @@ position_max: 200 step_pin: ar36 dir_pin: ar34 enable_pin: !ar30 -step_distance: .0025 +microsteps: 16 +rotation_distance: 8 endstop_pin: ^ar19 [stepper_z2] step_pin: ar16 dir_pin: ar17 enable_pin: !ar23 -step_distance: .0025 +microsteps: 16 +rotation_distance: 8 [z_tilt] z_positions: @@ -63,7 +68,8 @@ points: step_pin: ar26 dir_pin: ar28 enable_pin: !ar24 -step_distance: .002 +microsteps: 16 +rotation_distance: 33.5 nozzle_diameter: 0.400 filament_diameter: 1.750 heater_pin: ar10 diff --git a/test/klippy/screws_tilt_adjust.cfg b/test/klippy/screws_tilt_adjust.cfg index eb816f1f..4c6ce7de 100644 --- a/test/klippy/screws_tilt_adjust.cfg +++ b/test/klippy/screws_tilt_adjust.cfg @@ -3,7 +3,8 @@ step_pin: ar54 dir_pin: ar55 enable_pin: !ar38 -step_distance: .0125 +microsteps: 16 +rotation_distance: 40 endstop_pin: ^ar3 position_endstop: 0 position_max: 200 @@ -13,7 +14,8 @@ homing_speed: 50 step_pin: ar60 dir_pin: !ar61 enable_pin: !ar56 -step_distance: .0125 +microsteps: 16 +rotation_distance: 40 endstop_pin: ^ar14 position_endstop: 0 position_max: 200 @@ -23,7 +25,8 @@ homing_speed: 50 step_pin: ar46 dir_pin: ar48 enable_pin: !ar62 -step_distance: .0025 +microsteps: 16 +rotation_distance: 8 endstop_pin: probe:z_virtual_endstop position_max: 200 @@ -31,7 +34,8 @@ position_max: 200 step_pin: ar26 dir_pin: ar28 enable_pin: !ar24 -step_distance: .002 +microsteps: 16 +rotation_distance: 33.5 nozzle_diameter: 0.400 filament_diameter: 1.750 heater_pin: ar10 diff --git a/test/klippy/sdcard_loop.cfg b/test/klippy/sdcard_loop.cfg index 27844512..8f60612a 100644 --- a/test/klippy/sdcard_loop.cfg +++ b/test/klippy/sdcard_loop.cfg @@ -19,7 +19,8 @@ gcode: step_pin: ar54 dir_pin: ar55 enable_pin: !ar38 -step_distance: .0125 +microsteps: 16 +rotation_distance: 40 endstop_pin: ^ar3 position_endstop: 0 position_max: 200 @@ -29,7 +30,8 @@ homing_speed: 50 step_pin: ar60 dir_pin: !ar61 enable_pin: !ar56 -step_distance: .0125 +microsteps: 16 +rotation_distance: 40 endstop_pin: ^ar14 position_endstop: 0 position_max: 200 @@ -39,7 +41,8 @@ homing_speed: 50 step_pin: ar46 dir_pin: ar48 enable_pin: !ar62 -step_distance: .0025 +microsteps: 16 +rotation_distance: 8 endstop_pin: ^ar18 position_endstop: 0.5 position_max: 200000000 @@ -48,7 +51,8 @@ position_max: 200000000 step_pin: ar26 dir_pin: ar28 enable_pin: !ar24 -step_distance: .004242 +microsteps: 16 +rotation_distance: 33.5 nozzle_diameter: 0.500 filament_diameter: 3.500 heater_pin: ar10 diff --git a/test/klippy/temperature.cfg b/test/klippy/temperature.cfg index 36570c3e..875b6d6a 100644 --- a/test/klippy/temperature.cfg +++ b/test/klippy/temperature.cfg @@ -3,7 +3,8 @@ step_pin: ar54 dir_pin: ar55 enable_pin: !ar38 -step_distance: .0125 +microsteps: 16 +rotation_distance: 40 endstop_pin: ^ar3 position_endstop: 0 position_max: 200 @@ -13,7 +14,8 @@ homing_speed: 50 step_pin: ar60 dir_pin: !ar61 enable_pin: !ar56 -step_distance: .0125 +microsteps: 16 +rotation_distance: 40 endstop_pin: ^ar14 position_endstop: 0 position_max: 200 @@ -23,7 +25,8 @@ homing_speed: 50 step_pin: ar46 dir_pin: ar48 enable_pin: !ar62 -step_distance: .0025 +microsteps: 16 +rotation_distance: 8 endstop_pin: ^ar18 position_endstop: 0.5 position_max: 200 @@ -32,7 +35,8 @@ position_max: 200 step_pin: ar26 dir_pin: ar28 enable_pin: !ar24 -step_distance: .002 +microsteps: 16 +rotation_distance: 33.5 nozzle_diameter: 0.400 filament_diameter: 1.750 heater_pin: ar10 diff --git a/test/klippy/tmc.cfg b/test/klippy/tmc.cfg index 603538a3..ffdb93f3 100644 --- a/test/klippy/tmc.cfg +++ b/test/klippy/tmc.cfg @@ -4,14 +4,14 @@ step_pin: PC0 dir_pin: PL0 enable_pin: !PA7 -step_distance: .005 +microsteps: 16 +rotation_distance: 40 endstop_pin: tmc2130_stepper_x:virtual_endstop position_endstop: 0 position_max: 250 [tmc2130 stepper_x] cs_pin: PG0 -microsteps: 16 run_current: .5 sense_resistor: 0.220 diag1_pin: !PK2 @@ -19,12 +19,12 @@ diag1_pin: !PK2 [stepper_x1] step_pin: PC3 dir_pin: PL6 -step_distance: .005 +microsteps: 16 +rotation_distance: 40 endstop_pin: ^PB6 [tmc2130 stepper_x1] cs_pin: PG1 -microsteps: 16 run_current: .5 sense_resistor: 0.220 diag1_pin: !PK2 @@ -32,14 +32,14 @@ diag1_pin: !PK2 [stepper_y] step_pin: PC1 dir_pin: !PL1 -step_distance: .005 +microsteps: 16 +rotation_distance: 40 endstop_pin: tmc5160_stepper_y:virtual_endstop position_endstop: 0 position_max: 210 [tmc5160 stepper_y] cs_pin: PG2 -microsteps: 16 run_current: .5 sense_resistor: 0.220 diag1_pin: !PK7 @@ -47,27 +47,27 @@ diag1_pin: !PK7 [stepper_y1] step_pin: PA4 dir_pin: PA6 -step_distance: .005 +microsteps: 16 +rotation_distance: 40 endstop_pin: tmc2209_stepper_y1:virtual_endstop [tmc2209 stepper_y1] uart_pin: PA5 diag_pin: PH6 -microsteps: 16 run_current: .5 sense_resistor: 0.075 [stepper_z] step_pin: PC2 dir_pin: PL2 -step_distance: .0025 +microsteps: 16 +rotation_distance: 8 endstop_pin: ^PB4 position_endstop: 0.5 position_max: 200 [tmc2208 stepper_z] uart_pin: PK5 -microsteps: 16 run_current: .5 sense_resistor: 0.220 @@ -75,12 +75,12 @@ sense_resistor: 0.220 step_pin: PB5 dir_pin: PK6 enable_pin: !PH5 -step_distance: .0025 +microsteps: 16 +rotation_distance: 8 endstop_pin: ^PH3 [tmc2660 stepper_z1] cs_pin: PK1 -microsteps: 16 run_current: .5 sense_resistor: 0.220 diff --git a/test/klippy/z_tilt.cfg b/test/klippy/z_tilt.cfg index fdb54ff1..323bc8ce 100644 --- a/test/klippy/z_tilt.cfg +++ b/test/klippy/z_tilt.cfg @@ -3,7 +3,8 @@ step_pin: ar54 dir_pin: ar55 enable_pin: !ar38 -step_distance: .0125 +microsteps: 16 +rotation_distance: 40 endstop_pin: ^ar3 position_endstop: 0 position_max: 250 @@ -13,7 +14,8 @@ homing_speed: 50 step_pin: ar60 dir_pin: !ar61 enable_pin: !ar56 -step_distance: .0125 +microsteps: 16 +rotation_distance: 40 endstop_pin: ^ar14 position_endstop: 0 position_max: 250 @@ -23,7 +25,8 @@ homing_speed: 50 step_pin: ar46 dir_pin: ar48 enable_pin: !ar62 -step_distance: .0025 +microsteps: 16 +rotation_distance: 8 endstop_pin: ^ar18 position_endstop: 0.5 position_max: 250 @@ -32,19 +35,22 @@ position_max: 250 step_pin: ar36 dir_pin: ar34 enable_pin: !ar30 -step_distance: .0025 +microsteps: 16 +rotation_distance: 8 endstop_pin: ^ar19 [stepper_z2] step_pin: ar16 dir_pin: ar17 enable_pin: !ar23 -step_distance: .0025 +microsteps: 16 +rotation_distance: 8 [stepper_z3] step_pin: ar5 dir_pin: ar4 -step_distance: .0025 +microsteps: 16 +rotation_distance: 8 [quad_gantry_level] gantry_corners: @@ -79,7 +85,8 @@ points: step_pin: ar26 dir_pin: ar28 enable_pin: !ar24 -step_distance: .002 +microsteps: 16 +rotation_distance: 33.5 nozzle_diameter: 0.400 filament_diameter: 1.750 heater_pin: ar10 diff --git a/test/klippy/z_virtual_endstop.cfg b/test/klippy/z_virtual_endstop.cfg index 9e6425a8..97078333 100644 --- a/test/klippy/z_virtual_endstop.cfg +++ b/test/klippy/z_virtual_endstop.cfg @@ -3,7 +3,8 @@ step_pin: ar54 dir_pin: ar55 enable_pin: !ar38 -step_distance: .0125 +microsteps: 16 +rotation_distance: 40 endstop_pin: ^ar3 position_endstop: 0 position_max: 200 @@ -13,7 +14,8 @@ homing_speed: 50 step_pin: ar60 dir_pin: !ar61 enable_pin: !ar56 -step_distance: .0125 +microsteps: 16 +rotation_distance: 40 endstop_pin: ^ar14 position_endstop: 0 position_max: 200 @@ -23,7 +25,8 @@ homing_speed: 50 step_pin: ar46 dir_pin: ar48 enable_pin: !ar62 -step_distance: .0025 +microsteps: 16 +rotation_distance: 8 endstop_pin: probe:z_virtual_endstop position_max: 200 @@ -31,7 +34,8 @@ position_max: 200 step_pin: ar26 dir_pin: ar28 enable_pin: !ar24 -step_distance: .002 +microsteps: 16 +rotation_distance: 33.5 nozzle_diameter: 0.400 filament_diameter: 1.750 heater_pin: ar10