From e46365c8147ba9d727966dc56205f51d3e0de47a Mon Sep 17 00:00:00 2001 From: Jan-Gerrit Drexhage <102791900+Surion79@users.noreply.github.com> Date: Wed, 19 Jun 2024 21:08:00 +0200 Subject: [PATCH] added AWD support (2x X, 2x Y) (#508) --- config/hardware/axis/X/0.9deg.cfg | 9 +-------- config/hardware/axis/X/0.9deg_1M.cfg | 8 ++++++++ config/hardware/axis/X/0.9deg_2M.cfg | 13 +++++++++++++ config/hardware/axis/X/1.8deg.cfg | 9 +-------- config/hardware/axis/X/1.8deg_1M.cfg | 8 ++++++++ config/hardware/axis/X/1.8deg_2M.cfg | 13 +++++++++++++ config/hardware/axis/X/TMC/TMC2209.cfg | 13 +------------ config/hardware/axis/X/TMC/TMC2209_1-Motor.cfg | 12 ++++++++++++ .../hardware/axis/X/TMC/TMC2209_2-Motors.cfg | 8 ++++++++ config/hardware/axis/X/TMC/TMC2240.cfg | 16 +--------------- config/hardware/axis/X/TMC/TMC2240_1-Motor.cfg | 15 +++++++++++++++ .../hardware/axis/X/TMC/TMC2240_2-Motors.cfg | 11 +++++++++++ config/hardware/axis/X/TMC/TMC5160.cfg | 16 +--------------- config/hardware/axis/X/TMC/TMC5160_1-Motor.cfg | 15 +++++++++++++++ .../hardware/axis/X/TMC/TMC5160_2-Motors.cfg | 11 +++++++++++ config/hardware/axis/X/default_wiring.cfg | 6 +----- config/hardware/axis/X/default_wiring_1M.cfg | 5 +++++ config/hardware/axis/X/default_wiring_2M.cfg | 6 ++++++ config/hardware/axis/Y/0.9deg.cfg | 9 +-------- config/hardware/axis/Y/0.9deg_1M.cfg | 8 ++++++++ config/hardware/axis/Y/0.9deg_2M.cfg | 13 +++++++++++++ config/hardware/axis/Y/1.8deg.cfg | 9 +-------- config/hardware/axis/Y/1.8deg_1M.cfg | 8 ++++++++ config/hardware/axis/Y/1.8deg_2M.cfg | 13 +++++++++++++ config/hardware/axis/Y/TMC/TMC2209.cfg | 13 +------------ config/hardware/axis/Y/TMC/TMC2209_1-Motor.cfg | 12 ++++++++++++ .../hardware/axis/Y/TMC/TMC2209_2-Motors.cfg | 8 ++++++++ config/hardware/axis/Y/TMC/TMC2240.cfg | 16 +--------------- config/hardware/axis/Y/TMC/TMC2240_1-Motor.cfg | 15 +++++++++++++++ .../hardware/axis/Y/TMC/TMC2240_2-Motors.cfg | 11 +++++++++++ config/hardware/axis/Y/TMC/TMC5160.cfg | 16 +--------------- config/hardware/axis/Y/TMC/TMC5160_1-Motor.cfg | 15 +++++++++++++++ .../hardware/axis/Y/TMC/TMC5160_2-Motors.cfg | 11 +++++++++++ config/hardware/axis/Y/default_wiring.cfg | 6 +----- config/hardware/axis/Y/default_wiring_1M.cfg | 5 +++++ config/hardware/axis/Y/default_wiring_2M.cfg | 6 ++++++ user_templates/mcu.cfg | 18 ++++++++++++------ user_templates/printer.cfg | 12 ++++++++---- 38 files changed, 282 insertions(+), 136 deletions(-) create mode 100644 config/hardware/axis/X/0.9deg_1M.cfg create mode 100644 config/hardware/axis/X/0.9deg_2M.cfg create mode 100644 config/hardware/axis/X/1.8deg_1M.cfg create mode 100644 config/hardware/axis/X/1.8deg_2M.cfg create mode 100644 config/hardware/axis/X/TMC/TMC2209_1-Motor.cfg create mode 100644 config/hardware/axis/X/TMC/TMC2209_2-Motors.cfg create mode 100644 config/hardware/axis/X/TMC/TMC2240_1-Motor.cfg create mode 100644 config/hardware/axis/X/TMC/TMC2240_2-Motors.cfg create mode 100644 config/hardware/axis/X/TMC/TMC5160_1-Motor.cfg create mode 100644 config/hardware/axis/X/TMC/TMC5160_2-Motors.cfg create mode 100644 config/hardware/axis/X/default_wiring_1M.cfg create mode 100644 config/hardware/axis/X/default_wiring_2M.cfg create mode 100644 config/hardware/axis/Y/0.9deg_1M.cfg create mode 100644 config/hardware/axis/Y/0.9deg_2M.cfg create mode 100644 config/hardware/axis/Y/1.8deg_1M.cfg create mode 100644 config/hardware/axis/Y/1.8deg_2M.cfg create mode 100644 config/hardware/axis/Y/TMC/TMC2209_1-Motor.cfg create mode 100644 config/hardware/axis/Y/TMC/TMC2209_2-Motors.cfg create mode 100644 config/hardware/axis/Y/TMC/TMC2240_1-Motor.cfg create mode 100644 config/hardware/axis/Y/TMC/TMC2240_2-Motors.cfg create mode 100644 config/hardware/axis/Y/TMC/TMC5160_1-Motor.cfg create mode 100644 config/hardware/axis/Y/TMC/TMC5160_2-Motors.cfg create mode 100644 config/hardware/axis/Y/default_wiring_1M.cfg create mode 100644 config/hardware/axis/Y/default_wiring_2M.cfg diff --git a/config/hardware/axis/X/0.9deg.cfg b/config/hardware/axis/X/0.9deg.cfg index 0c86dba3a..b83ba150b 100644 --- a/config/hardware/axis/X/0.9deg.cfg +++ b/config/hardware/axis/X/0.9deg.cfg @@ -1,8 +1 @@ -[stepper_x] -rotation_distance: 40 -microsteps: 32 -full_steps_per_rotation: 400 - -# We also include the default wiring and speeds from here to avoid duplicating -[include default_wiring.cfg] -[include default_speed.cfg] +[include 0.9deg_1M.cfg] diff --git a/config/hardware/axis/X/0.9deg_1M.cfg b/config/hardware/axis/X/0.9deg_1M.cfg new file mode 100644 index 000000000..9fd8f0902 --- /dev/null +++ b/config/hardware/axis/X/0.9deg_1M.cfg @@ -0,0 +1,8 @@ +[stepper_x] +rotation_distance: 40 +microsteps: 32 +full_steps_per_rotation: 400 + +# We also include the default wiring and speeds from here to avoid duplicating +[include default_wiring_1M.cfg] +[include default_speed.cfg] diff --git a/config/hardware/axis/X/0.9deg_2M.cfg b/config/hardware/axis/X/0.9deg_2M.cfg new file mode 100644 index 000000000..e0007139c --- /dev/null +++ b/config/hardware/axis/X/0.9deg_2M.cfg @@ -0,0 +1,13 @@ +[stepper_x] +rotation_distance: 40 +microsteps: 32 +full_steps_per_rotation: 400 + +[stepper_x1] +rotation_distance: 40 +microsteps: 32 +full_steps_per_rotation: 400 + +# We also include the default wiring and speeds from here to avoid duplicating +[include default_wiring_2M.cfg] +[include default_speed.cfg] diff --git a/config/hardware/axis/X/1.8deg.cfg b/config/hardware/axis/X/1.8deg.cfg index ee1d030a2..0623ccea7 100644 --- a/config/hardware/axis/X/1.8deg.cfg +++ b/config/hardware/axis/X/1.8deg.cfg @@ -1,8 +1 @@ -[stepper_x] -rotation_distance: 40 -microsteps: 32 -full_steps_per_rotation: 200 - -# We also include the default wiring and speeds from here to avoid duplicating -[include default_wiring.cfg] -[include default_speed.cfg] +[include 1.8deg_1M.cfg] diff --git a/config/hardware/axis/X/1.8deg_1M.cfg b/config/hardware/axis/X/1.8deg_1M.cfg new file mode 100644 index 000000000..80a1c3c8c --- /dev/null +++ b/config/hardware/axis/X/1.8deg_1M.cfg @@ -0,0 +1,8 @@ +[stepper_x] +rotation_distance: 40 +microsteps: 32 +full_steps_per_rotation: 200 + +# We also include the default wiring and speeds from here to avoid duplicating +[include default_wiring_1M.cfg] +[include default_speed.cfg] diff --git a/config/hardware/axis/X/1.8deg_2M.cfg b/config/hardware/axis/X/1.8deg_2M.cfg new file mode 100644 index 000000000..1e5237802 --- /dev/null +++ b/config/hardware/axis/X/1.8deg_2M.cfg @@ -0,0 +1,13 @@ +[stepper_x] +rotation_distance: 40 +microsteps: 32 +full_steps_per_rotation: 200 + +[stepper_x1] +rotation_distance: 40 +microsteps: 32 +full_steps_per_rotation: 200 + +# We also include the default wiring and speeds from here to avoid duplicating +[include default_wiring_2M.cfg] +[include default_speed.cfg] diff --git a/config/hardware/axis/X/TMC/TMC2209.cfg b/config/hardware/axis/X/TMC/TMC2209.cfg index 2b25f6666..56e76cc45 100644 --- a/config/hardware/axis/X/TMC/TMC2209.cfg +++ b/config/hardware/axis/X/TMC/TMC2209.cfg @@ -1,12 +1 @@ -# X TMC2209 definition - -[gcode_macro _USER_VARIABLES] -variable_x_driver: "tmc2209" -gcode: - -[tmc2209 stepper_x] -uart_pin: X_TMCUART -interpolate: True -run_current: 0.8 -sense_resistor: 0.110 -stealthchop_threshold: 0 +[include TMC2209_1-Motor.cfg] diff --git a/config/hardware/axis/X/TMC/TMC2209_1-Motor.cfg b/config/hardware/axis/X/TMC/TMC2209_1-Motor.cfg new file mode 100644 index 000000000..2b25f6666 --- /dev/null +++ b/config/hardware/axis/X/TMC/TMC2209_1-Motor.cfg @@ -0,0 +1,12 @@ +# X TMC2209 definition + +[gcode_macro _USER_VARIABLES] +variable_x_driver: "tmc2209" +gcode: + +[tmc2209 stepper_x] +uart_pin: X_TMCUART +interpolate: True +run_current: 0.8 +sense_resistor: 0.110 +stealthchop_threshold: 0 diff --git a/config/hardware/axis/X/TMC/TMC2209_2-Motors.cfg b/config/hardware/axis/X/TMC/TMC2209_2-Motors.cfg new file mode 100644 index 000000000..268db74ed --- /dev/null +++ b/config/hardware/axis/X/TMC/TMC2209_2-Motors.cfg @@ -0,0 +1,8 @@ +[include TMC2209_1-Motor.cfg] + +[tmc2209 stepper_x1] +uart_pin: X1_TMCUART +interpolate: True +run_current: 0.8 +sense_resistor: 0.110 +stealthchop_threshold: 0 diff --git a/config/hardware/axis/X/TMC/TMC2240.cfg b/config/hardware/axis/X/TMC/TMC2240.cfg index 840be8124..c002be5ca 100644 --- a/config/hardware/axis/X/TMC/TMC2240.cfg +++ b/config/hardware/axis/X/TMC/TMC2240.cfg @@ -1,15 +1 @@ -# X TMC2240 definition - -[gcode_macro _USER_VARIABLES] -variable_x_driver: "tmc2240" -gcode: - -[tmc2240 stepper_x] -cs_pin: X_TMCUART -spi_speed: 500000 -spi_software_sclk_pin: DRIVER_SPI_SCK -spi_software_mosi_pin: DRIVER_SPI_MOSI -spi_software_miso_pin: DRIVER_SPI_MISO -interpolate: True -run_current: 0.7 -stealthchop_threshold: 0 +[include TMC2240_1-Motor.cfg] diff --git a/config/hardware/axis/X/TMC/TMC2240_1-Motor.cfg b/config/hardware/axis/X/TMC/TMC2240_1-Motor.cfg new file mode 100644 index 000000000..840be8124 --- /dev/null +++ b/config/hardware/axis/X/TMC/TMC2240_1-Motor.cfg @@ -0,0 +1,15 @@ +# X TMC2240 definition + +[gcode_macro _USER_VARIABLES] +variable_x_driver: "tmc2240" +gcode: + +[tmc2240 stepper_x] +cs_pin: X_TMCUART +spi_speed: 500000 +spi_software_sclk_pin: DRIVER_SPI_SCK +spi_software_mosi_pin: DRIVER_SPI_MOSI +spi_software_miso_pin: DRIVER_SPI_MISO +interpolate: True +run_current: 0.7 +stealthchop_threshold: 0 diff --git a/config/hardware/axis/X/TMC/TMC2240_2-Motors.cfg b/config/hardware/axis/X/TMC/TMC2240_2-Motors.cfg new file mode 100644 index 000000000..ddfa73e28 --- /dev/null +++ b/config/hardware/axis/X/TMC/TMC2240_2-Motors.cfg @@ -0,0 +1,11 @@ +[include TMC2240_1-Motor.cfg] + +[tmc2240 stepper_x1] +cs_pin: X1_TMCUART +spi_speed: 500000 +spi_software_sclk_pin: DRIVER_SPI_SCK +spi_software_mosi_pin: DRIVER_SPI_MOSI +spi_software_miso_pin: DRIVER_SPI_MISO +interpolate: True +run_current: 0.7 +stealthchop_threshold: 0 diff --git a/config/hardware/axis/X/TMC/TMC5160.cfg b/config/hardware/axis/X/TMC/TMC5160.cfg index 248485e34..1dfa3f1ee 100644 --- a/config/hardware/axis/X/TMC/TMC5160.cfg +++ b/config/hardware/axis/X/TMC/TMC5160.cfg @@ -1,15 +1 @@ -# X TMC5160 definition - -[gcode_macro _USER_VARIABLES] -variable_x_driver: "tmc5160" -gcode: - -[tmc5160 stepper_x] -cs_pin: X_TMCUART -spi_software_sclk_pin: DRIVER_SPI_SCK -spi_software_mosi_pin: DRIVER_SPI_MOSI -spi_software_miso_pin: DRIVER_SPI_MISO -interpolate: True -run_current: 0.8 -sense_resistor: 0.075 -stealthchop_threshold: 0 +[include TMC5160_1-Motor.cfg] diff --git a/config/hardware/axis/X/TMC/TMC5160_1-Motor.cfg b/config/hardware/axis/X/TMC/TMC5160_1-Motor.cfg new file mode 100644 index 000000000..248485e34 --- /dev/null +++ b/config/hardware/axis/X/TMC/TMC5160_1-Motor.cfg @@ -0,0 +1,15 @@ +# X TMC5160 definition + +[gcode_macro _USER_VARIABLES] +variable_x_driver: "tmc5160" +gcode: + +[tmc5160 stepper_x] +cs_pin: X_TMCUART +spi_software_sclk_pin: DRIVER_SPI_SCK +spi_software_mosi_pin: DRIVER_SPI_MOSI +spi_software_miso_pin: DRIVER_SPI_MISO +interpolate: True +run_current: 0.8 +sense_resistor: 0.075 +stealthchop_threshold: 0 diff --git a/config/hardware/axis/X/TMC/TMC5160_2-Motors.cfg b/config/hardware/axis/X/TMC/TMC5160_2-Motors.cfg new file mode 100644 index 000000000..3b4e2a3be --- /dev/null +++ b/config/hardware/axis/X/TMC/TMC5160_2-Motors.cfg @@ -0,0 +1,11 @@ +[include TMC5160_1-Motor.cfg] + +[tmc5160 stepper_x1] +cs_pin: X1_TMCUART +spi_software_sclk_pin: DRIVER_SPI_SCK +spi_software_mosi_pin: DRIVER_SPI_MOSI +spi_software_miso_pin: DRIVER_SPI_MISO +interpolate: True +run_current: 0.8 +sense_resistor: 0.075 +stealthchop_threshold: 0 diff --git a/config/hardware/axis/X/default_wiring.cfg b/config/hardware/axis/X/default_wiring.cfg index 036f31e7d..358fa2db4 100644 --- a/config/hardware/axis/X/default_wiring.cfg +++ b/config/hardware/axis/X/default_wiring.cfg @@ -1,5 +1 @@ -[stepper_x] -step_pin: X_STEP -dir_pin: X_DIR -enable_pin: !X_ENABLE -endstop_pin: X_STOP +[include default_wiring_1M.cfg] diff --git a/config/hardware/axis/X/default_wiring_1M.cfg b/config/hardware/axis/X/default_wiring_1M.cfg new file mode 100644 index 000000000..036f31e7d --- /dev/null +++ b/config/hardware/axis/X/default_wiring_1M.cfg @@ -0,0 +1,5 @@ +[stepper_x] +step_pin: X_STEP +dir_pin: X_DIR +enable_pin: !X_ENABLE +endstop_pin: X_STOP diff --git a/config/hardware/axis/X/default_wiring_2M.cfg b/config/hardware/axis/X/default_wiring_2M.cfg new file mode 100644 index 000000000..98272318f --- /dev/null +++ b/config/hardware/axis/X/default_wiring_2M.cfg @@ -0,0 +1,6 @@ +[include default_wiring_1M.cfg] + +[stepper_x1] +step_pin: X1_STEP +dir_pin: X1_DIR +enable_pin: !X1_ENABLE diff --git a/config/hardware/axis/Y/0.9deg.cfg b/config/hardware/axis/Y/0.9deg.cfg index 9bc9f0604..b83ba150b 100644 --- a/config/hardware/axis/Y/0.9deg.cfg +++ b/config/hardware/axis/Y/0.9deg.cfg @@ -1,8 +1 @@ -[stepper_y] -rotation_distance: 40 -microsteps: 32 -full_steps_per_rotation: 400 - -# We also include the default wiring and speeds from here to avoid duplicating -[include default_wiring.cfg] -[include default_speed.cfg] +[include 0.9deg_1M.cfg] diff --git a/config/hardware/axis/Y/0.9deg_1M.cfg b/config/hardware/axis/Y/0.9deg_1M.cfg new file mode 100644 index 000000000..5237d304f --- /dev/null +++ b/config/hardware/axis/Y/0.9deg_1M.cfg @@ -0,0 +1,8 @@ +[stepper_y] +rotation_distance: 40 +microsteps: 32 +full_steps_per_rotation: 400 + +# We also include the default wiring and speeds from here to avoid duplicating +[include default_wiring_1M.cfg] +[include default_speed.cfg] diff --git a/config/hardware/axis/Y/0.9deg_2M.cfg b/config/hardware/axis/Y/0.9deg_2M.cfg new file mode 100644 index 000000000..eb45dad92 --- /dev/null +++ b/config/hardware/axis/Y/0.9deg_2M.cfg @@ -0,0 +1,13 @@ +[stepper_y] +rotation_distance: 40 +microsteps: 32 +full_steps_per_rotation: 400 + +[stepper_y1] +rotation_distance: 40 +microsteps: 32 +full_steps_per_rotation: 400 + +# We also include the default wiring and speeds from here to avoid duplicating +[include default_wiring_2M.cfg] +[include default_speed.cfg] diff --git a/config/hardware/axis/Y/1.8deg.cfg b/config/hardware/axis/Y/1.8deg.cfg index bd3fe24c4..0623ccea7 100644 --- a/config/hardware/axis/Y/1.8deg.cfg +++ b/config/hardware/axis/Y/1.8deg.cfg @@ -1,8 +1 @@ -[stepper_y] -rotation_distance: 40 -microsteps: 32 -full_steps_per_rotation: 200 - -# We also include the default wiring and speeds from here to avoid duplicating -[include default_wiring.cfg] -[include default_speed.cfg] +[include 1.8deg_1M.cfg] diff --git a/config/hardware/axis/Y/1.8deg_1M.cfg b/config/hardware/axis/Y/1.8deg_1M.cfg new file mode 100644 index 000000000..ec3147071 --- /dev/null +++ b/config/hardware/axis/Y/1.8deg_1M.cfg @@ -0,0 +1,8 @@ +[stepper_y] +rotation_distance: 40 +microsteps: 32 +full_steps_per_rotation: 200 + +# We also include the default wiring and speeds from here to avoid duplicating +[include default_wiring_1M.cfg] +[include default_speed.cfg] diff --git a/config/hardware/axis/Y/1.8deg_2M.cfg b/config/hardware/axis/Y/1.8deg_2M.cfg new file mode 100644 index 000000000..d0ee4226b --- /dev/null +++ b/config/hardware/axis/Y/1.8deg_2M.cfg @@ -0,0 +1,13 @@ +[stepper_y] +rotation_distance: 40 +microsteps: 32 +full_steps_per_rotation: 200 + +[stepper_y1] +rotation_distance: 40 +microsteps: 32 +full_steps_per_rotation: 200 + +# We also include the default wiring and speeds from here to avoid duplicating +[include default_wiring_2M.cfg] +[include default_speed.cfg] diff --git a/config/hardware/axis/Y/TMC/TMC2209.cfg b/config/hardware/axis/Y/TMC/TMC2209.cfg index 34d5a1119..56e76cc45 100644 --- a/config/hardware/axis/Y/TMC/TMC2209.cfg +++ b/config/hardware/axis/Y/TMC/TMC2209.cfg @@ -1,12 +1 @@ -# Y TMC2209 definition - -[gcode_macro _USER_VARIABLES] -variable_y_driver: "tmc2209" -gcode: - -[tmc2209 stepper_y] -uart_pin: Y_TMCUART -interpolate: True -run_current: 0.8 -sense_resistor: 0.110 -stealthchop_threshold: 0 +[include TMC2209_1-Motor.cfg] diff --git a/config/hardware/axis/Y/TMC/TMC2209_1-Motor.cfg b/config/hardware/axis/Y/TMC/TMC2209_1-Motor.cfg new file mode 100644 index 000000000..34d5a1119 --- /dev/null +++ b/config/hardware/axis/Y/TMC/TMC2209_1-Motor.cfg @@ -0,0 +1,12 @@ +# Y TMC2209 definition + +[gcode_macro _USER_VARIABLES] +variable_y_driver: "tmc2209" +gcode: + +[tmc2209 stepper_y] +uart_pin: Y_TMCUART +interpolate: True +run_current: 0.8 +sense_resistor: 0.110 +stealthchop_threshold: 0 diff --git a/config/hardware/axis/Y/TMC/TMC2209_2-Motors.cfg b/config/hardware/axis/Y/TMC/TMC2209_2-Motors.cfg new file mode 100644 index 000000000..9f4321856 --- /dev/null +++ b/config/hardware/axis/Y/TMC/TMC2209_2-Motors.cfg @@ -0,0 +1,8 @@ +[include TMC2209_1-Motor.cfg] + +[tmc2209 stepper_y1] +uart_pin: Y1_TMCUART +interpolate: True +run_current: 0.8 +sense_resistor: 0.110 +stealthchop_threshold: 0 diff --git a/config/hardware/axis/Y/TMC/TMC2240.cfg b/config/hardware/axis/Y/TMC/TMC2240.cfg index 307778d48..c002be5ca 100644 --- a/config/hardware/axis/Y/TMC/TMC2240.cfg +++ b/config/hardware/axis/Y/TMC/TMC2240.cfg @@ -1,15 +1 @@ -# Y TMC2240 definition - -[gcode_macro _USER_VARIABLES] -variable_y_driver: "tmc2240" -gcode: - -[tmc2240 stepper_y] -cs_pin: Y_TMCUART -spi_speed: 500000 -spi_software_sclk_pin: DRIVER_SPI_SCK -spi_software_mosi_pin: DRIVER_SPI_MOSI -spi_software_miso_pin: DRIVER_SPI_MISO -interpolate: True -run_current: 0.7 -stealthchop_threshold: 0 +[include TMC2240_1-Motor.cfg] diff --git a/config/hardware/axis/Y/TMC/TMC2240_1-Motor.cfg b/config/hardware/axis/Y/TMC/TMC2240_1-Motor.cfg new file mode 100644 index 000000000..307778d48 --- /dev/null +++ b/config/hardware/axis/Y/TMC/TMC2240_1-Motor.cfg @@ -0,0 +1,15 @@ +# Y TMC2240 definition + +[gcode_macro _USER_VARIABLES] +variable_y_driver: "tmc2240" +gcode: + +[tmc2240 stepper_y] +cs_pin: Y_TMCUART +spi_speed: 500000 +spi_software_sclk_pin: DRIVER_SPI_SCK +spi_software_mosi_pin: DRIVER_SPI_MOSI +spi_software_miso_pin: DRIVER_SPI_MISO +interpolate: True +run_current: 0.7 +stealthchop_threshold: 0 diff --git a/config/hardware/axis/Y/TMC/TMC2240_2-Motors.cfg b/config/hardware/axis/Y/TMC/TMC2240_2-Motors.cfg new file mode 100644 index 000000000..694687a61 --- /dev/null +++ b/config/hardware/axis/Y/TMC/TMC2240_2-Motors.cfg @@ -0,0 +1,11 @@ +[include TMC2240_1-Motor.cfg] + +[tmc2240 stepper_y1] +cs_pin: Y1_TMCUART +spi_speed: 500000 +spi_software_sclk_pin: DRIVER_SPI_SCK +spi_software_mosi_pin: DRIVER_SPI_MOSI +spi_software_miso_pin: DRIVER_SPI_MISO +interpolate: True +run_current: 0.7 +stealthchop_threshold: 0 diff --git a/config/hardware/axis/Y/TMC/TMC5160.cfg b/config/hardware/axis/Y/TMC/TMC5160.cfg index 92fe211d7..1dfa3f1ee 100644 --- a/config/hardware/axis/Y/TMC/TMC5160.cfg +++ b/config/hardware/axis/Y/TMC/TMC5160.cfg @@ -1,15 +1 @@ -# Y TMC5160 definition - -[gcode_macro _USER_VARIABLES] -variable_y_driver: "tmc5160" -gcode: - -[tmc5160 stepper_y] -cs_pin: Y_TMCUART -spi_software_sclk_pin: DRIVER_SPI_SCK -spi_software_mosi_pin: DRIVER_SPI_MOSI -spi_software_miso_pin: DRIVER_SPI_MISO -interpolate: True -run_current: 0.8 -sense_resistor: 0.075 -stealthchop_threshold: 0 +[include TMC5160_1-Motor.cfg] diff --git a/config/hardware/axis/Y/TMC/TMC5160_1-Motor.cfg b/config/hardware/axis/Y/TMC/TMC5160_1-Motor.cfg new file mode 100644 index 000000000..92fe211d7 --- /dev/null +++ b/config/hardware/axis/Y/TMC/TMC5160_1-Motor.cfg @@ -0,0 +1,15 @@ +# Y TMC5160 definition + +[gcode_macro _USER_VARIABLES] +variable_y_driver: "tmc5160" +gcode: + +[tmc5160 stepper_y] +cs_pin: Y_TMCUART +spi_software_sclk_pin: DRIVER_SPI_SCK +spi_software_mosi_pin: DRIVER_SPI_MOSI +spi_software_miso_pin: DRIVER_SPI_MISO +interpolate: True +run_current: 0.8 +sense_resistor: 0.075 +stealthchop_threshold: 0 diff --git a/config/hardware/axis/Y/TMC/TMC5160_2-Motors.cfg b/config/hardware/axis/Y/TMC/TMC5160_2-Motors.cfg new file mode 100644 index 000000000..c8a2146f7 --- /dev/null +++ b/config/hardware/axis/Y/TMC/TMC5160_2-Motors.cfg @@ -0,0 +1,11 @@ +[include TMC5160_1-Motor.cfg] + +[tmc5160 stepper_y1] +cs_pin: Y1_TMCUART +spi_software_sclk_pin: DRIVER_SPI_SCK +spi_software_mosi_pin: DRIVER_SPI_MOSI +spi_software_miso_pin: DRIVER_SPI_MISO +interpolate: True +run_current: 0.8 +sense_resistor: 0.075 +stealthchop_threshold: 0 diff --git a/config/hardware/axis/Y/default_wiring.cfg b/config/hardware/axis/Y/default_wiring.cfg index 795e0b613..358fa2db4 100644 --- a/config/hardware/axis/Y/default_wiring.cfg +++ b/config/hardware/axis/Y/default_wiring.cfg @@ -1,5 +1 @@ -[stepper_y] -step_pin: Y_STEP -dir_pin: Y_DIR -enable_pin: !Y_ENABLE -endstop_pin: Y_STOP +[include default_wiring_1M.cfg] diff --git a/config/hardware/axis/Y/default_wiring_1M.cfg b/config/hardware/axis/Y/default_wiring_1M.cfg new file mode 100644 index 000000000..795e0b613 --- /dev/null +++ b/config/hardware/axis/Y/default_wiring_1M.cfg @@ -0,0 +1,5 @@ +[stepper_y] +step_pin: Y_STEP +dir_pin: Y_DIR +enable_pin: !Y_ENABLE +endstop_pin: Y_STOP diff --git a/config/hardware/axis/Y/default_wiring_2M.cfg b/config/hardware/axis/Y/default_wiring_2M.cfg new file mode 100644 index 000000000..21c2bc7e8 --- /dev/null +++ b/config/hardware/axis/Y/default_wiring_2M.cfg @@ -0,0 +1,6 @@ +[include default_wiring_1M.cfg] + +[stepper_y1] +step_pin: Y1_STEP +dir_pin: Y1_DIR +enable_pin: !Y1_ENABLE diff --git a/user_templates/mcu.cfg b/user_templates/mcu.cfg index cd9439758..cb637c619 100644 --- a/user_templates/mcu.cfg +++ b/user_templates/mcu.cfg @@ -20,15 +20,21 @@ # ---------------------------------------------------------------------- AXIS DRIVERS ----> optional, but only one line per axis need to be selected ### 1. X Drivers ------------------------------------------------------------------------- -# [include config/hardware/axis/X/TMC/TMC2209.cfg] +# [include config/hardware/axis/X/TMC/TMC2209_1-Motor.cfg] +# [include config/hardware/axis/X/TMC/TMC2209_2-Motors.cfg] # [include config/hardware/axis/X/TMC/TMC2209_V0specific.cfg] # Should only be used for early LDO V0 kits to mitigate the known VFAs issue -# [include config/hardware/axis/X/TMC/TMC2240.cfg] -# [include config/hardware/axis/X/TMC/TMC5160.cfg] +# [include config/hardware/axis/X/TMC/TMC2240_1-Motor.cfg] +# [include config/hardware/axis/X/TMC/TMC2240_2-Motors.cfg] +# [include config/hardware/axis/X/TMC/TMC5160_1-Motor.cfg] +# [include config/hardware/axis/X/TMC/TMC5160_2-Motors.cfg] ### 2. Y Drivers ------------------------------------------------------------------------- -# [include config/hardware/axis/Y/TMC/TMC2209.cfg] +# [include config/hardware/axis/Y/TMC/TMC2209_1-Motor.cfg] +# [include config/hardware/axis/Y/TMC/TMC2209_2-Motors.cfg] # [include config/hardware/axis/Y/TMC/TMC2209_V0specific.cfg] # Should only be used for early LDO V0 kits to mitigate the known VFAs issue -# [include config/hardware/axis/Y/TMC/TMC2240.cfg] -# [include config/hardware/axis/Y/TMC/TMC5160.cfg] +# [include config/hardware/axis/Y/TMC/TMC2240_1-Motor.cfg] +# [include config/hardware/axis/Y/TMC/TMC2240_2-Motors.cfg] +# [include config/hardware/axis/Y/TMC/TMC5160_1-Motor.cfg] +# [include config/hardware/axis/Y/TMC/TMC5160_2-Motors.cfg] ### 3. Z Drivers ------------------------------------------------------------------------- # [include config/hardware/axis/Z/TMC/TMC2209_1-Motor.cfg] # [include config/hardware/axis/Z/TMC/TMC2209_3-Motors.cfg] diff --git a/user_templates/printer.cfg b/user_templates/printer.cfg index 9db3d1afe..6daf7e461 100644 --- a/user_templates/printer.cfg +++ b/user_templates/printer.cfg @@ -24,11 +24,15 @@ # ---------------------------------------------------------------------- MACHINE AXIS ----> Select only one line for each axis ### X axis ------------------------------------------------------------------------------- -# [include config/hardware/axis/X/1.8deg.cfg] -# [include config/hardware/axis/X/0.9deg.cfg] +# [include config/hardware/axis/X/1.8deg_1M.cfg] # Single X motor +# [include config/hardware/axis/X/1.8deg_2M.cfg] # Dual X motor +# [include config/hardware/axis/X/0.9deg_1M.cfg] # Single X motor +# [include config/hardware/axis/X/0.9deg_2M.cfg] # Dual X motor ### Y axis ------------------------------------------------------------------------------- -# [include config/hardware/axis/Y/1.8deg.cfg] -# [include config/hardware/axis/Y/0.9deg.cfg] +# [include config/hardware/axis/Y/1.8deg_1M.cfg] # Single Y motor +# [include config/hardware/axis/Y/1.8deg_2M.cfg] # Dual Y motor +# [include config/hardware/axis/Y/0.9deg_1M.cfg] # Single Y motor +# [include config/hardware/axis/Y/0.9deg_2M.cfg] # Dual Y motor ### Z axis ------------------------------------------------------------------------------- # [include config/hardware/axis/Z/V2.4_stock_1.8deg.cfg]