btach/MarlinFirmware
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

🎨 Trinamic cleanup

Browse source
This commit is contained in:
Scott Lahteine 2024-11-25 23:29:49 -06:00
parent 580c99ece2
commit c57f715d00
13 changed files with 39 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/MarlinCore.cpp
View file

@ -1258,7 +1258,7 @@ void setup() {
SETUP_RUN(runout.setup()); SETUP_RUN(runout.setup());
#endif #endif
#if HAS_TMC220x #if HAS_TMC_UART
SETUP_RUN(tmc_serial_begin()); SETUP_RUN(tmc_serial_begin());
#endif #endif

6
Marlin/src/feature/tmc_util.cpp
View file

@ -614,9 +614,10 @@
default: break; default: break;
} }
} }
#endif #endif // TMC2160 || TMC5160
#if HAS_TMC220x #if HAS_TMC220x
static void _tmc_status(TMC2208Stepper &st, const TMC_debug_enum i) { static void _tmc_status(TMC2208Stepper &st, const TMC_debug_enum i) {
switch (i) { switch (i) {
case TMC_PWM_SCALE_SUM: SERIAL_ECHO(st.pwm_scale_sum()); break; case TMC_PWM_SCALE_SUM: SERIAL_ECHO(st.pwm_scale_sum()); break;
@ -664,7 +665,8 @@
} }
} }
#endif #endif
#endif
#endif // HAS_TMC220x
#if HAS_DRIVER(TMC2660) #if HAS_DRIVER(TMC2660)
static void _tmc_parse_drv_status(TMC2660Stepper, const TMC_drv_status_enum) { } static void _tmc_parse_drv_status(TMC2660Stepper, const TMC_drv_status_enum) { }

2
Marlin/src/feature/tmc_util.h
View file

@ -29,7 +29,7 @@
#include <TMCStepper.h> #include <TMCStepper.h>
#include "../module/planner.h" #include "../module/planner.h"
#define CHOPPER_DEFAULT_12V { 3, -1, 1 } #define CHOPPER_DEFAULT_12V { 3, -1, 1 } // { toff, hend, hstrt }
#define CHOPPER_DEFAULT_19V { 4, 1, 1 } #define CHOPPER_DEFAULT_19V { 4, 1, 1 }
#define CHOPPER_DEFAULT_24V { 4, 2, 1 } #define CHOPPER_DEFAULT_24V { 4, 2, 1 }
#define CHOPPER_DEFAULT_36V { 5, 2, 4 } #define CHOPPER_DEFAULT_36V { 5, 2, 4 }

3
Marlin/src/module/stepper/trinamic.cpp
View file

@ -56,6 +56,7 @@ enum StealthIndex : uint8_t {
#else #else
#define TMC_UART_HW_DEFINE(IC, ST, L, AI) TMCMarlin<IC##Stepper, L, AI> stepper##ST(&ST##_HARDWARE_SERIAL, float(ST##_RSENSE), ST##_SLAVE_ADDRESS) #define TMC_UART_HW_DEFINE(IC, ST, L, AI) TMCMarlin<IC##Stepper, L, AI> stepper##ST(&ST##_HARDWARE_SERIAL, float(ST##_RSENSE), ST##_SLAVE_ADDRESS)
#endif #endif
#define TMC_UART_SW_DEFINE(IC, ST, L, AI) TMCMarlin<IC##Stepper, L, AI> stepper##ST(ST##_SERIAL_RX_PIN, ST##_SERIAL_TX_PIN, float(ST##_RSENSE), ST##_SLAVE_ADDRESS) #define TMC_UART_SW_DEFINE(IC, ST, L, AI) TMCMarlin<IC##Stepper, L, AI> stepper##ST(ST##_SERIAL_RX_PIN, ST##_SERIAL_TX_PIN, float(ST##_RSENSE), ST##_SLAVE_ADDRESS)
#define _TMC_SPI_DEFINE(IC, ST, AI) __TMC_SPI_DEFINE(IC, ST, TMC_##ST##_LABEL, AI) #define _TMC_SPI_DEFINE(IC, ST, AI) __TMC_SPI_DEFINE(IC, ST, TMC_##ST##_LABEL, AI)
@ -292,7 +293,7 @@ enum StealthIndex : uint8_t {
// //
// TMC2208/2209 Driver objects and inits // TMC2208/2209 Driver objects and inits
// //
#if HAS_TMC220x #if HAS_TMC_UART
#if AXIS_HAS_UART(X) #if AXIS_HAS_UART(X)
#ifdef X_HARDWARE_SERIAL #ifdef X_HARDWARE_SERIAL
TMC_UART_DEFINE(HW, X, X); TMC_UART_DEFINE(HW, X, X);

2
Marlin/src/module/stepper/trinamic.h
View file

@ -108,7 +108,7 @@
#define CHOPPER_TIMING_E CHOPPER_TIMING #define CHOPPER_TIMING_E CHOPPER_TIMING
#endif #endif
#if HAS_TMC220x #if HAS_TMC_UART
void tmc_serial_begin(); void tmc_serial_begin();
#endif #endif

2
Marlin/src/pins/esp32/pins_FYSETC_E4.h
View file

@ -40,7 +40,7 @@
#if HAS_TMC_UART #if HAS_TMC_UART
// //
// TMC2209 stepper drivers // TMC2208/TMC2209 stepper drivers
// //
#define X_HARDWARE_SERIAL Serial1 #define X_HARDWARE_SERIAL Serial1
#define Y_HARDWARE_SERIAL Serial1 #define Y_HARDWARE_SERIAL Serial1

2
Marlin/src/pins/esp32/pins_GODI_CONTROLLER_V1_0.h
View file

@ -96,7 +96,7 @@
#if HAS_TMC_UART #if HAS_TMC_UART
// //
// TMC2209 stepper drivers // TMC2208/TMC2209 stepper drivers
// //
// //

2
Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
View file

@ -294,7 +294,7 @@
#endif // HAS_WIRED_LCD #endif // HAS_WIRED_LCD
/** /**
* Example for trinamic drivers using the J8 connector on MKs Sbase. * Example for Trinamic drivers using the J8 connector on MKS Sbase.
* 2130s need 1 pin for each driver. 2208/2209s need 2 pins for serial control. * 2130s need 1 pin for each driver. 2208/2209s need 2 pins for serial control.
* This board does not have enough pins to use hardware serial. * This board does not have enough pins to use hardware serial.
*/ */

2
Marlin/src/pins/ramps/pins_ZRIB_V53.h
View file

@ -187,7 +187,7 @@
#if HAS_TMC_UART #if HAS_TMC_UART
/** /**
* TMC2209 stepper drivers * TMC2208/TMC2209 stepper drivers
* *
* Hardware serial communication ports. * Hardware serial communication ports.
* If undefined software serial is used according to the pins below * If undefined software serial is used according to the pins below

2
Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
View file

@ -136,7 +136,7 @@
#if HAS_TMC_UART #if HAS_TMC_UART
/** /**
* TMC2209 stepper drivers * TMC2208/TMC2209 stepper drivers
* Hardware serial communication ports. * Hardware serial communication ports.
*/ */
#define X_HARDWARE_SERIAL MSerial4 #define X_HARDWARE_SERIAL MSerial4

4
Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
View file

@ -125,7 +125,7 @@
*/ */
#if HAS_TMC_UART #if HAS_TMC_UART
// SoftwareSerial with one pin per driver // SoftwareSerial with one pin per driver
// Compatible with TMC2208 and TMC2209 drivers // Compatible with TMC2208/TMC2209 drivers
#define X_SERIAL_TX_PIN PA10 // RXD1 #define X_SERIAL_TX_PIN PA10 // RXD1
#define Y_SERIAL_TX_PIN PA9 // TXD1 #define Y_SERIAL_TX_PIN PA9 // TXD1
#define Z_SERIAL_TX_PIN PC7 // IO1 #define Z_SERIAL_TX_PIN PC7 // IO1
@ -169,7 +169,7 @@
// //
// EXTRUDER // EXTRUDER
// //
#if AXIS_DRIVER_TYPE_E0(TMC2208) || AXIS_DRIVER_TYPE_E0(TMC2209) #if AXIS_HAS_UART(E0)
#define E0_SERIAL_TX_PIN PA8 // IO0 #define E0_SERIAL_TX_PIN PA8 // IO0
#else #else
// Motor current PWM pins // Motor current PWM pins

62
Marlin/src/pins/stm32f1/pins_KEDI_CONTROLLER_V1_2.h
View file

@ -94,47 +94,29 @@
#endif #endif
// CS Pins (One pin for each driver) // CS Pins (One pin for each driver)
#if HAS_DRIVER(TMC2130) || HAS_DRIVER(TMC2160) || HAS_DRIVER(TMC2660) || HAS_DRIVER(TMC5130) || HAS_DRIVER(TMC5160) #if HAS_TMC_SPI
#ifndef X_CS_PIN #ifndef X_CS_PIN
#define X_CS_PIN PC10 #define X_CS_PIN PC10
#endif #endif
#ifndef Y_CS_PIN #ifndef Y_CS_PIN
#define Y_CS_PIN PC11 #define Y_CS_PIN PC11
#endif #endif
#ifndef Z_CS_PIN #ifndef Z_CS_PIN
#define Z_CS_PIN PC12 #define Z_CS_PIN PC12
#endif #endif
#ifndef E0_CS_PIN #ifndef E0_CS_PIN
#define E0_CS_PIN PC14 #define E0_CS_PIN PC14
#endif #endif
#endif #endif
// TMC2208 or TMC2209 on UART /**
#if HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209) * TMC2208/TMC2209 stepper drivers
*/
// UART Pins (Single pin for both RX & TX) #if HAS_TMC_UART
#ifndef X_PIN_UART #define X_SERIAL_TX_PIN PC10
#define X_PIN_UART PC10 #define Y_SERIAL_TX_PIN PC11
#endif #define Z_SERIAL_TX_PIN PC12
#ifndef Y_PIN_UART #define E0_SERIAL_TX_PIN PC14
#define Y_PIN_UART PC11
#endif
#ifndef Z_PIN_UART
#define Z_PIN_UART PC12
#endif
#ifndef E0_PIN_UART
#define E0_PIN_UART PC14
#endif
// Configurating Pins
#define X_SERIAL_TX_PIN X_PIN_UART
#define X_SERIAL_RX_PIN X_PIN_UART
#define Y_SERIAL_TX_PIN Y_PIN_UART
#define Y_SERIAL_RX_PIN Y_PIN_UART
#define Z_SERIAL_TX_PIN Z_PIN_UART
#define Z_SERIAL_RX_PIN Z_PIN_UART
#define E0_SERIAL_TX_PIN E0_PIN_UART
#define E0_SERIAL_RX_PIN E0_PIN_UART
#endif #endif
// //
@ -225,7 +207,7 @@
#define FORCE_SOFT_SPI // SPI MODE3 #define FORCE_SOFT_SPI // SPI MODE3
#define LED_PIN EXP1_05_PIN // red pwm #define LED_PIN EXP1_05_PIN // red pwm
//#define LED_PIN EXP1_04_PIN // green //#define LED_PIN EXP1_04_PIN // green
//#define LED_PIN EXP1_03_PIN // blue //#define LED_PIN EXP1_03_PIN // blue

2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h
View file

@ -232,7 +232,7 @@
#endif #endif
// //
// Trinamic TMC2208/2209 UART // Trinamic TMC2208/TMC2209 UART
// //
#if HAS_TMC_UART #if HAS_TMC_UART
/** /**