From 80e569015bcd97cb9da43e4cecf20f0d0a8bd5f6 Mon Sep 17 00:00:00 2001
From: ellensp <530024+ellensp@users.noreply.github.com>
Date: Tue, 22 Feb 2022 16:16:57 +1300
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20TMC26X=20CS=20pins=20init?=
=?UTF-8?q?=20(#23778)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Marlin/src/MarlinCore.cpp | 2 +-
Marlin/src/core/drivers.h | 2 +-
Marlin/src/feature/tmc_util.cpp | 126 ++++++++++++++++----------------
Marlin/src/feature/tmc_util.h | 4 +-
ini/features.ini | 3 +-
5 files changed, 69 insertions(+), 68 deletions(-)
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 482ad95cac5..81dc7db4cc9 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -145,7 +145,7 @@
#include "feature/encoder_i2c.h"
#endif
-#if HAS_TRINAMIC_CONFIG && DISABLED(PSU_DEFAULT_OFF)
+#if (HAS_TRINAMIC_CONFIG || HAS_TMC_SPI) && DISABLED(PSU_DEFAULT_OFF)
#include "feature/tmc_util.h"
#endif
diff --git a/Marlin/src/core/drivers.h b/Marlin/src/core/drivers.h
index 0a76410274b..2e66cc92011 100644
--- a/Marlin/src/core/drivers.h
+++ b/Marlin/src/core/drivers.h
@@ -128,7 +128,7 @@
// Test for a driver that uses SPI - this allows checking whether a _CS_ pin
// is considered sensitive
#define AXIS_HAS_SPI(A) ( AXIS_DRIVER_TYPE(A,TMC2130) || AXIS_DRIVER_TYPE(A,TMC2160) \
- || AXIS_DRIVER_TYPE(A,TMC2660) \
+ || AXIS_DRIVER_TYPE(A,TMC26X) || AXIS_DRIVER_TYPE(A,TMC2660) \
|| AXIS_DRIVER_TYPE(A,TMC5130) || AXIS_DRIVER_TYPE(A,TMC5160) )
#define AXIS_HAS_UART(A) ( AXIS_DRIVER_TYPE(A,TMC2208) || AXIS_DRIVER_TYPE(A,TMC2209) )
diff --git a/Marlin/src/feature/tmc_util.cpp b/Marlin/src/feature/tmc_util.cpp
index cf3fa3b7b0b..c69772bebca 100644
--- a/Marlin/src/feature/tmc_util.cpp
+++ b/Marlin/src/feature/tmc_util.cpp
@@ -1178,69 +1178,6 @@
#endif // USE_SENSORLESS
-#if HAS_TMC_SPI
- #define SET_CS_PIN(st) OUT_WRITE(st##_CS_PIN, HIGH)
- void tmc_init_cs_pins() {
- #if AXIS_HAS_SPI(X)
- SET_CS_PIN(X);
- #endif
- #if AXIS_HAS_SPI(Y)
- SET_CS_PIN(Y);
- #endif
- #if AXIS_HAS_SPI(Z)
- SET_CS_PIN(Z);
- #endif
- #if AXIS_HAS_SPI(X2)
- SET_CS_PIN(X2);
- #endif
- #if AXIS_HAS_SPI(Y2)
- SET_CS_PIN(Y2);
- #endif
- #if AXIS_HAS_SPI(Z2)
- SET_CS_PIN(Z2);
- #endif
- #if AXIS_HAS_SPI(Z3)
- SET_CS_PIN(Z3);
- #endif
- #if AXIS_HAS_SPI(Z4)
- SET_CS_PIN(Z4);
- #endif
- #if AXIS_HAS_SPI(I)
- SET_CS_PIN(I);
- #endif
- #if AXIS_HAS_SPI(J)
- SET_CS_PIN(J);
- #endif
- #if AXIS_HAS_SPI(K)
- SET_CS_PIN(K);
- #endif
- #if AXIS_HAS_SPI(E0)
- SET_CS_PIN(E0);
- #endif
- #if AXIS_HAS_SPI(E1)
- SET_CS_PIN(E1);
- #endif
- #if AXIS_HAS_SPI(E2)
- SET_CS_PIN(E2);
- #endif
- #if AXIS_HAS_SPI(E3)
- SET_CS_PIN(E3);
- #endif
- #if AXIS_HAS_SPI(E4)
- SET_CS_PIN(E4);
- #endif
- #if AXIS_HAS_SPI(E5)
- SET_CS_PIN(E5);
- #endif
- #if AXIS_HAS_SPI(E6)
- SET_CS_PIN(E6);
- #endif
- #if AXIS_HAS_SPI(E7)
- SET_CS_PIN(E7);
- #endif
- }
-#endif // HAS_TMC_SPI
-
template<typename TMC>
static bool test_connection(TMC &st) {
SERIAL_ECHOPGM("Testing ");
@@ -1339,3 +1276,66 @@ void test_tmc_connection(LOGICAL_AXIS_ARGS(const bool)) {
}
#endif // HAS_TRINAMIC_CONFIG
+
+#if HAS_TMC_SPI
+ #define SET_CS_PIN(st) OUT_WRITE(st##_CS_PIN, HIGH)
+ void tmc_init_cs_pins() {
+ #if AXIS_HAS_SPI(X)
+ SET_CS_PIN(X);
+ #endif
+ #if AXIS_HAS_SPI(Y)
+ SET_CS_PIN(Y);
+ #endif
+ #if AXIS_HAS_SPI(Z)
+ SET_CS_PIN(Z);
+ #endif
+ #if AXIS_HAS_SPI(X2)
+ SET_CS_PIN(X2);
+ #endif
+ #if AXIS_HAS_SPI(Y2)
+ SET_CS_PIN(Y2);
+ #endif
+ #if AXIS_HAS_SPI(Z2)
+ SET_CS_PIN(Z2);
+ #endif
+ #if AXIS_HAS_SPI(Z3)
+ SET_CS_PIN(Z3);
+ #endif
+ #if AXIS_HAS_SPI(Z4)
+ SET_CS_PIN(Z4);
+ #endif
+ #if AXIS_HAS_SPI(I)
+ SET_CS_PIN(I);
+ #endif
+ #if AXIS_HAS_SPI(J)
+ SET_CS_PIN(J);
+ #endif
+ #if AXIS_HAS_SPI(K)
+ SET_CS_PIN(K);
+ #endif
+ #if AXIS_HAS_SPI(E0)
+ SET_CS_PIN(E0);
+ #endif
+ #if AXIS_HAS_SPI(E1)
+ SET_CS_PIN(E1);
+ #endif
+ #if AXIS_HAS_SPI(E2)
+ SET_CS_PIN(E2);
+ #endif
+ #if AXIS_HAS_SPI(E3)
+ SET_CS_PIN(E3);
+ #endif
+ #if AXIS_HAS_SPI(E4)
+ SET_CS_PIN(E4);
+ #endif
+ #if AXIS_HAS_SPI(E5)
+ SET_CS_PIN(E5);
+ #endif
+ #if AXIS_HAS_SPI(E6)
+ SET_CS_PIN(E6);
+ #endif
+ #if AXIS_HAS_SPI(E7)
+ SET_CS_PIN(E7);
+ #endif
+ }
+#endif // HAS_TMC_SPI
diff --git a/Marlin/src/feature/tmc_util.h b/Marlin/src/feature/tmc_util.h
index 892d33768b6..fc333b09dd9 100644
--- a/Marlin/src/feature/tmc_util.h
+++ b/Marlin/src/feature/tmc_util.h
@@ -382,8 +382,8 @@ void test_tmc_connection(LOGICAL_AXIS_DECL(const bool, true));
#endif // USE_SENSORLESS
+#endif // HAS_TRINAMIC_CONFIG
+
#if HAS_TMC_SPI
void tmc_init_cs_pins();
#endif
-
-#endif // HAS_TRINAMIC_CONFIG
diff --git a/ini/features.ini b/ini/features.ini
index 90d1d0e102c..d9d35d9a541 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -18,7 +18,8 @@ POSTMORTEM_DEBUGGING = src_filter=+<src/HAL/shared/cpu_excepti
build_flags=-funwind-tables
MKS_WIFI_MODULE = QRCode=https://github.com/makerbase-mks/QRCode/archive/master.zip
HAS_TRINAMIC_CONFIG = TMCStepper@~0.7.3
- src_filter=+<src/feature/tmc_util.cpp> +<src/module/stepper/trinamic.cpp> +<src/gcode/feature/trinamic/M122.cpp> +<src/gcode/feature/trinamic/M906.cpp> +<src/gcode/feature/trinamic/M911-M914.cpp> +<src/gcode/feature/trinamic/M919.cpp>
+ src_filter=+<src/module/stepper/trinamic.cpp> +<src/gcode/feature/trinamic/M122.cpp> +<src/gcode/feature/trinamic/M906.cpp> +<src/gcode/feature/trinamic/M911-M914.cpp> +<src/gcode/feature/trinamic/M919.cpp>
+HAS_T(RINAMIC_CONFIG|MC_SPI) = src_filter=+<src/feature/tmc_util.cpp>
HAS_STEALTHCHOP = src_filter=+<src/gcode/feature/trinamic/M569.cpp>
SR_LCD_3W_NL = SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip
HAS_MOTOR_CURRENT_I2C = SlowSoftI2CMaster