From 41d78a2b6447e0391075da40689edf7ebc0c0a09 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 30 Jan 2024 19:38:57 -0600 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20TMC=5FSW=5F*=20=3D>=20TMC?= =?UTF-8?q?=5FSPI=5F*?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/Configuration_adv.h | 6 +++--- Marlin/src/HAL/DUE/inc/SanityCheck.h | 2 +- Marlin/src/HAL/LPC1768/inc/SanityCheck.h | 4 ++-- Marlin/src/inc/SanityCheck.h | 2 ++ Marlin/src/module/stepper/trinamic.cpp | 2 +- Marlin/src/pins/linux/pins_RAMPS_LINUX.h | 12 ++++++------ Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h | 12 ++++++------ Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h | 8 ++++---- Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h | 12 ++++++------ Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h | 12 ++++++------ Marlin/src/pins/lpc1768/pins_MKS_SBASE.h | 12 ++++++------ Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h | 12 ++++++------ Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h | 12 ++++++------ Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h | 12 ++++++------ Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h | 12 ++++++------ Marlin/src/pins/lpc1769/pins_FLY_CDY.h | 12 ++++++------ Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h | 12 ++++++------ Marlin/src/pins/pinsDebug_list.h | 12 ++++++------ Marlin/src/pins/ramps/pins_RAMPS.h | 12 ++++++------ Marlin/src/pins/ramps/pins_RAMPS_S_12.h | 12 ++++++------ Marlin/src/pins/ramps/pins_TT_OSCAR.h | 12 ++++++------ Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h | 12 ++++++------ Marlin/src/pins/sam/pins_ARCHIM2.h | 12 ++++++------ Marlin/src/pins/samd/pins_RAMPS_144.h | 12 ++++++------ Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h | 12 ++++++------ Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h | 12 ++++++------ Marlin/src/pins/stm32f1/pins_FLY_MINI.h | 12 ++++++------ Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D.h | 12 ++++++------ Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D_V1_1.h | 12 ++++++------ Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h | 12 ++++++------ Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h | 12 ++++++------ Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h | 12 ++++++------ Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h | 12 ++++++------ Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h | 12 ++++++------ Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h | 12 ++++++------ Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h | 12 ++++++------ Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h | 12 ++++++------ Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h | 12 ++++++------ Marlin/src/pins/stm32f4/pins_FLYF407ZG.h | 12 ++++++------ Marlin/src/pins/stm32f4/pins_FYSETC_S6_V2_0.h | 12 ++++++------ Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h | 12 ++++++------ Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h | 12 ++++++------ Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h | 12 ++++++------ Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h | 12 ++++++------ Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h | 6 +++--- Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV3.h | 6 +++--- Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV4.h | 6 +++--- Marlin/src/pins/stm32f4/pins_RUMBA32_common.h | 12 ++++++------ Marlin/src/pins/stm32g0/pins_BTT_MANTA_E3_EZ_V1_0.h | 12 ++++++------ Marlin/src/pins/stm32g0/pins_BTT_MANTA_M4P_V2_1.h | 12 ++++++------ Marlin/src/pins/stm32g0/pins_BTT_MANTA_M5P_V1_0.h | 12 ++++++------ Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_common.h | 12 ++++++------ Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h | 12 ++++++------ Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX_common.h | 12 ++++++------ Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h | 12 ++++++------ 55 files changed, 298 insertions(+), 296 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 49dda7f43f..b6418f0db2 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -2963,9 +2963,9 @@ * but you can override or define them here. */ //#define TMC_USE_SW_SPI - //#define TMC_SW_MOSI -1 - //#define TMC_SW_MISO -1 - //#define TMC_SW_SCK -1 + //#define TMC_SPI_MOSI -1 + //#define TMC_SPI_MISO -1 + //#define TMC_SPI_SCK -1 // @section tmc/serial diff --git a/Marlin/src/HAL/DUE/inc/SanityCheck.h b/Marlin/src/HAL/DUE/inc/SanityCheck.h index 6ea40ae68f..a8f5de8298 100644 --- a/Marlin/src/HAL/DUE/inc/SanityCheck.h +++ b/Marlin/src/HAL/DUE/inc/SanityCheck.h @@ -68,7 +68,7 @@ * Usually the hardware SPI pins are only available to the LCD. This makes the DUE hard SPI used at the same time * as the TMC2130 soft SPI the most common setup. */ -#define _IS_HW_SPI(P) (defined(TMC_SW_##P) && (TMC_SW_##P == SD_MOSI_PIN || TMC_SW_##P == SD_MISO_PIN || TMC_SW_##P == SD_SCK_PIN)) +#define _IS_HW_SPI(P) (defined(TMC_SPI_##P) && (TMC_SPI_##P == SD_MOSI_PIN || TMC_SPI_##P == SD_MISO_PIN || TMC_SPI_##P == SD_SCK_PIN)) #if HAS_MEDIA && HAS_DRIVER(TMC2130) #if ENABLED(TMC_USE_SW_SPI) diff --git a/Marlin/src/HAL/LPC1768/inc/SanityCheck.h b/Marlin/src/HAL/LPC1768/inc/SanityCheck.h index 0d9c393743..f49bc34c92 100644 --- a/Marlin/src/HAL/LPC1768/inc/SanityCheck.h +++ b/Marlin/src/HAL/LPC1768/inc/SanityCheck.h @@ -99,7 +99,7 @@ static_assert(DISABLED(BAUD_RATE_GCODE), "BAUD_RATE_GCODE is not yet supported o #if USING_HW_SERIAL0 #define IS_TX0(P) (P == P0_02) #define IS_RX0(P) (P == P0_03) - #if IS_TX0(TMC_SW_MISO) || IS_RX0(TMC_SW_MOSI) + #if IS_TX0(TMC_SPI_MISO) || IS_RX0(TMC_SPI_MOSI) #error "Serial port pins (0) conflict with Trinamic SPI pins!" #elif HAS_PRUSA_MMU1 && (IS_TX0(E_MUX1_PIN) || IS_RX0(E_MUX0_PIN)) #error "Serial port pins (0) conflict with Multi-Material-Unit multiplexer pins!" @@ -115,7 +115,7 @@ static_assert(DISABLED(BAUD_RATE_GCODE), "BAUD_RATE_GCODE is not yet supported o #define IS_RX1(P) (P == P0_16) #define _IS_TX1_1 IS_TX1 #define _IS_RX1_1 IS_RX1 - #if IS_TX1(TMC_SW_SCK) + #if IS_TX1(TMC_SPI_SCK) #error "Serial port pins (1) conflict with other pins!" #elif HAS_ROTARY_ENCODER #if IS_TX1(BTN_EN2) || IS_RX1(BTN_EN1) diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index 387c009608..de15a9dabb 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -658,6 +658,8 @@ #error "EXTRA_LIN_ADVANCE_K is now ADVANCE_K_EXTRA." #elif defined(POLAR_SEGMENTS_PER_SECOND) || defined(DELTA_SEGMENTS_PER_SECOND) || defined(SCARA_SEGMENTS_PER_SECOND) || defined(TPARA_SEGMENTS_PER_SECOND) #error "(POLAR|DELTA|SCARA|TPARA)_SEGMENTS_PER_SECOND is now DEFAULT_SEGMENTS_PER_SECOND." +#elif defined(TMC_SW_MOSI) || defined(TMC_SW_MISO) || defined(TMC_SW_SCK) + #error "TMC_SW_(MOSI|MISO|SCK) is now TMC_SPI_(MOSI|MISO|SCK)." #endif // L64xx stepper drivers have been removed diff --git a/Marlin/src/module/stepper/trinamic.cpp b/Marlin/src/module/stepper/trinamic.cpp index 48ce020d3d..b4581777e4 100644 --- a/Marlin/src/module/stepper/trinamic.cpp +++ b/Marlin/src/module/stepper/trinamic.cpp @@ -46,7 +46,7 @@ enum StealthIndex : uint8_t { // AI = Axis Enum Index // SWHW = SW/SH UART selection #if ENABLED(TMC_USE_SW_SPI) - #define __TMC_SPI_DEFINE(IC, ST, L, AI) TMCMarlin stepper##ST(ST##_CS_PIN, float(ST##_RSENSE), TMC_SW_MOSI, TMC_SW_MISO, TMC_SW_SCK, ST##_CHAIN_POS) + #define __TMC_SPI_DEFINE(IC, ST, L, AI) TMCMarlin stepper##ST(ST##_CS_PIN, float(ST##_RSENSE), TMC_SPI_MOSI, TMC_SPI_MISO, TMC_SPI_SCK, ST##_CHAIN_POS) #else #define __TMC_SPI_DEFINE(IC, ST, L, AI) TMCMarlin stepper##ST(ST##_CS_PIN, float(ST##_RSENSE), ST##_CHAIN_POS) #endif diff --git a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h index 968840009e..1258f399e7 100644 --- a/Marlin/src/pins/linux/pins_RAMPS_LINUX.h +++ b/Marlin/src/pins/linux/pins_RAMPS_LINUX.h @@ -250,14 +250,14 @@ * Default pins for TMC software SPI */ #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI 66 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI 66 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO 44 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO 44 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK 64 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK 64 #endif #endif diff --git a/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h b/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h index 6e8d3cb2e9..7d843803d5 100644 --- a/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h +++ b/Marlin/src/pins/lpc1768/pins_BIQU_B300_V1.0.h @@ -76,14 +76,14 @@ // Software SPI pins for TMC2130 stepper drivers // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI P0_18 // ETH + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI P0_18 // ETH #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO P0_17 // ETH + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO P0_17 // ETH #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK P0_15 // ETH + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK P0_15 // ETH #endif #endif diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h index ecf606daf2..da262e087b 100644 --- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h +++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h @@ -167,12 +167,12 @@ // When using any TMC SPI-based drivers, software SPI is used // because pins may be shared with the display or SD card. #define TMC_USE_SW_SPI - #define TMC_SW_MOSI EXP2_06_PIN - #define TMC_SW_MISO EXP2_01_PIN + #define TMC_SPI_MOSI EXP2_06_PIN + #define TMC_SPI_MISO EXP2_01_PIN // To minimize pin usage use the same clock pin as the display/SD card reader. (May generate LCD noise.) - #define TMC_SW_SCK EXP2_02_PIN + #define TMC_SPI_SCK EXP2_02_PIN // If pin 2_06 is unused, it can be used for the clock to avoid the LCD noise. - //#define TMC_SW_SCK P2_06 + //#define TMC_SPI_SCK P2_06 #if ENABLED(SOFTWARE_DRIVER_ENABLE) diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h index 3567b77782..28fc9710b7 100644 --- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h +++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h @@ -142,14 +142,14 @@ // Software SPI pins for TMC2130 stepper drivers // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI P4_28 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI P4_28 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO P0_05 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO P0_05 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK P0_04 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK P0_04 #endif #endif diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h index cc8e8dc53b..99234884da 100644 --- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h +++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h @@ -199,14 +199,14 @@ // Software SPI pins for TMC2130 stepper drivers // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI P1_17 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI P1_17 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO P0_05 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO P0_05 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK P0_04 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK P0_04 #endif #endif diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h index 80b816b649..cc4674bc2f 100644 --- a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h +++ b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h @@ -303,14 +303,14 @@ // https://github.com/makerbase-mks/MKS-SBASE/issues/25 #define TMC_USE_SW_SPI #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI P0_03 // AUX1 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI P0_03 // AUX1 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO P0_02 // AUX1 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO P0_02 // AUX1 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK P0_26 // TH4 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK P0_26 // TH4 #endif #endif diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h index 0ce4d6e89d..db1d0d0513 100644 --- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h +++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h @@ -137,14 +137,14 @@ // Software SPI pins for TMC2130 stepper drivers // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI P4_28 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI P4_28 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO P0_05 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO P0_05 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK P0_04 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK P0_04 #endif #endif diff --git a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h index 0f1224dc8a..0985e0da10 100644 --- a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h +++ b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h @@ -102,14 +102,14 @@ // Software SPI pins for TMC2130 stepper drivers // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI P1_00 // ETH + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI P1_00 // ETH #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO P1_08 // ETH + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO P1_08 // ETH #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK P1_09 // ETH + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK P1_09 // ETH #endif #endif diff --git a/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h b/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h index 190147074d..c826d240c4 100644 --- a/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h +++ b/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h @@ -73,14 +73,14 @@ // Default pins for TMC software SPI // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI P1_16 // Ethernet Expansion - Pin 5 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI P1_16 // Ethernet Expansion - Pin 5 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO P1_17 // Ethernet Expansion - Pin 6 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO P1_17 // Ethernet Expansion - Pin 6 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK P1_08 // Ethernet Expansion - Pin 7 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK P1_08 // Ethernet Expansion - Pin 7 #endif #endif diff --git a/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h b/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h index dfcfea6d80..f164cfec28 100644 --- a/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h +++ b/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h @@ -90,14 +90,14 @@ // Default pins for TMC software SPI // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI P1_16 // Ethernet Expansion - Pin 5 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI P1_16 // Ethernet Expansion - Pin 5 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO P1_17 // Ethernet Expansion - Pin 6 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO P1_17 // Ethernet Expansion - Pin 6 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK P1_08 // Ethernet Expansion - Pin 7 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK P1_08 // Ethernet Expansion - Pin 7 #endif #endif diff --git a/Marlin/src/pins/lpc1769/pins_FLY_CDY.h b/Marlin/src/pins/lpc1769/pins_FLY_CDY.h index 6187432a4b..19ad7eda39 100644 --- a/Marlin/src/pins/lpc1769/pins_FLY_CDY.h +++ b/Marlin/src/pins/lpc1769/pins_FLY_CDY.h @@ -97,14 +97,14 @@ // Software SPI pins for TMC2130 stepper drivers // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI P0_20 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI P0_20 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO P0_19 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO P0_19 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK P0_21 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK P0_21 #endif #endif diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h index 61f90e1fad..fc57eb3b78 100644 --- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h +++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h @@ -151,14 +151,14 @@ // Software SPI pins for TMC2130 stepper drivers // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI P1_16 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI P1_16 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO P0_05 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO P0_05 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK P0_04 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK P0_04 #endif #endif diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h index 58be4c62c9..f877338589 100644 --- a/Marlin/src/pins/pinsDebug_list.h +++ b/Marlin/src/pins/pinsDebug_list.h @@ -489,14 +489,14 @@ REPORT_NAME_DIGITAL(__LINE__, EXP3_10_PIN) #endif -#if _EXISTS(TMC_SW_MISO) - REPORT_NAME_DIGITAL(__LINE__, TMC_SW_MISO) +#if _EXISTS(TMC_SPI_MISO) + REPORT_NAME_DIGITAL(__LINE__, TMC_SPI_MISO) #endif -#if _EXISTS(TMC_SW_MOSI) - REPORT_NAME_DIGITAL(__LINE__, TMC_SW_MOSI) +#if _EXISTS(TMC_SPI_MOSI) + REPORT_NAME_DIGITAL(__LINE__, TMC_SPI_MOSI) #endif -#if _EXISTS(TMC_SW_SCK) - REPORT_NAME_DIGITAL(__LINE__, TMC_SW_SCK) +#if _EXISTS(TMC_SPI_SCK) + REPORT_NAME_DIGITAL(__LINE__, TMC_SPI_SCK) #endif #if _EXISTS(TFTGLCD_CS) REPORT_NAME_DIGITAL(__LINE__, TFTGLCD_CS) diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h index d268bb73b7..9abade9c66 100644 --- a/Marlin/src/pins/ramps/pins_RAMPS.h +++ b/Marlin/src/pins/ramps/pins_RAMPS.h @@ -321,14 +321,14 @@ // TMC software SPI // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI 66 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI 66 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO 44 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO 44 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK 64 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK 64 #endif #endif diff --git a/Marlin/src/pins/ramps/pins_RAMPS_S_12.h b/Marlin/src/pins/ramps/pins_RAMPS_S_12.h index 4df184da2c..870c3bf133 100644 --- a/Marlin/src/pins/ramps/pins_RAMPS_S_12.h +++ b/Marlin/src/pins/ramps/pins_RAMPS_S_12.h @@ -220,14 +220,14 @@ // TMC software SPI // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI 51 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI 51 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO 50 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO 50 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK 53 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK 53 #endif #endif diff --git a/Marlin/src/pins/ramps/pins_TT_OSCAR.h b/Marlin/src/pins/ramps/pins_TT_OSCAR.h index 71bfb4912b..a4f1806c99 100644 --- a/Marlin/src/pins/ramps/pins_TT_OSCAR.h +++ b/Marlin/src/pins/ramps/pins_TT_OSCAR.h @@ -153,14 +153,14 @@ // Default pins for TMC software SPI // //#if ENABLED(TMC_USE_SW_SPI) -// #ifndef TMC_SW_MOSI -// #define TMC_SW_MOSI 66 +// #ifndef TMC_SPI_MOSI +// #define TMC_SPI_MOSI 66 // #endif -// #ifndef TMC_SW_MISO -// #define TMC_SW_MISO 44 +// #ifndef TMC_SPI_MISO +// #define TMC_SPI_MISO 44 // #endif -// #ifndef TMC_SW_SCK -// #define TMC_SW_SCK 64 +// #ifndef TMC_SPI_SCK +// #define TMC_SPI_SCK 64 // #endif //#endif diff --git a/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h b/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h index c52dab7849..e6d330a35d 100644 --- a/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h +++ b/Marlin/src/pins/ramps/pins_Z_BOLT_X_SERIES.h @@ -184,14 +184,14 @@ // TMC software SPI // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI 66 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI 66 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO 44 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO 44 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK 64 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK 64 #endif #endif diff --git a/Marlin/src/pins/sam/pins_ARCHIM2.h b/Marlin/src/pins/sam/pins_ARCHIM2.h index 24f10cdb0d..28b12d3437 100644 --- a/Marlin/src/pins/sam/pins_ARCHIM2.h +++ b/Marlin/src/pins/sam/pins_ARCHIM2.h @@ -149,14 +149,14 @@ // Required for the Archim2 board. // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI 28 // PD3 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI 28 // PD3 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO 26 // PD1 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO 26 // PD1 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK 27 // PD2 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK 27 // PD2 #endif #endif diff --git a/Marlin/src/pins/samd/pins_RAMPS_144.h b/Marlin/src/pins/samd/pins_RAMPS_144.h index 69b72a3236..453a3578c3 100644 --- a/Marlin/src/pins/samd/pins_RAMPS_144.h +++ b/Marlin/src/pins/samd/pins_RAMPS_144.h @@ -167,14 +167,14 @@ // TMC software SPI // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI 58 // Mega/Due:66 - AGCM4:58 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI 58 // Mega/Due:66 - AGCM4:58 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO 44 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO 44 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK 56 // Mega/Due:64 - AGCM4:56 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK 56 // Mega/Due:64 - AGCM4:56 #endif #endif diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h index fe2136d9e1..a6bc265bcc 100644 --- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h +++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h @@ -97,14 +97,14 @@ // Software SPI pins for TMC2130 stepper drivers // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI PB5 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI PB5 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO PB4 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO PB4 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK PB3 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK PB3 #endif #endif diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h index 73c31c967c..fb890a14cf 100644 --- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h +++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h @@ -69,14 +69,14 @@ #define E0_ENABLE_PIN PC4 #if ENABLED(TMC_USE_SW_SPI) // Shared with EXP2 - #ifndef TMC_SW_SCK - #define TMC_SW_SCK PB3 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK PB3 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO PB4 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO PB4 #endif - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI PB5 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI PB5 #endif #endif diff --git a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h index 4c5ef16c24..11074ef832 100644 --- a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h +++ b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h @@ -84,14 +84,14 @@ #endif #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI EXP2_06_PIN + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI EXP2_06_PIN #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO EXP2_01_PIN + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO EXP2_01_PIN #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK EXP2_02_PIN + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK EXP2_02_PIN #endif #endif diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D.h index 77c2b79215..51ea58ff33 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D.h @@ -53,14 +53,14 @@ // Software SPI pins for TMC2130 stepper drivers // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI PB15 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI PB15 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO PB14 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO PB14 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK PB13 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK PB13 #endif #endif diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D_V1_1.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D_V1_1.h index 2ad68a0140..df42e8aeb1 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D_V1_1.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D_V1_1.h @@ -53,14 +53,14 @@ // Software SPI pins for TMC2130 stepper drivers // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI PB15 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI PB15 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO PB14 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO PB14 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK PB13 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK PB13 #endif #endif diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h index d82ec6293b..078b327b65 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h @@ -115,14 +115,14 @@ // Software SPI pins for TMC2130 stepper drivers // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI PD14 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI PD14 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO PD1 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO PD1 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK PD0 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK PD0 #endif #endif diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h index bcbcea36fe..25b0291b7c 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h @@ -125,14 +125,14 @@ // Software SPI pins for TMC2130 stepper drivers // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI PD14 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI PD14 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO PD1 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO PD1 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK PD0 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK PD0 #endif #endif diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h index 0a5f50dec7..501a5c9f17 100644 --- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h +++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h @@ -108,14 +108,14 @@ // Software SPI pins for TMC2130 stepper drivers // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI PB15 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI PB15 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO PB14 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO PB14 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK PB13 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK PB13 #endif #endif diff --git a/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h b/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h index 226405c609..ccd4b1b171 100644 --- a/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h +++ b/Marlin/src/pins/stm32f1/pins_PANDA_PI_V29.h @@ -91,14 +91,14 @@ // Software SPI pins for TMC2130 stepper drivers // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI PB5 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI PB5 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO PB4 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO PB4 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK PB3 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK PB3 #endif #endif diff --git a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h index bb23a9e7b3..641130fae4 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h @@ -111,14 +111,14 @@ // Software SPI pins for TMC2130 stepper drivers // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI PB15 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI PB15 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO PB14 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO PB14 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK PB13 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK PB13 #endif #endif diff --git a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h index ef1c124599..9c47e72338 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h @@ -205,14 +205,14 @@ // Software SPI pins for TMC2130 stepper drivers // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI PG15 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI PG15 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO PB6 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO PB6 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK PB3 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK PB3 #endif #endif diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h index 25f0ff09e7..3f588cd15b 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h @@ -263,14 +263,14 @@ // Software SPI pins for TMC2130 stepper drivers // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI PA7 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI PA7 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO PA6 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO PA6 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK PA5 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK PA5 #endif #endif diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h index f13e7cc79e..85b1b06a3b 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h @@ -175,14 +175,14 @@ // Software SPI pins for TMC2130 stepper drivers // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI PC12 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI PC12 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO PC11 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO PC11 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK PC10 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK PC10 #endif #endif diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h index 61a388c181..be2baf17aa 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h @@ -275,14 +275,14 @@ // Software SPI pins for TMC2130 stepper drivers // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI PE14 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI PE14 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO PA14 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO PA14 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK PE15 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK PE15 #endif #endif diff --git a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h index 4e80e39ec4..4e5cd55162 100644 --- a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h +++ b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h @@ -238,14 +238,14 @@ // Trinamic Software SPI // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_SCK - #define TMC_SW_SCK EXP2_02_PIN + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK EXP2_02_PIN #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO EXP2_01_PIN + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO EXP2_01_PIN #endif - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI EXP2_06_PIN + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI EXP2_06_PIN #endif #endif diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6_V2_0.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6_V2_0.h index a9ce1383d8..78b6450fea 100644 --- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6_V2_0.h +++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6_V2_0.h @@ -57,14 +57,14 @@ // #define TMC_USE_SW_SPI #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI PE14 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI PE14 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO PE13 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO PE13 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK PE12 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK PE12 #endif #endif diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h b/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h index 009bfb248d..953aa37021 100644 --- a/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h +++ b/Marlin/src/pins/stm32f4/pins_FYSETC_SPIDER.h @@ -105,14 +105,14 @@ // #define TMC_USE_SW_SPI #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI PE14 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI PE14 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO PE13 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO PE13 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK PE12 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK PE12 #endif #endif diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h index a39275a5ca..2a81984cee 100644 --- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h +++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h @@ -133,14 +133,14 @@ #define TMC_USE_SW_SPI #endif #if ENABLED(TMC_USE_SW_SPI) - #if !defined(TMC_SW_MOSI) || TMC_SW_MOSI == -1 - #define TMC_SW_MOSI PE14 + #if !defined(TMC_SPI_MOSI) || TMC_SPI_MOSI == -1 + #define TMC_SPI_MOSI PE14 #endif - #if !defined(TMC_SW_MISO) || TMC_SW_MISO == -1 - #define TMC_SW_MISO PE13 + #if !defined(TMC_SPI_MISO) || TMC_SPI_MISO == -1 + #define TMC_SPI_MISO PE13 #endif - #if !defined(TMC_SW_SCK) || TMC_SW_SCK == -1 - #define TMC_SW_SCK PE12 + #if !defined(TMC_SPI_SCK) || TMC_SPI_SCK == -1 + #define TMC_SPI_SCK PE12 #endif #endif diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h index 32d8a47488..847e1f3052 100644 --- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h +++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h @@ -58,14 +58,14 @@ #define TMC_USE_SW_SPI #endif #if ENABLED(TMC_USE_SW_SPI) - #if !defined(TMC_SW_MOSI) || TMC_SW_MOSI == -1 - #define TMC_SW_MOSI PD14 + #if !defined(TMC_SPI_MOSI) || TMC_SPI_MOSI == -1 + #define TMC_SPI_MOSI PD14 #endif - #if !defined(TMC_SW_MISO) || TMC_SW_MISO == -1 - #define TMC_SW_MISO PD1 + #if !defined(TMC_SPI_MISO) || TMC_SPI_MISO == -1 + #define TMC_SPI_MISO PD1 #endif - #if !defined(TMC_SW_SCK) || TMC_SW_SCK == -1 - #define TMC_SW_SCK PD0 + #if !defined(TMC_SPI_SCK) || TMC_SPI_SCK == -1 + #define TMC_SPI_SCK PD0 #endif #endif diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h index 3f33cbe847..3f51b98922 100644 --- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h +++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h @@ -116,14 +116,14 @@ // Software SPI pins for TMC2130 stepper drivers // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI PD14 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI PD14 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO PD1 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO PD1 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK PD0 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK PD0 #endif #endif diff --git a/Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h b/Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h index ea6efa7c47..2074bbbbfa 100644 --- a/Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h +++ b/Marlin/src/pins/stm32f4/pins_MKS_SKIPR_V1_0.h @@ -196,9 +196,9 @@ // #if HAS_TMC_SPI #define TMC_USE_SW_SPI - #define TMC_SW_MOSI PE14 - #define TMC_SW_MISO PE13 - #define TMC_SW_SCK PE12 + #define TMC_SPI_MOSI PE14 + #define TMC_SPI_MISO PE13 + #define TMC_SPI_SCK PE12 #endif // diff --git a/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV3.h b/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV3.h index f6e71344a3..eb6edb765e 100644 --- a/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV3.h +++ b/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV3.h @@ -171,9 +171,9 @@ #define MOSI_PIN PB5 #define SCK_PIN PB3 -#define TMC_SW_MISO MISO_PIN -#define TMC_SW_MOSI MOSI_PIN -#define TMC_SW_SCK SCK_PIN +#define TMC_SPI_MISO MISO_PIN +#define TMC_SPI_MOSI MOSI_PIN +#define TMC_SPI_SCK SCK_PIN // // I2C diff --git a/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV4.h b/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV4.h index 863874d282..b44061a491 100644 --- a/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV4.h +++ b/Marlin/src/pins/stm32f4/pins_OPULO_LUMEN_REV4.h @@ -168,9 +168,9 @@ #define MOSI_PIN PB5 #define SCK_PIN PB3 -#define TMC_SW_MISO MISO_PIN -#define TMC_SW_MOSI MOSI_PIN -#define TMC_SW_SCK SCK_PIN +#define TMC_SPI_MISO MISO_PIN +#define TMC_SPI_MOSI MOSI_PIN +#define TMC_SPI_SCK SCK_PIN // // I2C diff --git a/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h index 7d0e8ce8cb..7c6aca6bb6 100644 --- a/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h +++ b/Marlin/src/pins/stm32f4/pins_RUMBA32_common.h @@ -92,14 +92,14 @@ #define E2_CS_PIN PD1 #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI PA7 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI PA7 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO PA6 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO PA6 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK PA5 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK PA5 #endif #endif diff --git a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_E3_EZ_V1_0.h b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_E3_EZ_V1_0.h index 8de44674d0..50fa0814b9 100644 --- a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_E3_EZ_V1_0.h +++ b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_E3_EZ_V1_0.h @@ -146,14 +146,14 @@ // Software SPI pins for TMC2130 stepper drivers // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI PC12 // Shared with SPI header, Pin 5 (SPI3) + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI PC12 // Shared with SPI header, Pin 5 (SPI3) #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO PC11 // Shared with SPI header, Pin 6 (SPI3) + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO PC11 // Shared with SPI header, Pin 6 (SPI3) #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK PC10 // Shared with SPI header, Pin 4 (SPI3) + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK PC10 // Shared with SPI header, Pin 4 (SPI3) #endif #endif diff --git a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M4P_V2_1.h b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M4P_V2_1.h index 586c78aaf0..be5a4752d8 100644 --- a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M4P_V2_1.h +++ b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M4P_V2_1.h @@ -115,14 +115,14 @@ // Software SPI pins for TMC2130 stepper drivers // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI PB15 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI PB15 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO PB14 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO PB14 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK PB13 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK PB13 #endif #endif diff --git a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M5P_V1_0.h b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M5P_V1_0.h index a9ba14afbf..c770304478 100644 --- a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M5P_V1_0.h +++ b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M5P_V1_0.h @@ -132,14 +132,14 @@ // Software SPI pins for TMC2130 stepper drivers // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI PB15 // Shared with SPI header, Pin 5 (SPI2) + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI PB15 // Shared with SPI header, Pin 5 (SPI2) #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO PB14 // Shared with SPI header, Pin 6 (SPI2) + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO PB14 // Shared with SPI header, Pin 6 (SPI2) #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK PB13 // Shared with SPI header, Pin 4 (SPI2) + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK PB13 // Shared with SPI header, Pin 4 (SPI2) #endif #endif diff --git a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_common.h b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_common.h index d706188892..b13c12e393 100644 --- a/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_common.h +++ b/Marlin/src/pins/stm32g0/pins_BTT_MANTA_M8P_common.h @@ -182,14 +182,14 @@ // Software SPI pins for TMC2130 stepper drivers // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI PA7 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI PA7 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO PA6 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO PA6 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK PA5 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK PA5 #endif #endif diff --git a/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h b/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h index c69914abee..1ae990a0c0 100644 --- a/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h +++ b/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_MAX_EZ.h @@ -276,14 +276,14 @@ // Software SPI pins for TMC2130 stepper drivers // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI PE14 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI PE14 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO PE13 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO PE13 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK PE12 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK PE12 #endif #endif diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX_common.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX_common.h index d579a71864..9915841514 100644 --- a/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX_common.h +++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_SE_BX_common.h @@ -94,14 +94,14 @@ // Software SPI pins for TMC2130 stepper drivers // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI PC6 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI PC6 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO PG3 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO PG3 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK PC7 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK PC7 #endif #endif diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h index afdbea5b5c..413b2db8c8 100644 --- a/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h +++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h @@ -263,14 +263,14 @@ // Software SPI pins for TMC2130 stepper drivers // #if ENABLED(TMC_USE_SW_SPI) - #ifndef TMC_SW_MOSI - #define TMC_SW_MOSI PE13 + #ifndef TMC_SPI_MOSI + #define TMC_SPI_MOSI PE13 #endif - #ifndef TMC_SW_MISO - #define TMC_SW_MISO PE15 + #ifndef TMC_SPI_MISO + #define TMC_SPI_MISO PE15 #endif - #ifndef TMC_SW_SCK - #define TMC_SW_SCK PE14 + #ifndef TMC_SPI_SCK + #define TMC_SPI_SCK PE14 #endif #endif