Explorar el Código

Prevent L6470 class name conflict with drivers.h define

Fix #12824
Scott Lahteine hace 6 años
padre
commit
52108192d1
Se han modificado 1 ficheros con 18 adiciones y 17 borrados
  1. 18
    17
      Marlin/src/core/drivers.h

+ 18
- 17
Marlin/src/core/drivers.h Ver fichero

23
 
23
 
24
 #include "../inc/MarlinConfigPre.h"
24
 #include "../inc/MarlinConfigPre.h"
25
 
25
 
26
-#define A4988               0x001
27
-#define A5984               0x002
28
-#define DRV8825             0x003
29
-#define LV8729              0x004
30
-#define L6470               0x105
31
-#define TB6560              0x006
32
-#define TB6600              0x007
33
-#define TMC2100             0x008
34
-#define TMC2130             2130
35
-#define TMC2130_STANDALONE  0x009
36
-#define TMC2208             2208
37
-#define TMC2208_STANDALONE  0x00A
38
-#define TMC26X              0x10B
39
-#define TMC26X_STANDALONE   0x00B
40
-#define TMC2660             2660
41
-#define TMC2660_STANDALONE  0x00C
26
+#define _A4988              0x001
27
+#define _A5984              0x002
28
+#define _DRV8825            0x003
29
+#define _LV8729             0x004
30
+#define _L6470              0x105
31
+#define _TB6560             0x006
32
+#define _TB6600             0x007
33
+#define _TMC2100            0x008
34
+#define _TMC2130            2130
35
+#define _TMC2130_STANDALONE 0x009
36
+#define _TMC2208            2208
37
+#define _TMC2208_STANDALONE 0x00A
38
+#define _TMC26X             0x10B
39
+#define _TMC26X_STANDALONE  0x00B
40
+#define _TMC2660            2660
41
+#define _TMC2660_STANDALONE 0x00C
42
 
42
 
43
-#define _AXIS_DRIVER_TYPE(A,T) (defined(A##_DRIVER_TYPE) && (A##_DRIVER_TYPE == T))
43
+#define _ACTUAL(V) _CAT(_, V)
44
+#define _AXIS_DRIVER_TYPE(A,T) (defined(A##_DRIVER_TYPE) && _ACTUAL(A##_DRIVER_TYPE) == _CAT(_, T))
44
 
45
 
45
 #define AXIS_DRIVER_TYPE_X(T) _AXIS_DRIVER_TYPE(X,T)
46
 #define AXIS_DRIVER_TYPE_X(T) _AXIS_DRIVER_TYPE(X,T)
46
 #define AXIS_DRIVER_TYPE_Y(T) _AXIS_DRIVER_TYPE(Y,T)
47
 #define AXIS_DRIVER_TYPE_Y(T) _AXIS_DRIVER_TYPE(Y,T)

Loading…
Cancelar
Guardar