zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Avoid name conflict with 'UART'

Browse source
This commit is contained in:
Scott Lahteine 2020-03-03 15:48:23 -06:00
parent 7709261ea9
commit 70863fbd55
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/core/drivers.h
View file

@ -133,6 +133,8 @@
#define AXIS_HAS_UART(A) ( AXIS_DRIVER_TYPE(A,TMC2208) \ #define AXIS_HAS_UART(A) ( AXIS_DRIVER_TYPE(A,TMC2208) \
|| AXIS_DRIVER_TYPE(A,TMC2209) ) || AXIS_DRIVER_TYPE(A,TMC2209) )
#define AXIS_HAS_RXTX AXIS_HAS_UART
#define AXIS_HAS_SW_SERIAL(A) ((AXIS_HAS_UART(A) && !defined(A##_HARDWARE_SERIAL))) #define AXIS_HAS_SW_SERIAL(A) ((AXIS_HAS_UART(A) && !defined(A##_HARDWARE_SERIAL)))
#define AXIS_HAS_STALLGUARD(A) ( AXIS_DRIVER_TYPE(A,TMC2130) \ #define AXIS_HAS_STALLGUARD(A) ( AXIS_DRIVER_TYPE(A,TMC2130) \
@ -172,7 +174,7 @@
#define HAS_STALLGUARD ANY_AXIS_HAS(STALLGUARD) #define HAS_STALLGUARD ANY_AXIS_HAS(STALLGUARD)
#define HAS_SG_RESULT ANY_AXIS_HAS(SG_RESULT) #define HAS_SG_RESULT ANY_AXIS_HAS(SG_RESULT)
#define HAS_COOLSTEP ANY_AXIS_HAS(COOLSTEP) #define HAS_COOLSTEP ANY_AXIS_HAS(COOLSTEP)
#define HAS_TMC_UART ANY_AXIS_HAS(UART) #define HAS_TMC_UART ANY_AXIS_HAS(RXTX)
#define HAS_TMC_SPI ANY_AXIS_HAS(SPI) #define HAS_TMC_SPI ANY_AXIS_HAS(SPI)
#define HAS_TMC_SW_SERIAL ANY_AXIS_HAS(SW_SERIAL) #define HAS_TMC_SW_SERIAL ANY_AXIS_HAS(SW_SERIAL)