SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add missing SoftwareSerial begin for TMC2208

Browse source 
Based on #9299
This commit is contained in:
Scott Lahteine 2018-01-22 10:24:30 -06:00
parent 3db35ba9be
commit db031d5d76
3 changed files with 46 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Marlin/src/HAL/HAL_AVR/SanityCheck_AVR_8_bit.h
View file

@ -100,17 +100,17 @@
* TMC2208 software UART and ENDSTOP_INTERRUPTS both use pin change interrupts (PCI) * TMC2208 software UART and ENDSTOP_INTERRUPTS both use pin change interrupts (PCI)
*/ */
#if ENABLED(HAVE_TMC2208) && ENABLED(ENDSTOP_INTERRUPTS_FEATURE) && !( \ #if ENABLED(HAVE_TMC2208) && ENABLED(ENDSTOP_INTERRUPTS_FEATURE) && !( \
ENABLED( X_HARDWARE_SERIAL ) \ defined(X_HARDWARE_SERIAL ) \
|| ENABLED( X2_HARDWARE_SERIAL ) \ || defined(X2_HARDWARE_SERIAL) \
|| ENABLED( Y_HARDWARE_SERIAL ) \ || defined(Y_HARDWARE_SERIAL ) \
|| ENABLED( Y2_HARDWARE_SERIAL ) \ || defined(Y2_HARDWARE_SERIAL) \
|| ENABLED( Z_HARDWARE_SERIAL ) \ || defined(Z_HARDWARE_SERIAL ) \
|| ENABLED( Z2_HARDWARE_SERIAL ) \ || defined(Z2_HARDWARE_SERIAL) \
|| ENABLED( E0_HARDWARE_SERIAL ) \ || defined(E0_HARDWARE_SERIAL) \
|| ENABLED( E1_HARDWARE_SERIAL ) \ || defined(E1_HARDWARE_SERIAL) \
|| ENABLED( E2_HARDWARE_SERIAL ) \ || defined(E2_HARDWARE_SERIAL) \
|| ENABLED( E3_HARDWARE_SERIAL ) \ || defined(E3_HARDWARE_SERIAL) \
|| ENABLED( E4_HARDWARE_SERIAL ) ) || defined(E4_HARDWARE_SERIAL) )
#error "select hardware UART for TMC2208 to use both TMC2208 and ENDSTOP_INTERRUPTS_FEATURE." #error "select hardware UART for TMC2208 to use both TMC2208 and ENDSTOP_INTERRUPTS_FEATURE."
#endif #endif

2
Marlin/src/inc/Conditionals_post.h
View file

@ -1249,7 +1249,7 @@
#endif #endif
#endif #endif
#endif #endif
// Nozzle park // Nozzle park
#if ENABLED(NOZZLE_PARK_FEATURE) && ENABLED(DELTA) #if ENABLED(NOZZLE_PARK_FEATURE) && ENABLED(DELTA)
#undef NOZZLE_PARK_Z_FEEDRATE #undef NOZZLE_PARK_Z_FEEDRATE

69
Marlin/src/module/stepper_indirection.cpp
View file

@ -257,82 +257,82 @@
#include "planner.h" #include "planner.h"
#define _TMC2208_DEFINE_HARDWARE(ST) TMC2208Stepper stepper##ST(&ST##_HARDWARE_SERIAL) #define _TMC2208_DEFINE_HARDWARE(ST) TMC2208Stepper stepper##ST(&ST##_HARDWARE_SERIAL)
#define _TMC2208_DEFINE_SOFTWARE(ST) SoftwareSerial stepper##ST##_serial = SoftwareSerial(ST##_SERIAL_RX_PIN, ST##_SERIAL_TX_PIN); \ #define _TMC2208_DEFINE_SOFTWARE(ST) SoftwareSerial ST##_HARDWARE_SERIAL = SoftwareSerial(ST##_SERIAL_RX_PIN, ST##_SERIAL_TX_PIN); \
TMC2208Stepper stepper##ST(&stepper##ST##_serial, ST##_SERIAL_RX_PIN > -1) TMC2208Stepper stepper##ST(&stepper##ST##_serial, ST##_SERIAL_RX_PIN > -1)
// Stepper objects of TMC2208 steppers used // Stepper objects of TMC2208 steppers used
#if ENABLED(X_IS_TMC2208) #if ENABLED(X_IS_TMC2208)
#if defined(X_HARDWARE_SERIAL) #ifdef X_HARDWARE_SERIAL
_TMC2208_DEFINE_HARDWARE(X); _TMC2208_DEFINE_HARDWARE(X);
#else #else
_TMC2208_DEFINE_SOFTWARE(X); _TMC2208_DEFINE_SOFTWARE(X);
#endif #endif
#endif #endif
#if ENABLED(X2_IS_TMC2208) #if ENABLED(X2_IS_TMC2208)
#if defined(X2_HARDWARE_SERIAL) #ifdef X2_HARDWARE_SERIAL
_TMC2208_DEFINE_HARDWARE(X2); _TMC2208_DEFINE_HARDWARE(X2);
#else #else
_TMC2208_DEFINE_SOFTWARE(X2); _TMC2208_DEFINE_SOFTWARE(X2);
#endif #endif
#endif #endif
#if ENABLED(Y_IS_TMC2208) #if ENABLED(Y_IS_TMC2208)
#if defined(Y_HARDWARE_SERIAL) #ifdef Y_HARDWARE_SERIAL
_TMC2208_DEFINE_HARDWARE(Y); _TMC2208_DEFINE_HARDWARE(Y);
#else #else
_TMC2208_DEFINE_SOFTWARE(Y); _TMC2208_DEFINE_SOFTWARE(Y);
#endif #endif
#endif #endif
#if ENABLED(Y2_IS_TMC2208) #if ENABLED(Y2_IS_TMC2208)
#if defined(Y2_HARDWARE_SERIAL) #ifdef Y2_HARDWARE_SERIAL
_TMC2208_DEFINE_HARDWARE(Y2); _TMC2208_DEFINE_HARDWARE(Y2);
#else #else
_TMC2208_DEFINE_SOFTWARE(Y2); _TMC2208_DEFINE_SOFTWARE(Y2);
#endif #endif
#endif #endif
#if ENABLED(Z_IS_TMC2208) #if ENABLED(Z_IS_TMC2208)
#if defined(Z_HARDWARE_SERIAL) #ifdef Z_HARDWARE_SERIAL
_TMC2208_DEFINE_HARDWARE(Z); _TMC2208_DEFINE_HARDWARE(Z);
#else #else
_TMC2208_DEFINE_SOFTWARE(Z); _TMC2208_DEFINE_SOFTWARE(Z);
#endif #endif
#endif #endif
#if ENABLED(Z2_IS_TMC2208) #if ENABLED(Z2_IS_TMC2208)
#if defined(Z2_HARDWARE_SERIAL) #ifdef Z2_HARDWARE_SERIAL
_TMC2208_DEFINE_HARDWARE(Z2); _TMC2208_DEFINE_HARDWARE(Z2);
#else #else
_TMC2208_DEFINE_SOFTWARE(Z2); _TMC2208_DEFINE_SOFTWARE(Z2);
#endif #endif
#endif #endif
#if ENABLED(E0_IS_TMC2208) #if ENABLED(E0_IS_TMC2208)
#if defined(E0_HARDWARE_SERIAL) #ifdef E0_HARDWARE_SERIAL
_TMC2208_DEFINE_HARDWARE(E0); _TMC2208_DEFINE_HARDWARE(E0);
#else #else
_TMC2208_DEFINE_SOFTWARE(E0); _TMC2208_DEFINE_SOFTWARE(E0);
#endif #endif
#endif #endif
#if ENABLED(E1_IS_TMC2208) #if ENABLED(E1_IS_TMC2208)
#if defined(E1_HARDWARE_SERIAL) #ifdef E1_HARDWARE_SERIAL
_TMC2208_DEFINE_HARDWARE(E1); _TMC2208_DEFINE_HARDWARE(E1);
#else #else
_TMC2208_DEFINE_SOFTWARE(E1); _TMC2208_DEFINE_SOFTWARE(E1);
#endif #endif
#endif #endif
#if ENABLED(E2_IS_TMC2208) #if ENABLED(E2_IS_TMC2208)
#if defined(E2_HARDWARE_SERIAL) #ifdef E2_HARDWARE_SERIAL
_TMC2208_DEFINE_HARDWARE(E2); _TMC2208_DEFINE_HARDWARE(E2);
#else #else
_TMC2208_DEFINE_SOFTWARE(E2); _TMC2208_DEFINE_SOFTWARE(E2);
#endif #endif
#endif #endif
#if ENABLED(E3_IS_TMC2208) #if ENABLED(E3_IS_TMC2208)
#if defined(E3_HARDWARE_SERIAL) #ifdef E3_HARDWARE_SERIAL
_TMC2208_DEFINE_HARDWARE(E3); _TMC2208_DEFINE_HARDWARE(E3);
#else #else
_TMC2208_DEFINE_SOFTWARE(E3); _TMC2208_DEFINE_SOFTWARE(E3);
#endif #endif
#endif #endif
#if ENABLED(E4_IS_TMC2208) #if ENABLED(E4_IS_TMC2208)
#if defined(E4_HARDWARE_SERIAL) #ifdef E4_HARDWARE_SERIAL
_TMC2208_DEFINE_HARDWARE(E4); _TMC2208_DEFINE_HARDWARE(E4);
#else #else
_TMC2208_DEFINE_SOFTWARE(E4); _TMC2208_DEFINE_SOFTWARE(E4);
@ -340,38 +340,38 @@
#endif #endif
void tmc2208_serial_begin() { void tmc2208_serial_begin() {
#if ENABLED(X_IS_TMC2208) && defined(X_HARDWARE_SERIAL) #if ENABLED(X_IS_TMC2208)
X_HARDWARE_SERIAL.begin(250000); X_HARDWARE_SERIAL.begin(115200);
#endif #endif
#if ENABLED(X2_IS_TMC2208) && defined(X2_HARDWARE_SERIAL) #if ENABLED(X2_IS_TMC2208)
X2_HARDWARE_SERIAL.begin(250000); X2_HARDWARE_SERIAL.begin(115200);
#endif #endif
#if ENABLED(Y_IS_TMC2208) && defined(Y_HARDWARE_SERIAL) #if ENABLED(Y_IS_TMC2208)
Y_HARDWARE_SERIAL.begin(250000); Y_HARDWARE_SERIAL.begin(115200);
#endif #endif
#if ENABLED(Y2_IS_TMC2208) && defined(Y2_HARDWARE_SERIAL) #if ENABLED(Y2_IS_TMC2208)
Y2_HARDWARE_SERIAL.begin(250000); Y2_HARDWARE_SERIAL.begin(115200);
#endif #endif
#if ENABLED(Z_IS_TMC2208) && defined(Z_HARDWARE_SERIAL) #if ENABLED(Z_IS_TMC2208)
Z_HARDWARE_SERIAL.begin(250000); Z_HARDWARE_SERIAL.begin(115200);
#endif #endif
#if ENABLED(Z2_IS_TMC2208) && defined(Z2_HARDWARE_SERIAL) #if ENABLED(Z2_IS_TMC2208)
Z2_HARDWARE_SERIAL.begin(250000); Z2_HARDWARE_SERIAL.begin(115200);
#endif #endif
#if ENABLED(E0_IS_TMC2208) && defined(E0_HARDWARE_SERIAL) #if ENABLED(E0_IS_TMC2208)
E0_HARDWARE_SERIAL.begin(250000); E0_HARDWARE_SERIAL.begin(115200);
#endif #endif
#if ENABLED(E1_IS_TMC2208) && defined(E1_HARDWARE_SERIAL) #if ENABLED(E1_IS_TMC2208)
E1_HARDWARE_SERIAL.begin(250000); E1_HARDWARE_SERIAL.begin(115200);
#endif #endif
#if ENABLED(E2_IS_TMC2208) && defined(E2_HARDWARE_SERIAL) #if ENABLED(E2_IS_TMC2208)
E2_HARDWARE_SERIAL.begin(250000); E2_HARDWARE_SERIAL.begin(115200);
#endif #endif
#if ENABLED(E3_IS_TMC2208) && defined(E3_HARDWARE_SERIAL) #if ENABLED(E3_IS_TMC2208)
E3_HARDWARE_SERIAL.begin(250000); E3_HARDWARE_SERIAL.begin(115200);
#endif #endif
#if ENABLED(E4_IS_TMC2208) && defined(E4_HARDWARE_SERIAL) #if ENABLED(E4_IS_TMC2208)
E4_HARDWARE_SERIAL.begin(250000); E4_HARDWARE_SERIAL.begin(115200);
#endif #endif
} }
@ -450,7 +450,6 @@
} }
#endif // HAVE_TMC2208 #endif // HAVE_TMC2208
// //
// L6470 Driver objects and inits // L6470 Driver objects and inits
// //