Bläddra i källkod

Improve driver.h macros (#11371)

Scott Lahteine 6 år sedan
förälder
incheckning
955a7f0ae9
Inget konto är kopplat till bidragsgivarens mejladress
1 ändrade filer med 57 tillägg och 12 borttagningar
  1. 57
    12
      Marlin/src/core/drivers.h

+ 57
- 12
Marlin/src/core/drivers.h Visa fil

@@ -21,6 +21,8 @@
21 21
  */
22 22
 #pragma once
23 23
 
24
+#include "../inc/MarlinConfigPre.h"
25
+
24 26
 #define A4988               0x001
25 27
 #define DRV8825             0x002
26 28
 #define LV8729              0x003
@@ -37,21 +39,64 @@
37 39
 #define TMC2660             0x10B
38 40
 #define TMC2660_STANDALONE  0x00B
39 41
 
40
-#define AXIS_DRIVER_TYPE(A, T) ( defined(A##_DRIVER_TYPE) && (A##_DRIVER_TYPE == T) )
42
+#define AXIS_DRIVER_TYPE(A,T) ( defined(A##_DRIVER_TYPE) && (A##_DRIVER_TYPE == T) )
43
+
44
+#define AXIS_DRIVER_TYPE_X(T) AXIS_DRIVER_TYPE(X,T)
45
+#define AXIS_DRIVER_TYPE_Y(T) AXIS_DRIVER_TYPE(Y,T)
46
+#define AXIS_DRIVER_TYPE_Z(T) AXIS_DRIVER_TYPE(Z,T)
47
+
48
+#if ENABLED(X_DUAL_STEPPER_DRIVERS) || ENABLED(DUAL_X_CARRIAGE)
49
+  #define AXIS_DRIVER_TYPE_X2(T) AXIS_DRIVER_TYPE(X2,T)
50
+#else
51
+  #define AXIS_DRIVER_TYPE_X2(T) false
52
+#endif
53
+#if ENABLED(Y_DUAL_STEPPER_DRIVERS)
54
+  #define AXIS_DRIVER_TYPE_Y2(T) AXIS_DRIVER_TYPE(Y2,T)
55
+#else
56
+  #define AXIS_DRIVER_TYPE_Y2(T) false
57
+#endif
58
+#if ENABLED(Z_DUAL_STEPPER_DRIVERS)
59
+  #define AXIS_DRIVER_TYPE_Z2(T) AXIS_DRIVER_TYPE(Z2,T)
60
+#else
61
+  #define AXIS_DRIVER_TYPE_Z2(T) false
62
+#endif
63
+#if E_STEPPERS > 0
64
+  #define AXIS_DRIVER_TYPE_E0(T) AXIS_DRIVER_TYPE(E0,T)
65
+#else
66
+  #define AXIS_DRIVER_TYPE_E0(T) false
67
+#endif
68
+#if E_STEPPERS > 1
69
+  #define AXIS_DRIVER_TYPE_E1(T) AXIS_DRIVER_TYPE(E1,T)
70
+#else
71
+  #define AXIS_DRIVER_TYPE_E1(T) false
72
+#endif
73
+#if E_STEPPERS > 2
74
+  #define AXIS_DRIVER_TYPE_E2(T) AXIS_DRIVER_TYPE(E2,T)
75
+#else
76
+  #define AXIS_DRIVER_TYPE_E2(T) false
77
+#endif
78
+#if E_STEPPERS > 3
79
+  #define AXIS_DRIVER_TYPE_E3(T) AXIS_DRIVER_TYPE(E3,T)
80
+#else
81
+  #define AXIS_DRIVER_TYPE_E3(T) false
82
+#endif
83
+#if E_STEPPERS > 4
84
+  #define AXIS_DRIVER_TYPE_E4(T) AXIS_DRIVER_TYPE(E4,T)
85
+#else
86
+  #define AXIS_DRIVER_TYPE_E4(T) false
87
+#endif
41 88
 
42
-#define HAS_DRIVER(T)  (AXIS_DRIVER_TYPE( X,T) || AXIS_DRIVER_TYPE(X2,T) || \
43
-                        AXIS_DRIVER_TYPE( Y,T) || AXIS_DRIVER_TYPE(Y2,T) || \
44
-                        AXIS_DRIVER_TYPE( Z,T) || AXIS_DRIVER_TYPE(Z2,T) || \
45
-                        AXIS_DRIVER_TYPE(E0,T) || \
46
-                        AXIS_DRIVER_TYPE(E1,T) || \
47
-                        AXIS_DRIVER_TYPE(E2,T) || \
48
-                        AXIS_DRIVER_TYPE(E3,T) || \
49
-                        AXIS_DRIVER_TYPE(E4,T) )
89
+#define HAS_DRIVER(T)  (AXIS_DRIVER_TYPE_X(T)  || AXIS_DRIVER_TYPE_X2(T) || \
90
+                        AXIS_DRIVER_TYPE_Y(T)  || AXIS_DRIVER_TYPE_Y2(T) || \
91
+                        AXIS_DRIVER_TYPE_Z(T)  || AXIS_DRIVER_TYPE_Z2(T) || \
92
+                        AXIS_DRIVER_TYPE_E0(T) || AXIS_DRIVER_TYPE_E1(T) || \
93
+                        AXIS_DRIVER_TYPE_E2(T) || AXIS_DRIVER_TYPE_E3(T) || \
94
+                        AXIS_DRIVER_TYPE_E4(T) )
50 95
 
51 96
 // Test for supported TMC drivers that require advanced configuration
52 97
 // Does not match standalone configurations
53 98
 #define HAS_TRINAMIC ( HAS_DRIVER(TMC2130) || HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2660) )
54 99
 
55
-#define AXIS_IS_TMC(A) ( AXIS_DRIVER_TYPE(A, TMC2130) || \
56
-                         AXIS_DRIVER_TYPE(A, TMC2208) || \
57
-                         AXIS_DRIVER_TYPE(A, TMC2660) )
100
+#define AXIS_IS_TMC(A) ( AXIS_DRIVER_TYPE_##A(TMC2130) || \
101
+                         AXIS_DRIVER_TYPE_##A(TMC2208) || \
102
+                         AXIS_DRIVER_TYPE_##A(TMC2660) )

Laddar…
Avbryt
Spara