From 34f656decd0bd32a221c14b635f2cb1a73c66a61 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 13 Mar 2018 02:01:41 -0500 Subject: [PATCH 1/2] Add TMC2208 include in tmc_util.h --- Marlin/src/feature/tmc_util.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Marlin/src/feature/tmc_util.h b/Marlin/src/feature/tmc_util.h index 63312f7581..8ea7a862b9 100644 --- a/Marlin/src/feature/tmc_util.h +++ b/Marlin/src/feature/tmc_util.h @@ -23,9 +23,15 @@ #ifndef _TMC_UTIL_H_ #define _TMC_UTIL_H_ -#include +#include "../inc/MarlinConfigPre.h" -#include "../inc/MarlinConfig.h" +#if ENABLED(HAVE_TMC2130) + #include +#endif + +#if ENABLED(HAVE_TMC2208) + #include +#endif extern bool report_tmc_status; From e7570f3195189f3b6df31faff629da33c8f9f625 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 13 Mar 2018 02:06:40 -0500 Subject: [PATCH 2/2] Improve TMC config organization, naming --- Marlin/Configuration_adv.h | 65 +++--- Marlin/src/config/default/Configuration_adv.h | 65 +++--- .../AlephObjects/TAZ4/Configuration_adv.h | 65 +++--- .../examples/Anet/A6/Configuration_adv.h | 65 +++--- .../examples/Anet/A8/Configuration_adv.h | 65 +++--- .../examples/Azteeg/X5GT/Configuration_adv.h | 65 +++--- .../examples/BIBO/TouchX/Configuration_adv.h | 65 +++--- .../examples/BQ/Hephestos/Configuration_adv.h | 65 +++--- .../BQ/Hephestos_2/Configuration_adv.h | 65 +++--- .../examples/BQ/WITBOX/Configuration_adv.h | 65 +++--- .../examples/Cartesio/Configuration_adv.h | 65 +++--- .../Creality/CR-10/Configuration_adv.h | 65 +++--- .../Creality/CR-10S/Configuration_adv.h | 65 +++--- .../Creality/CR-10mini/Configuration_adv.h | 65 +++--- .../Creality/Ender-2/Configuration_adv.h | 65 +++--- .../Creality/Ender-4/Configuration_adv.h | 65 +++--- .../config/examples/Felix/Configuration_adv.h | 65 +++--- .../FolgerTech/i3-2020/Configuration_adv.h | 65 +++--- .../Infitary/i3-M508/Configuration_adv.h | 65 +++--- .../examples/JGAurora/A5/Configuration_adv.h | 65 +++--- .../examples/MakerParts/Configuration_adv.h | 65 +++--- .../examples/Malyan/M150/Configuration_adv.h | 65 +++--- .../examples/Malyan/M200/Configuration_adv.h | 65 +++--- .../Micromake/C1/enhanced/Configuration_adv.h | 65 +++--- .../examples/Mks/Sbase/Configuration_adv.h | 65 +++--- .../examples/RigidBot/Configuration_adv.h | 65 +++--- .../config/examples/SCARA/Configuration_adv.h | 65 +++--- .../examples/Sanguinololu/Configuration_adv.h | 65 +++--- .../examples/TheBorg/Configuration_adv.h | 64 +++--- .../examples/TinyBoy2/Configuration_adv.h | 65 +++--- .../UltiMachine/Archim2/Configuration_adv.h | 65 +++--- .../Velleman/K8200/Configuration_adv.h | 65 +++--- .../Velleman/K8400/Configuration_adv.h | 65 +++--- .../Wanhao/Duplicator 6/Configuration_adv.h | 65 +++--- .../FLSUN/auto_calibrate/Configuration_adv.h | 65 +++--- .../delta/FLSUN/kossel/Configuration_adv.h | 65 +++--- .../FLSUN/kossel_mini/Configuration_adv.h | 65 +++--- .../delta/generic/Configuration_adv.h | 65 +++--- .../delta/kossel_mini/Configuration_adv.h | 65 +++--- .../delta/kossel_pro/Configuration_adv.h | 65 +++--- .../delta/kossel_xl/Configuration_adv.h | 65 +++--- .../gCreate/gMax1.5+/Configuration_adv.h | 65 +++--- .../examples/makibox/Configuration_adv.h | 65 +++--- .../tvrrug/Round2/Configuration_adv.h | 65 +++--- .../config/examples/wt150/Configuration_adv.h | 65 +++--- Marlin/src/inc/SanityCheck.h | 202 ++++++++++++++++-- Marlin/src/module/stepper.cpp | 4 +- Marlin/src/module/stepper_indirection.cpp | 51 +++-- Marlin/src/module/stepper_indirection.h | 26 +-- 49 files changed, 1578 insertions(+), 1629 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 0d68d23bb1..be73997b44 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -944,21 +944,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1006,7 +1004,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1020,6 +1018,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1032,22 +1043,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1059,10 +1055,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/default/Configuration_adv.h b/Marlin/src/config/default/Configuration_adv.h index 69c6aebf1a..fc916fb1c7 100644 --- a/Marlin/src/config/default/Configuration_adv.h +++ b/Marlin/src/config/default/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h index 037e79a115..df404bc963 100644 --- a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h +++ b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/Anet/A6/Configuration_adv.h b/Marlin/src/config/examples/Anet/A6/Configuration_adv.h index 1bbe28907d..c806397501 100644 --- a/Marlin/src/config/examples/Anet/A6/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A6/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/Anet/A8/Configuration_adv.h b/Marlin/src/config/examples/Anet/A8/Configuration_adv.h index ccaa19a2bd..fd623e2ade 100644 --- a/Marlin/src/config/examples/Anet/A8/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A8/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h b/Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h index 69c6aebf1a..fc916fb1c7 100644 --- a/Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h +++ b/Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/BIBO/TouchX/Configuration_adv.h b/Marlin/src/config/examples/BIBO/TouchX/Configuration_adv.h index 26638d26ac..77d3a66cd4 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/Configuration_adv.h +++ b/Marlin/src/config/examples/BIBO/TouchX/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h b/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h index 1e1aca3170..8f1739340e 100644 --- a/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h index 2fdc0ee922..cf2fb10678 100644 --- a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h b/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h index 1e1aca3170..8f1739340e 100644 --- a/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/Cartesio/Configuration_adv.h b/Marlin/src/config/examples/Cartesio/Configuration_adv.h index 8443ad73c0..79664de969 100644 --- a/Marlin/src/config/examples/Cartesio/Configuration_adv.h +++ b/Marlin/src/config/examples/Cartesio/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h index 580358af4e..c977a25722 100755 --- a/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h index 78d0f6f783..a25f178edd 100644 --- a/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h index e720a4e8e1..35281cb8bb 100644 --- a/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h index 1cee8e4959..1f1d098412 100644 --- a/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h index 7705665b6c..3210efca30 100644 --- a/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/Felix/Configuration_adv.h b/Marlin/src/config/examples/Felix/Configuration_adv.h index 379d329141..64b086cdfe 100644 --- a/Marlin/src/config/examples/Felix/Configuration_adv.h +++ b/Marlin/src/config/examples/Felix/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h index 6bab0bd284..a0c2ee1dc0 100644 --- a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h +++ b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h b/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h index 18906856e6..7cca4c5744 100644 --- a/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h +++ b/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h b/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h index ae287b5de8..50050f644a 100644 --- a/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h +++ b/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/MakerParts/Configuration_adv.h b/Marlin/src/config/examples/MakerParts/Configuration_adv.h index e87612d508..a38e1f637e 100644 --- a/Marlin/src/config/examples/MakerParts/Configuration_adv.h +++ b/Marlin/src/config/examples/MakerParts/Configuration_adv.h @@ -944,21 +944,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1006,7 +1004,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1020,6 +1018,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1032,22 +1043,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1059,10 +1055,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h b/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h index b914832d45..d5903291d7 100644 --- a/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h +++ b/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h b/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h index 0c3157fb3a..e5cd9d704e 100644 --- a/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h +++ b/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h index f1085cee4e..76b031dc98 100644 --- a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h +++ b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h b/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h index 825c97c08f..7a730989cb 100644 --- a/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h +++ b/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h @@ -951,21 +951,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1013,7 +1011,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1027,6 +1025,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1039,22 +1050,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1066,10 +1062,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/RigidBot/Configuration_adv.h b/Marlin/src/config/examples/RigidBot/Configuration_adv.h index b20896babc..9327bd8452 100644 --- a/Marlin/src/config/examples/RigidBot/Configuration_adv.h +++ b/Marlin/src/config/examples/RigidBot/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/SCARA/Configuration_adv.h b/Marlin/src/config/examples/SCARA/Configuration_adv.h index 048d763b74..477125f2c5 100644 --- a/Marlin/src/config/examples/SCARA/Configuration_adv.h +++ b/Marlin/src/config/examples/SCARA/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h b/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h index b5295736e5..1c3d171ba6 100644 --- a/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h +++ b/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/TheBorg/Configuration_adv.h b/Marlin/src/config/examples/TheBorg/Configuration_adv.h index 30eacb6a83..f6ba57adb1 100644 --- a/Marlin/src/config/examples/TheBorg/Configuration_adv.h +++ b/Marlin/src/config/examples/TheBorg/Configuration_adv.h @@ -943,21 +943,20 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -#define HAVE_TMCDRIVER +#define HAVE_TMC26X -#if ENABLED(HAVE_TMCDRIVER) - - #define X_IS_TMC - //#define X2_IS_TMC - #define Y_IS_TMC - //#define Y2_IS_TMC - #define Z_IS_TMC - #define Z2_IS_TMC - #define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + #define X_IS_TMC26X + //#define X2_IS_TMC26X + #define Y_IS_TMC26X + //#define Y2_IS_TMC26X + #define Z_IS_TMC26X + #define Z2_IS_TMC26X + #define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1200 // in mA #define X_SENSE_RESISTOR 50 // in mOhms @@ -1005,7 +1004,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1018,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1043,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1055,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h b/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h index d469fb554a..a929a5d8f0 100644 --- a/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h +++ b/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h index 23a56e1168..547383ef87 100644 --- a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h +++ b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h b/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h index 7827878f8f..1c995d619b 100644 --- a/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h +++ b/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h @@ -956,21 +956,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1018,7 +1016,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1032,6 +1030,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1044,22 +1055,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1071,10 +1067,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h b/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h index 7839386b92..3eba569efa 100644 --- a/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h +++ b/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h index 8731e36084..50f293796f 100644 --- a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h +++ b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h @@ -945,21 +945,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1007,7 +1005,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1021,6 +1019,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1033,22 +1044,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1060,10 +1056,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h index 0739e74a96..232ff922b2 100644 --- a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h @@ -945,21 +945,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1007,7 +1005,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1021,6 +1019,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1033,22 +1044,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1060,10 +1056,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h index 0739e74a96..232ff922b2 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h @@ -945,21 +945,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1007,7 +1005,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1021,6 +1019,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1033,22 +1044,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1060,10 +1056,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h index 8c812edfbc..9464493ca5 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h @@ -945,21 +945,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1007,7 +1005,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1021,6 +1019,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1033,22 +1044,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1060,10 +1056,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/delta/generic/Configuration_adv.h b/Marlin/src/config/examples/delta/generic/Configuration_adv.h index 8c812edfbc..9464493ca5 100644 --- a/Marlin/src/config/examples/delta/generic/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/generic/Configuration_adv.h @@ -945,21 +945,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1007,7 +1005,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1021,6 +1019,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1033,22 +1044,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1060,10 +1056,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h b/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h index 8c812edfbc..9464493ca5 100644 --- a/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h @@ -945,21 +945,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1007,7 +1005,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1021,6 +1019,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1033,22 +1044,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1060,10 +1056,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h b/Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h index ac881887cc..753f2d5fcf 100644 --- a/Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h @@ -950,21 +950,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1012,7 +1010,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1026,6 +1024,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1038,22 +1049,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1065,10 +1061,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h b/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h index 0a18a8dd80..bfbecb9cc1 100644 --- a/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h @@ -945,21 +945,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1007,7 +1005,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1021,6 +1019,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1033,22 +1044,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1060,10 +1056,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h index a47c2d58e0..408f8b5c32 100644 --- a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h +++ b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/makibox/Configuration_adv.h b/Marlin/src/config/examples/makibox/Configuration_adv.h index 747ea64ebf..dafbc07cc8 100644 --- a/Marlin/src/config/examples/makibox/Configuration_adv.h +++ b/Marlin/src/config/examples/makibox/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h b/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h index 99db494930..8c0349f8be 100644 --- a/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h @@ -943,21 +943,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1005,7 +1003,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1019,6 +1017,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1031,22 +1042,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1058,10 +1054,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/config/examples/wt150/Configuration_adv.h b/Marlin/src/config/examples/wt150/Configuration_adv.h index 1539575709..31ef272d01 100644 --- a/Marlin/src/config/examples/wt150/Configuration_adv.h +++ b/Marlin/src/config/examples/wt150/Configuration_adv.h @@ -944,21 +944,19 @@ * You will need to import the TMC26XStepper library into the Arduino IDE for this * (https://github.com/trinamic/TMC26XStepper.git) */ -//#define HAVE_TMCDRIVER - -#if ENABLED(HAVE_TMCDRIVER) - - //#define X_IS_TMC - //#define X2_IS_TMC - //#define Y_IS_TMC - //#define Y2_IS_TMC - //#define Z_IS_TMC - //#define Z2_IS_TMC - //#define E0_IS_TMC - //#define E1_IS_TMC - //#define E2_IS_TMC - //#define E3_IS_TMC - //#define E4_IS_TMC +//#define HAVE_TMC26X +#if ENABLED(HAVE_TMC26X) // Choose your axes here. This is mandatory! + //#define X_IS_TMC26X + //#define X2_IS_TMC26X + //#define Y_IS_TMC26X + //#define Y2_IS_TMC26X + //#define Z_IS_TMC26X + //#define Z2_IS_TMC26X + //#define E0_IS_TMC26X + //#define E1_IS_TMC26X + //#define E2_IS_TMC26X + //#define E3_IS_TMC26X + //#define E4_IS_TMC26X #define X_MAX_CURRENT 1000 // in mA #define X_SENSE_RESISTOR 91 // in mOhms @@ -1006,7 +1004,7 @@ #endif -// @section TMC2130, TMC2208 +// @section tmc_smart /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. @@ -1020,6 +1018,19 @@ * You may also use software SPI if you wish to use general purpose IO pins. */ //#define HAVE_TMC2130 +#if ENABLED(HAVE_TMC2130) // Choose your axes here. This is mandatory! + //#define X_IS_TMC2130 + //#define X2_IS_TMC2130 + //#define Y_IS_TMC2130 + //#define Y2_IS_TMC2130 + //#define Z_IS_TMC2130 + //#define Z2_IS_TMC2130 + //#define E0_IS_TMC2130 + //#define E1_IS_TMC2130 + //#define E2_IS_TMC2130 + //#define E3_IS_TMC2130 + //#define E4_IS_TMC2130 +#endif /** * Enable this for SilentStepStick Trinamic TMC2208 UART-configurable stepper drivers. @@ -1032,22 +1043,7 @@ * (https://github.com/teemuatlut/TMC2208Stepper). */ //#define HAVE_TMC2208 - -#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) - - // CHOOSE YOUR MOTORS HERE, THIS IS MANDATORY - //#define X_IS_TMC2130 - //#define X2_IS_TMC2130 - //#define Y_IS_TMC2130 - //#define Y2_IS_TMC2130 - //#define Z_IS_TMC2130 - //#define Z2_IS_TMC2130 - //#define E0_IS_TMC2130 - //#define E1_IS_TMC2130 - //#define E2_IS_TMC2130 - //#define E3_IS_TMC2130 - //#define E4_IS_TMC2130 - +#if ENABLED(HAVE_TMC2208) // Choose your axes here. This is mandatory! //#define X_IS_TMC2208 //#define X2_IS_TMC2208 //#define Y_IS_TMC2208 @@ -1059,10 +1055,9 @@ //#define E2_IS_TMC2208 //#define E3_IS_TMC2208 //#define E4_IS_TMC2208 +#endif - /** - * Stepper driver settings - */ +#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208) #define R_SENSE 0.11 // R_sense resistor for SilentStepStick2130 #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index 9e29e361ae..8524ec74bf 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -247,6 +247,11 @@ #error "LCD_I2C_SAINSMART_YWROBOT is now LCD_SAINSMART_I2C_(1602|2004). Please update your configuration." #elif defined(MEASURED_LOWER_LIMIT) || defined(MEASURED_UPPER_LIMIT) #error "MEASURED_(UPPER|LOWER)_LIMIT is now FILWIDTH_ERROR_MARGIN. Please update your configuration." +#elif defined(HAVE_TMCDRIVER) + #error "HAVE_TMCDRIVER is now HAVE_TMC26X. Please update your Configuration_adv.h." +#elif defined(X_IS_TMC) || defined(X2_IS_TMC) || defined(Y_IS_TMC) || defined(Y2_IS_TMC) || defined(Z_IS_TMC) || defined(Z2_IS_TMC) \ + || defined(E0_IS_TMC) || defined(E1_IS_TMC) || defined(E2_IS_TMC) || defined(E3_IS_TMC) || defined(E4_IS_TMC) + #error "[AXIS]_IS_TMC is now [AXIS]_IS_TMC26X. Please update your Configuration_adv.h." #elif defined(AUTOMATIC_CURRENT_CONTROL) #error "AUTOMATIC_CURRENT_CONTROL is now MONITOR_DRIVER_STATUS. Please update your configuration." #endif @@ -1497,22 +1502,22 @@ static_assert(1 >= 0 ); /** - * Make sure HAVE_TMCDRIVER is warranted + * Make sure HAVE_TMC26X is warranted */ -#if ENABLED(HAVE_TMCDRIVER) && !( \ - ENABLED( X_IS_TMC ) \ - || ENABLED( X2_IS_TMC ) \ - || ENABLED( Y_IS_TMC ) \ - || ENABLED( Y2_IS_TMC ) \ - || ENABLED( Z_IS_TMC ) \ - || ENABLED( Z2_IS_TMC ) \ - || ENABLED( E0_IS_TMC ) \ - || ENABLED( E1_IS_TMC ) \ - || ENABLED( E2_IS_TMC ) \ - || ENABLED( E3_IS_TMC ) \ - || ENABLED( E4_IS_TMC ) \ +#if ENABLED(HAVE_TMC26X) && !( \ + ENABLED( X_IS_TMC26X ) \ + || ENABLED( X2_IS_TMC26X ) \ + || ENABLED( Y_IS_TMC26X ) \ + || ENABLED( Y2_IS_TMC26X ) \ + || ENABLED( Z_IS_TMC26X ) \ + || ENABLED( Z2_IS_TMC26X ) \ + || ENABLED( E0_IS_TMC26X ) \ + || ENABLED( E1_IS_TMC26X ) \ + || ENABLED( E2_IS_TMC26X ) \ + || ENABLED( E3_IS_TMC26X ) \ + || ENABLED( E4_IS_TMC26X ) \ ) - #error "HAVE_TMCDRIVER requires at least one TMC stepper to be set." + #error "HAVE_TMC26X requires at least one TMC26X stepper to be set." #endif /** @@ -1626,6 +1631,175 @@ static_assert(1 >= 0 #error "HAVE_L6470DRIVER requires at least one L6470 stepper to be set." #endif +/** + * Check that each axis has only one driver selected + */ +static_assert(1 >= 0 + #if ENABLED(X_IS_TMC26X) + + 1 + #endif + #if ENABLED(X_IS_TMC2130) + + 1 + #endif + #if ENABLED(X_IS_TMC2208) + + 1 + #endif + #if ENABLED(X_IS_L6470) + + 1 + #endif + , "Please enable only one stepper driver for the X axis." +); +static_assert(1 >= 0 + #if ENABLED(X2_IS_TMC26X) + + 1 + #endif + #if ENABLED(X2_IS_TMC2130) + + 1 + #endif + #if ENABLED(X2_IS_TMC2208) + + 1 + #endif + #if ENABLED(X2_IS_L6470) + + 1 + #endif + , "Please enable only one stepper driver for the X2 axis." +); +static_assert(1 >= 0 + #if ENABLED(Y_IS_TMC26X) + + 1 + #endif + #if ENABLED(Y_IS_TMC2130) + + 1 + #endif + #if ENABLED(Y_IS_TMC2208) + + 1 + #endif + #if ENABLED(Y_IS_L6470) + + 1 + #endif + , "Please enable only one stepper driver for the Y axis." +); +static_assert(1 >= 0 + #if ENABLED(Y2_IS_TMC26X) + + 1 + #endif + #if ENABLED(Y2_IS_TMC2130) + + 1 + #endif + #if ENABLED(Y2_IS_TMC2208) + + 1 + #endif + #if ENABLED(Y2_IS_L6470) + + 1 + #endif + , "Please enable only one stepper driver for the Y2 axis." +); +static_assert(1 >= 0 + #if ENABLED(Z_IS_TMC26X) + + 1 + #endif + #if ENABLED(Z_IS_TMC2130) + + 1 + #endif + #if ENABLED(Z_IS_TMC2208) + + 1 + #endif + #if ENABLED(Z_IS_L6470) + + 1 + #endif + , "Please enable only one stepper driver for the Z axis." +); +static_assert(1 >= 0 + #if ENABLED(Z2_IS_TMC26X) + + 1 + #endif + #if ENABLED(Z2_IS_TMC2130) + + 1 + #endif + #if ENABLED(Z2_IS_TMC2208) + + 1 + #endif + #if ENABLED(Z2_IS_L6470) + + 1 + #endif + , "Please enable only one stepper driver for the Z2 axis." +); +static_assert(1 >= 0 + #if ENABLED(E0_IS_TMC26X) + + 1 + #endif + #if ENABLED(E0_IS_TMC2130) + + 1 + #endif + #if ENABLED(E0_IS_TMC2208) + + 1 + #endif + #if ENABLED(E0_IS_L6470) + + 1 + #endif + , "Please enable only one stepper driver for the E0 axis." +); +static_assert(1 >= 0 + #if ENABLED(E1_IS_TMC26X) + + 1 + #endif + #if ENABLED(E1_IS_TMC2130) + + 1 + #endif + #if ENABLED(E1_IS_TMC2208) + + 1 + #endif + #if ENABLED(E1_IS_L6470) + + 1 + #endif + , "Please enable only one stepper driver for the E1 axis." +); +static_assert(1 >= 0 + #if ENABLED(E2_IS_TMC26X) + + 1 + #endif + #if ENABLED(E2_IS_TMC2130) + + 1 + #endif + #if ENABLED(E2_IS_TMC2208) + + 1 + #endif + #if ENABLED(E2_IS_L6470) + + 1 + #endif + , "Please enable only one stepper driver for the E2 axis." +); +static_assert(1 >= 0 + #if ENABLED(E3_IS_TMC26X) + + 1 + #endif + #if ENABLED(E3_IS_TMC2130) + + 1 + #endif + #if ENABLED(E3_IS_TMC2208) + + 1 + #endif + #if ENABLED(E3_IS_L6470) + + 1 + #endif + , "Please enable only one stepper driver for the E3 axis." +); +static_assert(1 >= 0 + #if ENABLED(E4_IS_TMC26X) + + 1 + #endif + #if ENABLED(E4_IS_TMC2130) + + 1 + #endif + #if ENABLED(E4_IS_TMC2208) + + 1 + #endif + #if ENABLED(E4_IS_L6470) + + 1 + #endif + , "Please enable only one stepper driver for the E4 axis." +); + /** * Digipot requirement */ diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp index 30ae0f4f39..5cfabb5b11 100644 --- a/Marlin/src/module/stepper.cpp +++ b/Marlin/src/module/stepper.cpp @@ -922,8 +922,8 @@ void Stepper::init() { #endif // Init TMC Steppers - #if ENABLED(HAVE_TMCDRIVER) - tmc_init(); + #if ENABLED(HAVE_TMC26X) + tmc26x_init(); #endif // Init TMC2130 Steppers diff --git a/Marlin/src/module/stepper_indirection.cpp b/Marlin/src/module/stepper_indirection.cpp index f3f70b3863..7caa1fb938 100644 --- a/Marlin/src/module/stepper_indirection.cpp +++ b/Marlin/src/module/stepper_indirection.cpp @@ -38,8 +38,7 @@ // // TMC26X Driver objects and inits // -#if ENABLED(HAVE_TMCDRIVER) - +#if ENABLED(HAVE_TMC26X) #include #ifdef STM32F7 @@ -50,37 +49,37 @@ #define _TMC_DEFINE(ST) TMC26XStepper stepper##ST(200, ST##_ENABLE_PIN, ST##_STEP_PIN, ST##_DIR_PIN, ST##_MAX_CURRENT, ST##_SENSE_RESISTOR) - #if ENABLED(X_IS_TMC) + #if ENABLED(X_IS_TMC26X) _TMC_DEFINE(X); #endif - #if ENABLED(X2_IS_TMC) + #if ENABLED(X2_IS_TMC26X) _TMC_DEFINE(X2); #endif - #if ENABLED(Y_IS_TMC) + #if ENABLED(Y_IS_TMC26X) _TMC_DEFINE(Y); #endif - #if ENABLED(Y2_IS_TMC) + #if ENABLED(Y2_IS_TMC26X) _TMC_DEFINE(Y2); #endif - #if ENABLED(Z_IS_TMC) + #if ENABLED(Z_IS_TMC26X) _TMC_DEFINE(Z); #endif - #if ENABLED(Z2_IS_TMC) + #if ENABLED(Z2_IS_TMC26X) _TMC_DEFINE(Z2); #endif - #if ENABLED(E0_IS_TMC) + #if ENABLED(E0_IS_TMC26X) _TMC_DEFINE(E0); #endif - #if ENABLED(E1_IS_TMC) + #if ENABLED(E1_IS_TMC26X) _TMC_DEFINE(E1); #endif - #if ENABLED(E2_IS_TMC) + #if ENABLED(E2_IS_TMC26X) _TMC_DEFINE(E2); #endif - #if ENABLED(E3_IS_TMC) + #if ENABLED(E3_IS_TMC26X) _TMC_DEFINE(E3); #endif - #if ENABLED(E4_IS_TMC) + #if ENABLED(E4_IS_TMC26X) _TMC_DEFINE(E4); #endif @@ -89,43 +88,43 @@ stepper##A.start(); \ }while(0) - void tmc_init() { - #if ENABLED(X_IS_TMC) + void tmc26x_init() { + #if ENABLED(X_IS_TMC26X) _TMC_INIT(X); #endif - #if ENABLED(X2_IS_TMC) + #if ENABLED(X2_IS_TMC26X) _TMC_INIT(X2); #endif - #if ENABLED(Y_IS_TMC) + #if ENABLED(Y_IS_TMC26X) _TMC_INIT(Y); #endif - #if ENABLED(Y2_IS_TMC) + #if ENABLED(Y2_IS_TMC26X) _TMC_INIT(Y2); #endif - #if ENABLED(Z_IS_TMC) + #if ENABLED(Z_IS_TMC26X) _TMC_INIT(Z); #endif - #if ENABLED(Z2_IS_TMC) + #if ENABLED(Z2_IS_TMC26X) _TMC_INIT(Z2); #endif - #if ENABLED(E0_IS_TMC) + #if ENABLED(E0_IS_TMC26X) _TMC_INIT(E0); #endif - #if ENABLED(E1_IS_TMC) + #if ENABLED(E1_IS_TMC26X) _TMC_INIT(E1); #endif - #if ENABLED(E2_IS_TMC) + #if ENABLED(E2_IS_TMC26X) _TMC_INIT(E2); #endif - #if ENABLED(E3_IS_TMC) + #if ENABLED(E3_IS_TMC26X) _TMC_INIT(E3); #endif - #if ENABLED(E4_IS_TMC) + #if ENABLED(E4_IS_TMC26X) _TMC_INIT(E4); #endif } -#endif // HAVE_TMCDRIVER +#endif // HAVE_TMC26X // // TMC2130 Driver objects and inits diff --git a/Marlin/src/module/stepper_indirection.h b/Marlin/src/module/stepper_indirection.h index d42c515c85..6a4126e5b7 100644 --- a/Marlin/src/module/stepper_indirection.h +++ b/Marlin/src/module/stepper_indirection.h @@ -47,14 +47,14 @@ #include "../inc/MarlinConfig.h" // TMC26X drivers have STEP/DIR on normal pins, but ENABLE via SPI -#if ENABLED(HAVE_TMCDRIVER) +#if ENABLED(HAVE_TMC26X) #include #ifdef STM32F7 #include "../HAL/HAL_STM32F7/TMC2660.h" #else #include #endif - void tmc_init(); + void tmc26x_init(); #endif #if ENABLED(HAVE_TMC2130) @@ -85,7 +85,7 @@ #define X_DIR_WRITE(STATE) stepperX.Step_Clock(STATE) #define X_DIR_READ (stepperX.getStatus() & STATUS_DIR) #else - #if ENABLED(HAVE_TMCDRIVER) && ENABLED(X_IS_TMC) + #if ENABLED(X_IS_TMC26X) extern TMC26XStepper stepperX; #define X_ENABLE_INIT NOOP #define X_ENABLE_WRITE(STATE) stepperX.setEnabled(STATE) @@ -118,7 +118,7 @@ #define Y_DIR_WRITE(STATE) stepperY.Step_Clock(STATE) #define Y_DIR_READ (stepperY.getStatus() & STATUS_DIR) #else - #if ENABLED(HAVE_TMCDRIVER) && ENABLED(Y_IS_TMC) + #if ENABLED(Y_IS_TMC26X) extern TMC26XStepper stepperY; #define Y_ENABLE_INIT NOOP #define Y_ENABLE_WRITE(STATE) stepperY.setEnabled(STATE) @@ -151,7 +151,7 @@ #define Z_DIR_WRITE(STATE) stepperZ.Step_Clock(STATE) #define Z_DIR_READ (stepperZ.getStatus() & STATUS_DIR) #else - #if ENABLED(HAVE_TMCDRIVER) && ENABLED(Z_IS_TMC) + #if ENABLED(Z_IS_TMC26X) extern TMC26XStepper stepperZ; #define Z_ENABLE_INIT NOOP #define Z_ENABLE_WRITE(STATE) stepperZ.setEnabled(STATE) @@ -185,7 +185,7 @@ #define X2_DIR_WRITE(STATE) stepperX2.Step_Clock(STATE) #define X2_DIR_READ (stepperX2.getStatus() & STATUS_DIR) #else - #if ENABLED(HAVE_TMCDRIVER) && ENABLED(X2_IS_TMC) + #if ENABLED(X2_IS_TMC26X) extern TMC26XStepper stepperX2; #define X2_ENABLE_INIT NOOP #define X2_ENABLE_WRITE(STATE) stepperX2.setEnabled(STATE) @@ -220,7 +220,7 @@ #define Y2_DIR_WRITE(STATE) stepperY2.Step_Clock(STATE) #define Y2_DIR_READ (stepperY2.getStatus() & STATUS_DIR) #else - #if ENABLED(HAVE_TMCDRIVER) && ENABLED(Y2_IS_TMC) + #if ENABLED(Y2_IS_TMC26X) extern TMC26XStepper stepperY2; #define Y2_ENABLE_INIT NOOP #define Y2_ENABLE_WRITE(STATE) stepperY2.setEnabled(STATE) @@ -255,7 +255,7 @@ #define Z2_DIR_WRITE(STATE) stepperZ2.Step_Clock(STATE) #define Z2_DIR_READ (stepperZ2.getStatus() & STATUS_DIR) #else - #if ENABLED(HAVE_TMCDRIVER) && ENABLED(Z2_IS_TMC) + #if ENABLED(Z2_IS_TMC26X) extern TMC26XStepper stepperZ2; #define Z2_ENABLE_INIT NOOP #define Z2_ENABLE_WRITE(STATE) stepperZ2.setEnabled(STATE) @@ -289,7 +289,7 @@ #define E0_DIR_WRITE(STATE) stepperE0.Step_Clock(STATE) #define E0_DIR_READ (stepperE0.getStatus() & STATUS_DIR) #else - #if ENABLED(HAVE_TMCDRIVER) && ENABLED(E0_IS_TMC) + #if ENABLED(E0_IS_TMC26X) extern TMC26XStepper stepperE0; #define E0_ENABLE_INIT NOOP #define E0_ENABLE_WRITE(STATE) stepperE0.setEnabled(STATE) @@ -322,7 +322,7 @@ #define E1_DIR_WRITE(STATE) stepperE1.Step_Clock(STATE) #define E1_DIR_READ (stepperE1.getStatus() & STATUS_DIR) #else - #if ENABLED(HAVE_TMCDRIVER) && ENABLED(E1_IS_TMC) + #if ENABLED(E1_IS_TMC26X) extern TMC26XStepper stepperE1; #define E1_ENABLE_INIT NOOP #define E1_ENABLE_WRITE(STATE) stepperE1.setEnabled(STATE) @@ -355,7 +355,7 @@ #define E2_DIR_WRITE(STATE) stepperE2.Step_Clock(STATE) #define E2_DIR_READ (stepperE2.getStatus() & STATUS_DIR) #else - #if ENABLED(HAVE_TMCDRIVER) && ENABLED(E2_IS_TMC) + #if ENABLED(E2_IS_TMC26X) extern TMC26XStepper stepperE2; #define E2_ENABLE_INIT NOOP #define E2_ENABLE_WRITE(STATE) stepperE2.setEnabled(STATE) @@ -388,7 +388,7 @@ #define E3_DIR_WRITE(STATE) stepperE3.Step_Clock(STATE) #define E3_DIR_READ (stepperE3.getStatus() & STATUS_DIR) #else - #if ENABLED(HAVE_TMCDRIVER) && ENABLED(E3_IS_TMC) + #if ENABLED(E3_IS_TMC26X) extern TMC26XStepper stepperE3; #define E3_ENABLE_INIT NOOP #define E3_ENABLE_WRITE(STATE) stepperE3.setEnabled(STATE) @@ -421,7 +421,7 @@ #define E4_DIR_WRITE(STATE) stepperE4.Step_Clock(STATE) #define E4_DIR_READ (stepperE4.getStatus() & STATUS_DIR) #else - #if ENABLED(HAVE_TMCDRIVER) && ENABLED(E4_IS_TMC) + #if ENABLED(E4_IS_TMC26X) extern TMC26XStepper stepperE4; #define E4_ENABLE_INIT NOOP #define E4_ENABLE_WRITE(STATE) stepperE4.setEnabled(STATE)