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

Prevent L6470 class name conflict with drivers.h define

Browse source 
Fix #12824
This commit is contained in:
Scott Lahteine 2019-01-20 00:32:56 -06:00
parent 0495fcd475
commit 52108192d1
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,24 +23,25 @@
#include "../inc/MarlinConfigPre.h" #include "../inc/MarlinConfigPre.h"
#define A4988 0x001 #define _A4988 0x001
#define A5984 0x002 #define _A5984 0x002
#define DRV8825 0x003 #define _DRV8825 0x003
#define LV8729 0x004 #define _LV8729 0x004
#define L6470 0x105 #define _L6470 0x105
#define TB6560 0x006 #define _TB6560 0x006
#define TB6600 0x007 #define _TB6600 0x007
#define TMC2100 0x008 #define _TMC2100 0x008
#define TMC2130 2130 #define _TMC2130 2130
#define TMC2130_STANDALONE 0x009 #define _TMC2130_STANDALONE 0x009
#define TMC2208 2208 #define _TMC2208 2208
#define TMC2208_STANDALONE 0x00A #define _TMC2208_STANDALONE 0x00A
#define TMC26X 0x10B #define _TMC26X 0x10B
#define TMC26X_STANDALONE 0x00B #define _TMC26X_STANDALONE 0x00B
#define TMC2660 2660 #define _TMC2660 2660
#define TMC2660_STANDALONE 0x00C #define _TMC2660_STANDALONE 0x00C
#define _AXIS_DRIVER_TYPE(A,T) (defined(A##_DRIVER_TYPE) && (A##_DRIVER_TYPE == T)) #define _ACTUAL(V) _CAT(_, V)
#define _AXIS_DRIVER_TYPE(A,T) (defined(A##_DRIVER_TYPE) && _ACTUAL(A##_DRIVER_TYPE) == _CAT(_, T))
#define AXIS_DRIVER_TYPE_X(T) _AXIS_DRIVER_TYPE(X,T) #define AXIS_DRIVER_TYPE_X(T) _AXIS_DRIVER_TYPE(X,T)
#define AXIS_DRIVER_TYPE_Y(T) _AXIS_DRIVER_TYPE(Y,T) #define AXIS_DRIVER_TYPE_Y(T) _AXIS_DRIVER_TYPE(Y,T)