From cc9541092ae4d83c74a933964a1bf1c75223026a Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Sun, 24 Oct 2021 21:11:53 -0400 Subject: [PATCH] test: Update test case to not use pin_map Remove all users of the pin_map setting. Signed-off-by: Kevin O'Connor --- test/klippy/bed_screws.cfg | 25 +++++----- test/klippy/bltouch.cfg | 41 ++++++++------- test/klippy/delta_calibrate.cfg | 25 +++++----- test/klippy/dual_carriage.cfg | 59 +++++++++++----------- test/klippy/extruders.cfg | 41 ++++++++------- test/klippy/gcode_arcs.cfg | 39 +++++++-------- test/klippy/macros.cfg | 39 +++++++-------- test/klippy/manual_stepper.cfg | 15 +++--- test/klippy/multi_z.cfg | 55 ++++++++++---------- test/klippy/pwm.cfg | 5 +- test/klippy/rotary_delta_calibrate.cfg | 25 +++++----- test/klippy/screws_tilt_adjust.cfg | 41 ++++++++------- test/klippy/sdcard_loop.cfg | 39 +++++++-------- test/klippy/temperature.cfg | 69 +++++++++++++------------- test/klippy/z_tilt.cfg | 59 +++++++++++----------- test/klippy/z_virtual_endstop.cfg | 39 +++++++-------- 16 files changed, 300 insertions(+), 316 deletions(-) diff --git a/test/klippy/bed_screws.cfg b/test/klippy/bed_screws.cfg index a38ae7e8..0448b08a 100644 --- a/test/klippy/bed_screws.cfg +++ b/test/klippy/bed_screws.cfg @@ -1,33 +1,33 @@ # Test config for bed screws tool [stepper_x] -step_pin: ar54 -dir_pin: ar55 -enable_pin: !ar38 +step_pin: PF0 +dir_pin: PF1 +enable_pin: !PD7 rotation_distance: 40 microsteps: 16 -endstop_pin: ^ar3 +endstop_pin: ^PE5 position_endstop: 0 position_max: 200 homing_speed: 50 [stepper_y] -step_pin: ar60 -dir_pin: !ar61 -enable_pin: !ar56 +step_pin: PF6 +dir_pin: !PF7 +enable_pin: !PF2 rotation_distance: 40 microsteps: 16 -endstop_pin: ^ar14 +endstop_pin: ^PJ1 position_endstop: 0 position_max: 200 homing_speed: 50 [stepper_z] -step_pin: ar46 -dir_pin: ar48 -enable_pin: !ar62 +step_pin: PL3 +dir_pin: PL1 +enable_pin: !PK0 rotation_distance: 8 microsteps: 16 -endstop_pin: ^ar18 +endstop_pin: ^PD3 position_endstop: 0.5 position_max: 200 @@ -43,7 +43,6 @@ screw3_fine_adjust: 75,90 [mcu] serial: /dev/ttyACM0 -pin_map: arduino [printer] kinematics: cartesian diff --git a/test/klippy/bltouch.cfg b/test/klippy/bltouch.cfg index 8e9a9dc1..d44fdf99 100644 --- a/test/klippy/bltouch.cfg +++ b/test/klippy/bltouch.cfg @@ -1,46 +1,46 @@ # Test config for bltouch [stepper_x] -step_pin: ar54 -dir_pin: ar55 -enable_pin: !ar38 +step_pin: PF0 +dir_pin: PF1 +enable_pin: !PD7 microsteps: 16 rotation_distance: 40 -endstop_pin: ^ar3 +endstop_pin: ^PE5 position_endstop: 0 position_max: 200 homing_speed: 50 [stepper_y] -step_pin: ar60 -dir_pin: !ar61 -enable_pin: !ar56 +step_pin: PF6 +dir_pin: !PF7 +enable_pin: !PF2 microsteps: 16 rotation_distance: 40 -endstop_pin: ^ar14 +endstop_pin: ^PJ1 position_endstop: 0 position_max: 200 homing_speed: 50 [stepper_z] -step_pin: ar46 -dir_pin: ar48 -enable_pin: !ar62 +step_pin: PL3 +dir_pin: PL1 +enable_pin: !PK0 microsteps: 16 rotation_distance: 8 endstop_pin: probe:z_virtual_endstop position_max: 200 [extruder] -step_pin: ar26 -dir_pin: ar28 -enable_pin: !ar24 +step_pin: PA4 +dir_pin: PA6 +enable_pin: !PA2 microsteps: 16 rotation_distance: 33.5 nozzle_diameter: 0.400 filament_diameter: 1.750 -heater_pin: ar10 +heater_pin: PB4 sensor_type: EPCOS 100K B57560G104F -sensor_pin: analog13 +sensor_pin: PK5 control: pid pid_Kp: 22.2 pid_Ki: 1.08 @@ -49,16 +49,16 @@ min_temp: 0 max_temp: 250 [heater_bed] -heater_pin: ar8 +heater_pin: PH5 sensor_type: EPCOS 100K B57560G104F -sensor_pin: analog14 +sensor_pin: PK6 control: watermark min_temp: 0 max_temp: 130 [bltouch] -sensor_pin: ar30 -control_pin: ar32 +sensor_pin: PC7 +control_pin: PC5 z_offset: 1.15 [bed_mesh] @@ -67,7 +67,6 @@ mesh_max: 180,180 [mcu] serial: /dev/ttyACM0 -pin_map: arduino [printer] kinematics: cartesian diff --git a/test/klippy/delta_calibrate.cfg b/test/klippy/delta_calibrate.cfg index c29ca39a..aee9ff24 100644 --- a/test/klippy/delta_calibrate.cfg +++ b/test/klippy/delta_calibrate.cfg @@ -1,34 +1,33 @@ # Test config for the DELTA_CALIBRATE command (on linear delta robots) [stepper_a] -step_pin: ar54 -dir_pin: ar55 -enable_pin: !ar38 +step_pin: PF0 +dir_pin: PF1 +enable_pin: !PD7 microsteps: 16 rotation_distance: 0.32 -endstop_pin: ^ar2 +endstop_pin: ^PE4 homing_speed: 50 #position_endstop: 297.05 #arm_length: 333.0 [stepper_b] -step_pin: ar60 -dir_pin: ar61 -enable_pin: !ar56 +step_pin: PF6 +dir_pin: PF7 +enable_pin: !PF2 microsteps: 16 rotation_distance: 0.32 -endstop_pin: ^ar15 +endstop_pin: ^PJ0 [stepper_c] -step_pin: ar46 -dir_pin: ar48 -enable_pin: !ar62 +step_pin: PL3 +dir_pin: PL1 +enable_pin: !PK0 microsteps: 16 rotation_distance: 0.32 -endstop_pin: ^ar19 +endstop_pin: ^PD2 [mcu] serial: /dev/ttyACM0 -pin_map: arduino [printer] kinematics: delta diff --git a/test/klippy/dual_carriage.cfg b/test/klippy/dual_carriage.cfg index 298e0e30..9ae01c2b 100644 --- a/test/klippy/dual_carriage.cfg +++ b/test/klippy/dual_carriage.cfg @@ -1,59 +1,59 @@ # Test config with dual carriage and multiple extruders [stepper_x] -step_pin: ar54 -dir_pin: ar55 -enable_pin: !ar38 +step_pin: PF0 +dir_pin: PF1 +enable_pin: !PD7 microsteps: 16 rotation_distance: 40 -endstop_pin: ^ar3 +endstop_pin: ^PE5 position_endstop: 0 position_max: 200 homing_speed: 50 [dual_carriage] axis: x -step_pin: ar16 -dir_pin: ar17 -enable_pin: !ar23 +step_pin: PH1 +dir_pin: PH0 +enable_pin: !PA1 microsteps: 16 rotation_distance: 40 -endstop_pin: ^ar2 +endstop_pin: ^PE4 position_endstop: 200 position_max: 200 homing_speed: 50 [stepper_y] -step_pin: ar60 -dir_pin: !ar61 -enable_pin: !ar56 +step_pin: PF6 +dir_pin: !PF7 +enable_pin: !PF2 microsteps: 16 rotation_distance: 40 -endstop_pin: ^ar14 +endstop_pin: ^PJ1 position_endstop: 0 position_max: 200 homing_speed: 50 [stepper_z] -step_pin: ar46 -dir_pin: ar48 -enable_pin: !ar62 +step_pin: PL3 +dir_pin: PL1 +enable_pin: !PK0 microsteps: 16 rotation_distance: 8 -endstop_pin: ^ar18 +endstop_pin: ^PD3 position_endstop: 0.5 position_max: 200 [extruder] -step_pin: ar26 -dir_pin: ar28 -enable_pin: !ar24 +step_pin: PA4 +dir_pin: PA6 +enable_pin: !PA2 microsteps: 16 rotation_distance: 33.5 nozzle_diameter: 0.400 filament_diameter: 1.750 -heater_pin: ar10 +heater_pin: PB4 sensor_type: EPCOS 100K B57560G104F -sensor_pin: analog13 +sensor_pin: PK5 control: pid pid_Kp: 22.2 pid_Ki: 1.08 @@ -73,16 +73,16 @@ gcode: SET_DUAL_CARRIAGE CARRIAGE=0 [extruder1] -step_pin: ar36 -dir_pin: ar34 -enable_pin: !ar30 +step_pin: PC1 +dir_pin: PC3 +enable_pin: !PC7 microsteps: 16 rotation_distance: 33.5 nozzle_diameter: 0.400 filament_diameter: 1.750 -heater_pin: ar11 +heater_pin: PB5 sensor_type: EPCOS 100K B57560G104F -sensor_pin: analog15 +sensor_pin: PK7 control: pid pid_Kp: 22.2 pid_Ki: 1.08 @@ -104,19 +104,18 @@ gcode: SET_DUAL_CARRIAGE CARRIAGE=1 [servo my_servo] -pin: ar7 +pin: PH4 [heater_bed] -heater_pin: ar8 +heater_pin: PH5 sensor_type: EPCOS 100K B57560G104F -sensor_pin: analog14 +sensor_pin: PK6 control: watermark min_temp: 0 max_temp: 130 [mcu] serial: /dev/ttyACM0 -pin_map: arduino [printer] kinematics: cartesian diff --git a/test/klippy/extruders.cfg b/test/klippy/extruders.cfg index 41d6df55..2892df54 100644 --- a/test/klippy/extruders.cfg +++ b/test/klippy/extruders.cfg @@ -1,47 +1,47 @@ # Config for extruder testing [stepper_x] -step_pin: ar54 -dir_pin: ar55 -enable_pin: !ar38 +step_pin: PF0 +dir_pin: PF1 +enable_pin: !PD7 microsteps: 16 rotation_distance: 40 -endstop_pin: ^ar3 +endstop_pin: ^PE5 position_endstop: 0 position_max: 200 homing_speed: 50 [stepper_y] -step_pin: ar60 -dir_pin: !ar61 -enable_pin: !ar56 +step_pin: PF6 +dir_pin: !PF7 +enable_pin: !PF2 microsteps: 16 rotation_distance: 40 -endstop_pin: ^ar14 +endstop_pin: ^PJ1 position_endstop: 0 position_max: 200 homing_speed: 50 [stepper_z] -step_pin: ar46 -dir_pin: ar48 -enable_pin: !ar62 +step_pin: PL3 +dir_pin: PL1 +enable_pin: !PK0 microsteps: 16 rotation_distance: 8 -endstop_pin: ^ar18 +endstop_pin: ^PD3 position_endstop: 0.5 position_max: 200 [extruder] -step_pin: ar26 -dir_pin: ar28 -enable_pin: !ar24 +step_pin: PA4 +dir_pin: PA6 +enable_pin: !PA2 microsteps: 16 rotation_distance: 33.5 nozzle_diameter: 0.500 filament_diameter: 3.500 -heater_pin: ar10 +heater_pin: PB4 sensor_type: EPCOS 100K B57560G104F -sensor_pin: analog13 +sensor_pin: PK5 control: pid pid_Kp: 22.2 pid_Ki: 1.08 @@ -50,15 +50,14 @@ min_temp: 0 max_temp: 210 [extruder_stepper my_extra_stepper] -step_pin: ar8 -dir_pin: ar9 -enable_pin: !ar11 +step_pin: PH5 +dir_pin: PH6 +enable_pin: !PB5 microsteps: 16 rotation_distance: 28.2 [mcu] serial: /dev/ttyACM0 -pin_map: arduino [printer] kinematics: cartesian diff --git a/test/klippy/gcode_arcs.cfg b/test/klippy/gcode_arcs.cfg index 5339fc76..eeca9432 100644 --- a/test/klippy/gcode_arcs.cfg +++ b/test/klippy/gcode_arcs.cfg @@ -2,48 +2,48 @@ [gcode_arcs] [stepper_x] -step_pin: ar54 -dir_pin: ar55 -enable_pin: !ar38 +step_pin: PF0 +dir_pin: PF1 +enable_pin: !PD7 microsteps: 16 rotation_distance: 40 -endstop_pin: ^ar3 +endstop_pin: ^PE5 position_endstop: 0 position_max: 200 homing_speed: 50 [stepper_y] -step_pin: ar60 -dir_pin: !ar61 -enable_pin: !ar56 +step_pin: PF6 +dir_pin: !PF7 +enable_pin: !PF2 microsteps: 16 rotation_distance: 40 -endstop_pin: ^ar14 +endstop_pin: ^PJ1 position_endstop: 0 position_max: 200 homing_speed: 50 [stepper_z] -step_pin: ar46 -dir_pin: ar48 -enable_pin: !ar62 +step_pin: PL3 +dir_pin: PL1 +enable_pin: !PK0 microsteps: 16 rotation_distance: 8 -endstop_pin: ^ar18 +endstop_pin: ^PD3 position_endstop: 0.5 position_max: 200 [extruder] -step_pin: ar26 -dir_pin: ar28 -enable_pin: !ar24 +step_pin: PA4 +dir_pin: PA6 +enable_pin: !PA2 microsteps: 16 rotation_distance: 33.5 nozzle_diameter: 0.500 filament_diameter: 3.500 -heater_pin: ar10 +heater_pin: PB4 sensor_type: EPCOS 100K B57560G104F -sensor_pin: analog13 +sensor_pin: PK5 control: pid pid_Kp: 22.2 pid_Ki: 1.08 @@ -52,16 +52,15 @@ min_temp: 0 max_temp: 210 [heater_bed] -heater_pin: ar8 +heater_pin: PH5 sensor_type: EPCOS 100K B57560G104F -sensor_pin: analog14 +sensor_pin: PK6 control: watermark min_temp: 0 max_temp: 110 [mcu] serial: /dev/ttyACM0 -pin_map: arduino [printer] kinematics: cartesian diff --git a/test/klippy/macros.cfg b/test/klippy/macros.cfg index 9ecf0228..669c9be3 100644 --- a/test/klippy/macros.cfg +++ b/test/klippy/macros.cfg @@ -1,47 +1,47 @@ # Test config with macros [stepper_x] -step_pin: ar54 -dir_pin: ar55 -enable_pin: !ar38 +step_pin: PF0 +dir_pin: PF1 +enable_pin: !PD7 microsteps: 16 rotation_distance: 40 -endstop_pin: ^ar3 +endstop_pin: ^PE5 position_endstop: 0 position_max: 200 homing_speed: 50 [stepper_y] -step_pin: ar60 -dir_pin: !ar61 -enable_pin: !ar56 +step_pin: PF6 +dir_pin: !PF7 +enable_pin: !PF2 microsteps: 16 rotation_distance: 40 -endstop_pin: ^ar14 +endstop_pin: ^PJ1 position_endstop: 0 position_max: 200 homing_speed: 50 [stepper_z] -step_pin: ar46 -dir_pin: ar48 -enable_pin: !ar62 +step_pin: PL3 +dir_pin: PL1 +enable_pin: !PK0 microsteps: 16 rotation_distance: 8 -endstop_pin: ^ar18 +endstop_pin: ^PD3 position_endstop: 0.5 position_max: 200 [extruder] -step_pin: ar26 -dir_pin: ar28 -enable_pin: !ar24 +step_pin: PA4 +dir_pin: PA6 +enable_pin: !PA2 microsteps: 16 rotation_distance: 33.5 nozzle_diameter: 0.500 filament_diameter: 3.500 -heater_pin: ar10 +heater_pin: PB4 sensor_type: EPCOS 100K B57560G104F -sensor_pin: analog13 +sensor_pin: PK5 control: pid pid_Kp: 22.2 pid_Ki: 1.08 @@ -50,16 +50,15 @@ min_temp: 0 max_temp: 210 [heater_bed] -heater_pin: ar8 +heater_pin: PH5 sensor_type: EPCOS 100K B57560G104F -sensor_pin: analog14 +sensor_pin: PK6 control: watermark min_temp: 0 max_temp: 110 [mcu] serial: /dev/ttyACM0 -pin_map: arduino [printer] kinematics: cartesian diff --git a/test/klippy/manual_stepper.cfg b/test/klippy/manual_stepper.cfg index e7d41778..a4e6b71e 100644 --- a/test/klippy/manual_stepper.cfg +++ b/test/klippy/manual_stepper.cfg @@ -1,24 +1,23 @@ # Test config for manual_stepper [manual_stepper basic_stepper] -step_pin: ar54 -dir_pin: ar55 -enable_pin: !ar38 +step_pin: PF0 +dir_pin: PF1 +enable_pin: !PD7 microsteps: 16 rotation_distance: 40 velocity: 7 accel: 500 [manual_stepper homing_stepper] -step_pin: ar60 -dir_pin: !ar61 -enable_pin: !ar56 +step_pin: PF6 +dir_pin: !PF7 +enable_pin: !PF2 microsteps: 16 rotation_distance: 40 -endstop_pin: ^ar14 +endstop_pin: ^PJ1 [mcu] serial: /dev/ttyACM0 -pin_map: arduino [printer] kinematics: none diff --git a/test/klippy/multi_z.cfg b/test/klippy/multi_z.cfg index e6d52197..699f9953 100644 --- a/test/klippy/multi_z.cfg +++ b/test/klippy/multi_z.cfg @@ -1,48 +1,48 @@ # Test config with multiple z steppers [stepper_x] -step_pin: ar54 -dir_pin: ar55 -enable_pin: !ar38 +step_pin: PF0 +dir_pin: PF1 +enable_pin: !PD7 microsteps: 16 rotation_distance: 40 -endstop_pin: ^ar3 +endstop_pin: ^PE5 position_endstop: 0 position_max: 200 homing_speed: 50 [stepper_y] -step_pin: ar60 -dir_pin: !ar61 -enable_pin: !ar56 +step_pin: PF6 +dir_pin: !PF7 +enable_pin: !PF2 microsteps: 16 rotation_distance: 40 -endstop_pin: ^ar14 +endstop_pin: ^PJ1 position_endstop: 0 position_max: 200 homing_speed: 50 [stepper_z] -step_pin: ar46 -dir_pin: ar48 -enable_pin: !ar62 +step_pin: PL3 +dir_pin: PL1 +enable_pin: !PK0 microsteps: 16 rotation_distance: 8 -endstop_pin: ^ar18 +endstop_pin: ^PD3 position_endstop: 0.5 position_max: 200 [stepper_z1] -step_pin: ar36 -dir_pin: ar34 -enable_pin: !ar30 +step_pin: PC1 +dir_pin: PC3 +enable_pin: !PC7 microsteps: 16 rotation_distance: 8 -endstop_pin: ^ar19 +endstop_pin: ^PD2 [stepper_z2] -step_pin: ar16 -dir_pin: ar17 -enable_pin: !ar23 +step_pin: PH1 +dir_pin: PH0 +enable_pin: !PA1 microsteps: 16 rotation_distance: 8 @@ -65,16 +65,16 @@ points: 195,50 [extruder] -step_pin: ar26 -dir_pin: ar28 -enable_pin: !ar24 +step_pin: PA4 +dir_pin: PA6 +enable_pin: !PA2 microsteps: 16 rotation_distance: 33.5 nozzle_diameter: 0.400 filament_diameter: 1.750 -heater_pin: ar10 +heater_pin: PB4 sensor_type: EPCOS 100K B57560G104F -sensor_pin: analog13 +sensor_pin: PK5 control: pid pid_Kp: 22.2 pid_Ki: 1.08 @@ -83,20 +83,19 @@ min_temp: 0 max_temp: 250 [heater_bed] -heater_pin: ar8 +heater_pin: PH5 sensor_type: EPCOS 100K B57560G104F -sensor_pin: analog14 +sensor_pin: PK6 control: watermark min_temp: 0 max_temp: 130 [probe] -pin: ar9 +pin: PH6 z_offset: 1.15 [mcu] serial: /dev/ttyACM0 -pin_map: arduino [printer] kinematics: cartesian diff --git a/test/klippy/pwm.cfg b/test/klippy/pwm.cfg index 43bbd181..45555ca8 100644 --- a/test/klippy/pwm.cfg +++ b/test/klippy/pwm.cfg @@ -1,12 +1,12 @@ [output_pin soft_pwm_pin] -pin: ar8 +pin: PH5 pwm: True value: 0 shutdown_value: 0 cycle_time: 0.01 [output_pin hard_pwm_pin] -pin: ar9 +pin: PH6 pwm: True hardware_pwm: True value: 0 @@ -15,7 +15,6 @@ cycle_time: 0.01 [mcu] serial: /dev/ttyACM0 -pin_map: arduino [printer] kinematics: none diff --git a/test/klippy/rotary_delta_calibrate.cfg b/test/klippy/rotary_delta_calibrate.cfg index 6709ce90..c37a9bc4 100644 --- a/test/klippy/rotary_delta_calibrate.cfg +++ b/test/klippy/rotary_delta_calibrate.cfg @@ -1,35 +1,34 @@ # Test config for the DELTA_CALIBRATE command (on rotary delta robots) [stepper_a] -step_pin: ar54 -dir_pin: ar55 -enable_pin: !ar38 +step_pin: PF0 +dir_pin: PF1 +enable_pin: !PD7 microsteps: 16 gear_ratio: 107.000:16, 60:16 -endstop_pin: ^ar2 +endstop_pin: ^PE4 homing_speed: 50 #position_endstop: 252 upper_arm_length: 170.000 lower_arm_length: 320.000 [stepper_b] -step_pin: ar60 -dir_pin: ar61 -enable_pin: !ar56 +step_pin: PF6 +dir_pin: PF7 +enable_pin: !PF2 microsteps: 16 gear_ratio: 107.000:16, 60:16 -endstop_pin: ^ar15 +endstop_pin: ^PJ0 [stepper_c] -step_pin: ar46 -dir_pin: ar48 -enable_pin: !ar62 +step_pin: PL3 +dir_pin: PL1 +enable_pin: !PK0 microsteps: 16 gear_ratio: 107.000:16, 60:16 -endstop_pin: ^ar19 +endstop_pin: ^PD2 [mcu] serial: /dev/ttyACM0 -pin_map: arduino [printer] kinematics: rotary_delta diff --git a/test/klippy/screws_tilt_adjust.cfg b/test/klippy/screws_tilt_adjust.cfg index 4c6ce7de..0a50baac 100644 --- a/test/klippy/screws_tilt_adjust.cfg +++ b/test/klippy/screws_tilt_adjust.cfg @@ -1,46 +1,46 @@ # Test config for bed screws tool with bltouch [stepper_x] -step_pin: ar54 -dir_pin: ar55 -enable_pin: !ar38 +step_pin: PF0 +dir_pin: PF1 +enable_pin: !PD7 microsteps: 16 rotation_distance: 40 -endstop_pin: ^ar3 +endstop_pin: ^PE5 position_endstop: 0 position_max: 200 homing_speed: 50 [stepper_y] -step_pin: ar60 -dir_pin: !ar61 -enable_pin: !ar56 +step_pin: PF6 +dir_pin: !PF7 +enable_pin: !PF2 microsteps: 16 rotation_distance: 40 -endstop_pin: ^ar14 +endstop_pin: ^PJ1 position_endstop: 0 position_max: 200 homing_speed: 50 [stepper_z] -step_pin: ar46 -dir_pin: ar48 -enable_pin: !ar62 +step_pin: PL3 +dir_pin: PL1 +enable_pin: !PK0 microsteps: 16 rotation_distance: 8 endstop_pin: probe:z_virtual_endstop position_max: 200 [extruder] -step_pin: ar26 -dir_pin: ar28 -enable_pin: !ar24 +step_pin: PA4 +dir_pin: PA6 +enable_pin: !PA2 microsteps: 16 rotation_distance: 33.5 nozzle_diameter: 0.400 filament_diameter: 1.750 -heater_pin: ar10 +heater_pin: PB4 sensor_type: EPCOS 100K B57560G104F -sensor_pin: analog13 +sensor_pin: PK5 control: pid pid_Kp: 22.2 pid_Ki: 1.08 @@ -49,16 +49,16 @@ min_temp: 0 max_temp: 250 [heater_bed] -heater_pin: ar8 +heater_pin: PH5 sensor_type: EPCOS 100K B57560G104F -sensor_pin: analog14 +sensor_pin: PK6 control: watermark min_temp: 0 max_temp: 130 [bltouch] -sensor_pin: ar30 -control_pin: ar32 +sensor_pin: PC7 +control_pin: PC5 z_offset: 1.15 samples: 3 sample_retract_dist: 2. @@ -70,7 +70,6 @@ mesh_max: 180,180 [mcu] serial: /dev/ttyACM0 -pin_map: arduino [printer] kinematics: cartesian diff --git a/test/klippy/sdcard_loop.cfg b/test/klippy/sdcard_loop.cfg index 8f60612a..3e3dec4b 100644 --- a/test/klippy/sdcard_loop.cfg +++ b/test/klippy/sdcard_loop.cfg @@ -16,48 +16,48 @@ gcode: [stepper_x] -step_pin: ar54 -dir_pin: ar55 -enable_pin: !ar38 +step_pin: PF0 +dir_pin: PF1 +enable_pin: !PD7 microsteps: 16 rotation_distance: 40 -endstop_pin: ^ar3 +endstop_pin: ^PE5 position_endstop: 0 position_max: 200 homing_speed: 50 [stepper_y] -step_pin: ar60 -dir_pin: !ar61 -enable_pin: !ar56 +step_pin: PF6 +dir_pin: !PF7 +enable_pin: !PF2 microsteps: 16 rotation_distance: 40 -endstop_pin: ^ar14 +endstop_pin: ^PJ1 position_endstop: 0 position_max: 200 homing_speed: 50 [stepper_z] -step_pin: ar46 -dir_pin: ar48 -enable_pin: !ar62 +step_pin: PL3 +dir_pin: PL1 +enable_pin: !PK0 microsteps: 16 rotation_distance: 8 -endstop_pin: ^ar18 +endstop_pin: ^PD3 position_endstop: 0.5 position_max: 200000000 [extruder] -step_pin: ar26 -dir_pin: ar28 -enable_pin: !ar24 +step_pin: PA4 +dir_pin: PA6 +enable_pin: !PA2 microsteps: 16 rotation_distance: 33.5 nozzle_diameter: 0.500 filament_diameter: 3.500 -heater_pin: ar10 +heater_pin: PB4 sensor_type: EPCOS 100K B57560G104F -sensor_pin: analog13 +sensor_pin: PK5 control: pid pid_Kp: 22.2 pid_Ki: 1.08 @@ -66,16 +66,15 @@ min_temp: 0 max_temp: 210 [heater_bed] -heater_pin: ar8 +heater_pin: PH5 sensor_type: EPCOS 100K B57560G104F -sensor_pin: analog14 +sensor_pin: PK6 control: watermark min_temp: 0 max_temp: 110 [mcu] serial: /dev/ttyACM0 -pin_map: arduino [printer] kinematics: cartesian diff --git a/test/klippy/temperature.cfg b/test/klippy/temperature.cfg index 875b6d6a..73b562a2 100644 --- a/test/klippy/temperature.cfg +++ b/test/klippy/temperature.cfg @@ -1,47 +1,47 @@ # Test config with many different types of temperature sensors [stepper_x] -step_pin: ar54 -dir_pin: ar55 -enable_pin: !ar38 +step_pin: PF0 +dir_pin: PF1 +enable_pin: !PD7 microsteps: 16 rotation_distance: 40 -endstop_pin: ^ar3 +endstop_pin: ^PE5 position_endstop: 0 position_max: 200 homing_speed: 50 [stepper_y] -step_pin: ar60 -dir_pin: !ar61 -enable_pin: !ar56 +step_pin: PF6 +dir_pin: !PF7 +enable_pin: !PF2 microsteps: 16 rotation_distance: 40 -endstop_pin: ^ar14 +endstop_pin: ^PJ1 position_endstop: 0 position_max: 200 homing_speed: 50 [stepper_z] -step_pin: ar46 -dir_pin: ar48 -enable_pin: !ar62 +step_pin: PL3 +dir_pin: PL1 +enable_pin: !PK0 microsteps: 16 rotation_distance: 8 -endstop_pin: ^ar18 +endstop_pin: ^PD3 position_endstop: 0.5 position_max: 200 [extruder] -step_pin: ar26 -dir_pin: ar28 -enable_pin: !ar24 +step_pin: PA4 +dir_pin: PA6 +enable_pin: !PA2 microsteps: 16 rotation_distance: 33.5 nozzle_diameter: 0.400 filament_diameter: 1.750 -heater_pin: ar10 +heater_pin: PB4 sensor_type: AD595 -sensor_pin: analog13 +sensor_pin: PK5 control: pid pid_Kp: 22.2 pid_Ki: 1.08 @@ -50,44 +50,44 @@ min_temp: 0 max_temp: 250 [heater_bed] -heater_pin: ar8 +heater_pin: PH5 sensor_type: PT100 INA826 -sensor_pin: analog14 +sensor_pin: PK6 control: watermark min_temp: 0 max_temp: 130 [temperature_fan test_max6675] -pin: ar9 +pin: PH6 min_temp: 0 max_temp: 100 control: watermark sensor_type: MAX6675 -sensor_pin: ar2 +sensor_pin: PE4 [temperature_fan test_max31855] -pin: ar4 +pin: PG5 min_temp: 0 max_temp: 100 control: watermark sensor_type: MAX31855 -sensor_pin: ar5 +sensor_pin: PE3 [temperature_fan test_max31856] -pin: ar6 +pin: PH3 min_temp: 0 max_temp: 100 control: watermark sensor_type: MAX31856 -sensor_pin: ar7 +sensor_pin: PH4 [temperature_fan test_max31865] -pin: ar12 +pin: PB6 min_temp: 0 max_temp: 100 control: watermark sensor_type: MAX31865 -sensor_pin: ar13 +sensor_pin: PB7 [thermistor my_custom_thermistor] temperature1: 25 @@ -98,12 +98,12 @@ temperature3: 250 resistance3: 100 [temperature_fan test_custom_thermistor] -pin: ar15 +pin: PJ0 min_temp: 0 max_temp: 100 control: watermark sensor_type: my_custom_thermistor -sensor_pin: analog3 +sensor_pin: PF3 [adc_temperature my_custom_adc] temperature1: 25 @@ -114,12 +114,12 @@ temperature3: 250 voltage3: 3 [temperature_fan test_custom_adc] -pin: ar16 +pin: PH1 min_temp: 0 max_temp: 100 control: watermark sensor_type: my_custom_adc -sensor_pin: analog4 +sensor_pin: PF4 [adc_temperature my_custom_resistance_adc] temperature1: 25 @@ -131,18 +131,17 @@ resistance3: 3000 [temperature_sensor test_custom_resistance_adc] sensor_type: my_custom_resistance_adc -sensor_pin: analog5 +sensor_pin: PF5 [temperature_sensor test_PT1000] sensor_type: PT1000 -sensor_pin: analog9 +sensor_pin: PK1 [controller_fan test_controller_fan] -pin: ar17 +pin: PH0 [mcu] serial: /dev/ttyACM0 -pin_map: arduino [printer] kinematics: cartesian diff --git a/test/klippy/z_tilt.cfg b/test/klippy/z_tilt.cfg index 323bc8ce..444b43c4 100644 --- a/test/klippy/z_tilt.cfg +++ b/test/klippy/z_tilt.cfg @@ -1,54 +1,54 @@ # Test config for z_tilt and quad_gantry_level [stepper_x] -step_pin: ar54 -dir_pin: ar55 -enable_pin: !ar38 +step_pin: PF0 +dir_pin: PF1 +enable_pin: !PD7 microsteps: 16 rotation_distance: 40 -endstop_pin: ^ar3 +endstop_pin: ^PE5 position_endstop: 0 position_max: 250 homing_speed: 50 [stepper_y] -step_pin: ar60 -dir_pin: !ar61 -enable_pin: !ar56 +step_pin: PF6 +dir_pin: !PF7 +enable_pin: !PF2 microsteps: 16 rotation_distance: 40 -endstop_pin: ^ar14 +endstop_pin: ^PJ1 position_endstop: 0 position_max: 250 homing_speed: 50 [stepper_z] -step_pin: ar46 -dir_pin: ar48 -enable_pin: !ar62 +step_pin: PL3 +dir_pin: PL1 +enable_pin: !PK0 microsteps: 16 rotation_distance: 8 -endstop_pin: ^ar18 +endstop_pin: ^PD3 position_endstop: 0.5 position_max: 250 [stepper_z1] -step_pin: ar36 -dir_pin: ar34 -enable_pin: !ar30 +step_pin: PC1 +dir_pin: PC3 +enable_pin: !PC7 microsteps: 16 rotation_distance: 8 -endstop_pin: ^ar19 +endstop_pin: ^PD2 [stepper_z2] -step_pin: ar16 -dir_pin: ar17 -enable_pin: !ar23 +step_pin: PH1 +dir_pin: PH0 +enable_pin: !PA1 microsteps: 16 rotation_distance: 8 [stepper_z3] -step_pin: ar5 -dir_pin: ar4 +step_pin: PE3 +dir_pin: PG5 microsteps: 16 rotation_distance: 8 @@ -82,16 +82,16 @@ points: 195,50 [extruder] -step_pin: ar26 -dir_pin: ar28 -enable_pin: !ar24 +step_pin: PA4 +dir_pin: PA6 +enable_pin: !PA2 microsteps: 16 rotation_distance: 33.5 nozzle_diameter: 0.400 filament_diameter: 1.750 -heater_pin: ar10 +heater_pin: PB4 sensor_type: EPCOS 100K B57560G104F -sensor_pin: analog13 +sensor_pin: PK5 control: pid pid_Kp: 22.2 pid_Ki: 1.08 @@ -100,20 +100,19 @@ min_temp: 0 max_temp: 250 [heater_bed] -heater_pin: ar8 +heater_pin: PH5 sensor_type: EPCOS 100K B57560G104F -sensor_pin: analog14 +sensor_pin: PK6 control: watermark min_temp: 0 max_temp: 130 [probe] -pin: ar9 +pin: PH6 z_offset: 1.15 [mcu] serial: /dev/ttyACM0 -pin_map: arduino [printer] kinematics: cartesian diff --git a/test/klippy/z_virtual_endstop.cfg b/test/klippy/z_virtual_endstop.cfg index 97078333..d2079ddc 100644 --- a/test/klippy/z_virtual_endstop.cfg +++ b/test/klippy/z_virtual_endstop.cfg @@ -1,46 +1,46 @@ # Test config for probe:z_virtual_endstop [stepper_x] -step_pin: ar54 -dir_pin: ar55 -enable_pin: !ar38 +step_pin: PF0 +dir_pin: PF1 +enable_pin: !PD7 microsteps: 16 rotation_distance: 40 -endstop_pin: ^ar3 +endstop_pin: ^PE5 position_endstop: 0 position_max: 200 homing_speed: 50 [stepper_y] -step_pin: ar60 -dir_pin: !ar61 -enable_pin: !ar56 +step_pin: PF6 +dir_pin: !PF7 +enable_pin: !PF2 microsteps: 16 rotation_distance: 40 -endstop_pin: ^ar14 +endstop_pin: ^PJ1 position_endstop: 0 position_max: 200 homing_speed: 50 [stepper_z] -step_pin: ar46 -dir_pin: ar48 -enable_pin: !ar62 +step_pin: PL3 +dir_pin: PL1 +enable_pin: !PK0 microsteps: 16 rotation_distance: 8 endstop_pin: probe:z_virtual_endstop position_max: 200 [extruder] -step_pin: ar26 -dir_pin: ar28 -enable_pin: !ar24 +step_pin: PA4 +dir_pin: PA6 +enable_pin: !PA2 microsteps: 16 rotation_distance: 33.5 nozzle_diameter: 0.400 filament_diameter: 1.750 -heater_pin: ar10 +heater_pin: PB4 sensor_type: EPCOS 100K B57560G104F -sensor_pin: analog13 +sensor_pin: PK5 control: pid pid_Kp: 22.2 pid_Ki: 1.08 @@ -49,15 +49,15 @@ min_temp: 0 max_temp: 250 [heater_bed] -heater_pin: ar8 +heater_pin: PH5 sensor_type: EPCOS 100K B57560G104F -sensor_pin: analog14 +sensor_pin: PK6 control: watermark min_temp: 0 max_temp: 130 [probe] -pin: ar9 +pin: PH6 z_offset: 1.15 [bed_mesh] @@ -66,7 +66,6 @@ mesh_max: 180,180 [mcu] serial: /dev/ttyACM0 -pin_map: arduino [printer] kinematics: cartesian