浏览代码

Function-like macros

Scott Lahteine 5 年前
父节点
当前提交
37849969ad
共有 3 个文件被更改,包括 72 次插入72 次删除
  1. 16
    16
      Marlin/src/feature/controllerfan.cpp
  2. 30
    30
      Marlin/src/module/stepper.cpp
  3. 26
    26
      Marlin/src/module/stepper/indirection.h

+ 16
- 16
Marlin/src/feature/controllerfan.cpp 查看文件

43
       #if HAS_HEATED_BED
43
       #if HAS_HEATED_BED
44
         || thermalManager.temp_bed.soft_pwm_amount > 0
44
         || thermalManager.temp_bed.soft_pwm_amount > 0
45
       #endif
45
       #endif
46
-        #if HAS_X2_ENABLE
47
-          || X2_ENABLE_READ() == X_ENABLE_ON
48
-        #endif
49
-        #if HAS_Y2_ENABLE
50
-          || Y2_ENABLE_READ() == Y_ENABLE_ON
51
-        #endif
52
-        #if HAS_Z2_ENABLE
53
-          || Z2_ENABLE_READ() == Z_ENABLE_ON
54
-        #endif
55
-        #if HAS_Z3_ENABLE
56
-          || Z3_ENABLE_READ() == Z_ENABLE_ON
57
-        #endif
58
-        #if E_STEPPERS
59
-          #define _OR_ENABLED_E(N) || E##N##_ENABLE_READ() == E_ENABLE_ON
60
-          REPEAT(E_STEPPERS, _OR_ENABLED_E)
61
-        #endif
46
+      #if HAS_X2_ENABLE
47
+        || X2_ENABLE_READ() == X_ENABLE_ON
48
+      #endif
49
+      #if HAS_Y2_ENABLE
50
+        || Y2_ENABLE_READ() == Y_ENABLE_ON
51
+      #endif
52
+      #if HAS_Z2_ENABLE
53
+        || Z2_ENABLE_READ() == Z_ENABLE_ON
54
+      #endif
55
+      #if HAS_Z3_ENABLE
56
+        || Z3_ENABLE_READ() == Z_ENABLE_ON
57
+      #endif
58
+      #if E_STEPPERS
59
+        #define _OR_ENABLED_E(N) || E##N##_ENABLE_READ() == E_ENABLE_ON
60
+        REPEAT(E_STEPPERS, _OR_ENABLED_E)
61
+      #endif
62
     ) {
62
     ) {
63
       lastMotorOn = ms; //... set time to NOW so the fan will turn on
63
       lastMotorOn = ms; //... set time to NOW so the fan will turn on
64
     }
64
     }

+ 30
- 30
Marlin/src/module/stepper.cpp 查看文件

2049
 
2049
 
2050
   // Init Dir Pins
2050
   // Init Dir Pins
2051
   #if HAS_X_DIR
2051
   #if HAS_X_DIR
2052
-    X_DIR_INIT;
2052
+    X_DIR_INIT();
2053
   #endif
2053
   #endif
2054
   #if HAS_X2_DIR
2054
   #if HAS_X2_DIR
2055
-    X2_DIR_INIT;
2055
+    X2_DIR_INIT();
2056
   #endif
2056
   #endif
2057
   #if HAS_Y_DIR
2057
   #if HAS_Y_DIR
2058
-    Y_DIR_INIT;
2058
+    Y_DIR_INIT();
2059
     #if ENABLED(Y_DUAL_STEPPER_DRIVERS) && HAS_Y2_DIR
2059
     #if ENABLED(Y_DUAL_STEPPER_DRIVERS) && HAS_Y2_DIR
2060
-      Y2_DIR_INIT;
2060
+      Y2_DIR_INIT();
2061
     #endif
2061
     #endif
2062
   #endif
2062
   #endif
2063
   #if HAS_Z_DIR
2063
   #if HAS_Z_DIR
2064
-    Z_DIR_INIT;
2064
+    Z_DIR_INIT();
2065
     #if Z_MULTI_STEPPER_DRIVERS && HAS_Z2_DIR
2065
     #if Z_MULTI_STEPPER_DRIVERS && HAS_Z2_DIR
2066
-      Z2_DIR_INIT;
2066
+      Z2_DIR_INIT();
2067
     #endif
2067
     #endif
2068
     #if ENABLED(Z_TRIPLE_STEPPER_DRIVERS) && HAS_Z3_DIR
2068
     #if ENABLED(Z_TRIPLE_STEPPER_DRIVERS) && HAS_Z3_DIR
2069
-      Z3_DIR_INIT;
2069
+      Z3_DIR_INIT();
2070
     #endif
2070
     #endif
2071
   #endif
2071
   #endif
2072
   #if HAS_E0_DIR
2072
   #if HAS_E0_DIR
2073
-    E0_DIR_INIT;
2073
+    E0_DIR_INIT();
2074
   #endif
2074
   #endif
2075
   #if HAS_E1_DIR
2075
   #if HAS_E1_DIR
2076
-    E1_DIR_INIT;
2076
+    E1_DIR_INIT();
2077
   #endif
2077
   #endif
2078
   #if HAS_E2_DIR
2078
   #if HAS_E2_DIR
2079
-    E2_DIR_INIT;
2079
+    E2_DIR_INIT();
2080
   #endif
2080
   #endif
2081
   #if HAS_E3_DIR
2081
   #if HAS_E3_DIR
2082
-    E3_DIR_INIT;
2082
+    E3_DIR_INIT();
2083
   #endif
2083
   #endif
2084
   #if HAS_E4_DIR
2084
   #if HAS_E4_DIR
2085
-    E4_DIR_INIT;
2085
+    E4_DIR_INIT();
2086
   #endif
2086
   #endif
2087
   #if HAS_E5_DIR
2087
   #if HAS_E5_DIR
2088
-    E5_DIR_INIT;
2088
+    E5_DIR_INIT();
2089
   #endif
2089
   #endif
2090
 
2090
 
2091
   // Init Enable Pins - steppers default to disabled.
2091
   // Init Enable Pins - steppers default to disabled.
2092
   #if HAS_X_ENABLE
2092
   #if HAS_X_ENABLE
2093
-    X_ENABLE_INIT;
2093
+    X_ENABLE_INIT();
2094
     if (!X_ENABLE_ON) X_ENABLE_WRITE(HIGH);
2094
     if (!X_ENABLE_ON) X_ENABLE_WRITE(HIGH);
2095
     #if EITHER(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS) && HAS_X2_ENABLE
2095
     #if EITHER(DUAL_X_CARRIAGE, X_DUAL_STEPPER_DRIVERS) && HAS_X2_ENABLE
2096
-      X2_ENABLE_INIT;
2096
+      X2_ENABLE_INIT();
2097
       if (!X_ENABLE_ON) X2_ENABLE_WRITE(HIGH);
2097
       if (!X_ENABLE_ON) X2_ENABLE_WRITE(HIGH);
2098
     #endif
2098
     #endif
2099
   #endif
2099
   #endif
2100
   #if HAS_Y_ENABLE
2100
   #if HAS_Y_ENABLE
2101
-    Y_ENABLE_INIT;
2101
+    Y_ENABLE_INIT();
2102
     if (!Y_ENABLE_ON) Y_ENABLE_WRITE(HIGH);
2102
     if (!Y_ENABLE_ON) Y_ENABLE_WRITE(HIGH);
2103
     #if ENABLED(Y_DUAL_STEPPER_DRIVERS) && HAS_Y2_ENABLE
2103
     #if ENABLED(Y_DUAL_STEPPER_DRIVERS) && HAS_Y2_ENABLE
2104
-      Y2_ENABLE_INIT;
2104
+      Y2_ENABLE_INIT();
2105
       if (!Y_ENABLE_ON) Y2_ENABLE_WRITE(HIGH);
2105
       if (!Y_ENABLE_ON) Y2_ENABLE_WRITE(HIGH);
2106
     #endif
2106
     #endif
2107
   #endif
2107
   #endif
2108
   #if HAS_Z_ENABLE
2108
   #if HAS_Z_ENABLE
2109
-    Z_ENABLE_INIT;
2109
+    Z_ENABLE_INIT();
2110
     if (!Z_ENABLE_ON) Z_ENABLE_WRITE(HIGH);
2110
     if (!Z_ENABLE_ON) Z_ENABLE_WRITE(HIGH);
2111
     #if Z_MULTI_STEPPER_DRIVERS && HAS_Z2_ENABLE
2111
     #if Z_MULTI_STEPPER_DRIVERS && HAS_Z2_ENABLE
2112
-      Z2_ENABLE_INIT;
2112
+      Z2_ENABLE_INIT();
2113
       if (!Z_ENABLE_ON) Z2_ENABLE_WRITE(HIGH);
2113
       if (!Z_ENABLE_ON) Z2_ENABLE_WRITE(HIGH);
2114
     #endif
2114
     #endif
2115
     #if ENABLED(Z_TRIPLE_STEPPER_DRIVERS) && HAS_Z3_ENABLE
2115
     #if ENABLED(Z_TRIPLE_STEPPER_DRIVERS) && HAS_Z3_ENABLE
2116
-      Z3_ENABLE_INIT;
2116
+      Z3_ENABLE_INIT();
2117
       if (!Z_ENABLE_ON) Z3_ENABLE_WRITE(HIGH);
2117
       if (!Z_ENABLE_ON) Z3_ENABLE_WRITE(HIGH);
2118
     #endif
2118
     #endif
2119
   #endif
2119
   #endif
2120
   #if HAS_E0_ENABLE
2120
   #if HAS_E0_ENABLE
2121
-    E0_ENABLE_INIT;
2121
+    E0_ENABLE_INIT();
2122
     if (!E_ENABLE_ON) E0_ENABLE_WRITE(HIGH);
2122
     if (!E_ENABLE_ON) E0_ENABLE_WRITE(HIGH);
2123
   #endif
2123
   #endif
2124
   #if HAS_E1_ENABLE
2124
   #if HAS_E1_ENABLE
2125
-    E1_ENABLE_INIT;
2125
+    E1_ENABLE_INIT();
2126
     if (!E_ENABLE_ON) E1_ENABLE_WRITE(HIGH);
2126
     if (!E_ENABLE_ON) E1_ENABLE_WRITE(HIGH);
2127
   #endif
2127
   #endif
2128
   #if HAS_E2_ENABLE
2128
   #if HAS_E2_ENABLE
2129
-    E2_ENABLE_INIT;
2129
+    E2_ENABLE_INIT();
2130
     if (!E_ENABLE_ON) E2_ENABLE_WRITE(HIGH);
2130
     if (!E_ENABLE_ON) E2_ENABLE_WRITE(HIGH);
2131
   #endif
2131
   #endif
2132
   #if HAS_E3_ENABLE
2132
   #if HAS_E3_ENABLE
2133
-    E3_ENABLE_INIT;
2133
+    E3_ENABLE_INIT();
2134
     if (!E_ENABLE_ON) E3_ENABLE_WRITE(HIGH);
2134
     if (!E_ENABLE_ON) E3_ENABLE_WRITE(HIGH);
2135
   #endif
2135
   #endif
2136
   #if HAS_E4_ENABLE
2136
   #if HAS_E4_ENABLE
2137
-    E4_ENABLE_INIT;
2137
+    E4_ENABLE_INIT();
2138
     if (!E_ENABLE_ON) E4_ENABLE_WRITE(HIGH);
2138
     if (!E_ENABLE_ON) E4_ENABLE_WRITE(HIGH);
2139
   #endif
2139
   #endif
2140
   #if HAS_E5_ENABLE
2140
   #if HAS_E5_ENABLE
2141
-    E5_ENABLE_INIT;
2141
+    E5_ENABLE_INIT();
2142
     if (!E_ENABLE_ON) E5_ENABLE_WRITE(HIGH);
2142
     if (!E_ENABLE_ON) E5_ENABLE_WRITE(HIGH);
2143
   #endif
2143
   #endif
2144
 
2144
 
2156
   // Init Step Pins
2156
   // Init Step Pins
2157
   #if HAS_X_STEP
2157
   #if HAS_X_STEP
2158
     #if EITHER(X_DUAL_STEPPER_DRIVERS, DUAL_X_CARRIAGE)
2158
     #if EITHER(X_DUAL_STEPPER_DRIVERS, DUAL_X_CARRIAGE)
2159
-      X2_STEP_INIT;
2159
+      X2_STEP_INIT();
2160
       X2_STEP_WRITE(INVERT_X_STEP_PIN);
2160
       X2_STEP_WRITE(INVERT_X_STEP_PIN);
2161
     #endif
2161
     #endif
2162
     AXIS_INIT(X, X);
2162
     AXIS_INIT(X, X);
2164
 
2164
 
2165
   #if HAS_Y_STEP
2165
   #if HAS_Y_STEP
2166
     #if ENABLED(Y_DUAL_STEPPER_DRIVERS)
2166
     #if ENABLED(Y_DUAL_STEPPER_DRIVERS)
2167
-      Y2_STEP_INIT;
2167
+      Y2_STEP_INIT();
2168
       Y2_STEP_WRITE(INVERT_Y_STEP_PIN);
2168
       Y2_STEP_WRITE(INVERT_Y_STEP_PIN);
2169
     #endif
2169
     #endif
2170
     AXIS_INIT(Y, Y);
2170
     AXIS_INIT(Y, Y);
2172
 
2172
 
2173
   #if HAS_Z_STEP
2173
   #if HAS_Z_STEP
2174
     #if Z_MULTI_STEPPER_DRIVERS
2174
     #if Z_MULTI_STEPPER_DRIVERS
2175
-      Z2_STEP_INIT;
2175
+      Z2_STEP_INIT();
2176
       Z2_STEP_WRITE(INVERT_Z_STEP_PIN);
2176
       Z2_STEP_WRITE(INVERT_Z_STEP_PIN);
2177
     #endif
2177
     #endif
2178
     #if ENABLED(Z_TRIPLE_STEPPER_DRIVERS)
2178
     #if ENABLED(Z_TRIPLE_STEPPER_DRIVERS)
2179
-      Z3_STEP_INIT;
2179
+      Z3_STEP_INIT();
2180
       Z3_STEP_WRITE(INVERT_Z_STEP_PIN);
2180
       Z3_STEP_WRITE(INVERT_Z_STEP_PIN);
2181
     #endif
2181
     #endif
2182
     AXIS_INIT(Z, Z);
2182
     AXIS_INIT(Z, Z);

+ 26
- 26
Marlin/src/module/stepper/indirection.h 查看文件

58
   #define X_DIR_WRITE(STATE) WRITE(X_DIR_PIN,STATE)
58
   #define X_DIR_WRITE(STATE) WRITE(X_DIR_PIN,STATE)
59
   #define X_DIR_READ() READ(X_DIR_PIN)
59
   #define X_DIR_READ() READ(X_DIR_PIN)
60
 #endif
60
 #endif
61
-#define X_STEP_INIT SET_OUTPUT(X_STEP_PIN)
61
+#define X_STEP_INIT() SET_OUTPUT(X_STEP_PIN)
62
 #ifndef X_STEP_WRITE
62
 #ifndef X_STEP_WRITE
63
   #define X_STEP_WRITE(STATE) WRITE(X_STEP_PIN,STATE)
63
   #define X_STEP_WRITE(STATE) WRITE(X_STEP_PIN,STATE)
64
 #endif
64
 #endif
65
-#define X_STEP_READ READ(X_STEP_PIN)
65
+#define X_STEP_READ() READ(X_STEP_PIN)
66
 
66
 
67
 // Y Stepper
67
 // Y Stepper
68
 #ifndef Y_ENABLE_INIT
68
 #ifndef Y_ENABLE_INIT
75
   #define Y_DIR_WRITE(STATE) WRITE(Y_DIR_PIN,STATE)
75
   #define Y_DIR_WRITE(STATE) WRITE(Y_DIR_PIN,STATE)
76
   #define Y_DIR_READ() READ(Y_DIR_PIN)
76
   #define Y_DIR_READ() READ(Y_DIR_PIN)
77
 #endif
77
 #endif
78
-#define Y_STEP_INIT SET_OUTPUT(Y_STEP_PIN)
78
+#define Y_STEP_INIT() SET_OUTPUT(Y_STEP_PIN)
79
 #ifndef Y_STEP_WRITE
79
 #ifndef Y_STEP_WRITE
80
   #define Y_STEP_WRITE(STATE) WRITE(Y_STEP_PIN,STATE)
80
   #define Y_STEP_WRITE(STATE) WRITE(Y_STEP_PIN,STATE)
81
 #endif
81
 #endif
82
-#define Y_STEP_READ READ(Y_STEP_PIN)
82
+#define Y_STEP_READ() READ(Y_STEP_PIN)
83
 
83
 
84
 // Z Stepper
84
 // Z Stepper
85
 #ifndef Z_ENABLE_INIT
85
 #ifndef Z_ENABLE_INIT
92
   #define Z_DIR_WRITE(STATE) WRITE(Z_DIR_PIN,STATE)
92
   #define Z_DIR_WRITE(STATE) WRITE(Z_DIR_PIN,STATE)
93
   #define Z_DIR_READ() READ(Z_DIR_PIN)
93
   #define Z_DIR_READ() READ(Z_DIR_PIN)
94
 #endif
94
 #endif
95
-#define Z_STEP_INIT SET_OUTPUT(Z_STEP_PIN)
95
+#define Z_STEP_INIT() SET_OUTPUT(Z_STEP_PIN)
96
 #ifndef Z_STEP_WRITE
96
 #ifndef Z_STEP_WRITE
97
   #define Z_STEP_WRITE(STATE) WRITE(Z_STEP_PIN,STATE)
97
   #define Z_STEP_WRITE(STATE) WRITE(Z_STEP_PIN,STATE)
98
 #endif
98
 #endif
99
-#define Z_STEP_READ READ(Z_STEP_PIN)
99
+#define Z_STEP_READ() READ(Z_STEP_PIN)
100
 
100
 
101
 // X2 Stepper
101
 // X2 Stepper
102
 #if HAS_X2_ENABLE
102
 #if HAS_X2_ENABLE
110
     #define X2_DIR_WRITE(STATE) WRITE(X2_DIR_PIN,STATE)
110
     #define X2_DIR_WRITE(STATE) WRITE(X2_DIR_PIN,STATE)
111
     #define X2_DIR_READ() READ(X2_DIR_PIN)
111
     #define X2_DIR_READ() READ(X2_DIR_PIN)
112
   #endif
112
   #endif
113
-  #define X2_STEP_INIT SET_OUTPUT(X2_STEP_PIN)
113
+  #define X2_STEP_INIT() SET_OUTPUT(X2_STEP_PIN)
114
   #ifndef X2_STEP_WRITE
114
   #ifndef X2_STEP_WRITE
115
     #define X2_STEP_WRITE(STATE) WRITE(X2_STEP_PIN,STATE)
115
     #define X2_STEP_WRITE(STATE) WRITE(X2_STEP_PIN,STATE)
116
   #endif
116
   #endif
117
-  #define X2_STEP_READ READ(X2_STEP_PIN)
117
+  #define X2_STEP_READ() READ(X2_STEP_PIN)
118
 #endif
118
 #endif
119
 
119
 
120
 // Y2 Stepper
120
 // Y2 Stepper
129
     #define Y2_DIR_WRITE(STATE) WRITE(Y2_DIR_PIN,STATE)
129
     #define Y2_DIR_WRITE(STATE) WRITE(Y2_DIR_PIN,STATE)
130
     #define Y2_DIR_READ() READ(Y2_DIR_PIN)
130
     #define Y2_DIR_READ() READ(Y2_DIR_PIN)
131
   #endif
131
   #endif
132
-  #define Y2_STEP_INIT SET_OUTPUT(Y2_STEP_PIN)
132
+  #define Y2_STEP_INIT() SET_OUTPUT(Y2_STEP_PIN)
133
   #ifndef Y2_STEP_WRITE
133
   #ifndef Y2_STEP_WRITE
134
     #define Y2_STEP_WRITE(STATE) WRITE(Y2_STEP_PIN,STATE)
134
     #define Y2_STEP_WRITE(STATE) WRITE(Y2_STEP_PIN,STATE)
135
   #endif
135
   #endif
136
-  #define Y2_STEP_READ READ(Y2_STEP_PIN)
136
+  #define Y2_STEP_READ() READ(Y2_STEP_PIN)
137
 #else
137
 #else
138
   #define Y2_DIR_WRITE(STATE) NOOP
138
   #define Y2_DIR_WRITE(STATE) NOOP
139
 #endif
139
 #endif
150
     #define Z2_DIR_WRITE(STATE) WRITE(Z2_DIR_PIN,STATE)
150
     #define Z2_DIR_WRITE(STATE) WRITE(Z2_DIR_PIN,STATE)
151
     #define Z2_DIR_READ() READ(Z2_DIR_PIN)
151
     #define Z2_DIR_READ() READ(Z2_DIR_PIN)
152
   #endif
152
   #endif
153
-  #define Z2_STEP_INIT SET_OUTPUT(Z2_STEP_PIN)
153
+  #define Z2_STEP_INIT() SET_OUTPUT(Z2_STEP_PIN)
154
   #ifndef Z2_STEP_WRITE
154
   #ifndef Z2_STEP_WRITE
155
     #define Z2_STEP_WRITE(STATE) WRITE(Z2_STEP_PIN,STATE)
155
     #define Z2_STEP_WRITE(STATE) WRITE(Z2_STEP_PIN,STATE)
156
   #endif
156
   #endif
157
-  #define Z2_STEP_READ READ(Z2_STEP_PIN)
157
+  #define Z2_STEP_READ() READ(Z2_STEP_PIN)
158
 #else
158
 #else
159
   #define Z2_DIR_WRITE(STATE) NOOP
159
   #define Z2_DIR_WRITE(STATE) NOOP
160
 #endif
160
 #endif
171
     #define Z3_DIR_WRITE(STATE) WRITE(Z3_DIR_PIN,STATE)
171
     #define Z3_DIR_WRITE(STATE) WRITE(Z3_DIR_PIN,STATE)
172
     #define Z3_DIR_READ() READ(Z3_DIR_PIN)
172
     #define Z3_DIR_READ() READ(Z3_DIR_PIN)
173
   #endif
173
   #endif
174
-  #define Z3_STEP_INIT SET_OUTPUT(Z3_STEP_PIN)
174
+  #define Z3_STEP_INIT() SET_OUTPUT(Z3_STEP_PIN)
175
   #ifndef Z3_STEP_WRITE
175
   #ifndef Z3_STEP_WRITE
176
     #define Z3_STEP_WRITE(STATE) WRITE(Z3_STEP_PIN,STATE)
176
     #define Z3_STEP_WRITE(STATE) WRITE(Z3_STEP_PIN,STATE)
177
   #endif
177
   #endif
178
-  #define Z3_STEP_READ READ(Z3_STEP_PIN)
178
+  #define Z3_STEP_READ() READ(Z3_STEP_PIN)
179
 #else
179
 #else
180
   #define Z3_DIR_WRITE(STATE) NOOP
180
   #define Z3_DIR_WRITE(STATE) NOOP
181
 #endif
181
 #endif
191
   #define E0_DIR_WRITE(STATE) WRITE(E0_DIR_PIN,STATE)
191
   #define E0_DIR_WRITE(STATE) WRITE(E0_DIR_PIN,STATE)
192
   #define E0_DIR_READ() READ(E0_DIR_PIN)
192
   #define E0_DIR_READ() READ(E0_DIR_PIN)
193
 #endif
193
 #endif
194
-#define E0_STEP_INIT SET_OUTPUT(E0_STEP_PIN)
194
+#define E0_STEP_INIT() SET_OUTPUT(E0_STEP_PIN)
195
 #ifndef E0_STEP_WRITE
195
 #ifndef E0_STEP_WRITE
196
   #define E0_STEP_WRITE(STATE) WRITE(E0_STEP_PIN,STATE)
196
   #define E0_STEP_WRITE(STATE) WRITE(E0_STEP_PIN,STATE)
197
 #endif
197
 #endif
198
-#define E0_STEP_READ READ(E0_STEP_PIN)
198
+#define E0_STEP_READ() READ(E0_STEP_PIN)
199
 
199
 
200
 // E1 Stepper
200
 // E1 Stepper
201
 #ifndef E1_ENABLE_INIT
201
 #ifndef E1_ENABLE_INIT
208
   #define E1_DIR_WRITE(STATE) WRITE(E1_DIR_PIN,STATE)
208
   #define E1_DIR_WRITE(STATE) WRITE(E1_DIR_PIN,STATE)
209
   #define E1_DIR_READ() READ(E1_DIR_PIN)
209
   #define E1_DIR_READ() READ(E1_DIR_PIN)
210
 #endif
210
 #endif
211
-#define E1_STEP_INIT SET_OUTPUT(E1_STEP_PIN)
211
+#define E1_STEP_INIT() SET_OUTPUT(E1_STEP_PIN)
212
 #ifndef E1_STEP_WRITE
212
 #ifndef E1_STEP_WRITE
213
   #define E1_STEP_WRITE(STATE) WRITE(E1_STEP_PIN,STATE)
213
   #define E1_STEP_WRITE(STATE) WRITE(E1_STEP_PIN,STATE)
214
 #endif
214
 #endif
215
-#define E1_STEP_READ READ(E1_STEP_PIN)
215
+#define E1_STEP_READ() READ(E1_STEP_PIN)
216
 
216
 
217
 // E2 Stepper
217
 // E2 Stepper
218
 #ifndef E2_ENABLE_INIT
218
 #ifndef E2_ENABLE_INIT
225
   #define E2_DIR_WRITE(STATE) WRITE(E2_DIR_PIN,STATE)
225
   #define E2_DIR_WRITE(STATE) WRITE(E2_DIR_PIN,STATE)
226
   #define E2_DIR_READ() READ(E2_DIR_PIN)
226
   #define E2_DIR_READ() READ(E2_DIR_PIN)
227
 #endif
227
 #endif
228
-#define E2_STEP_INIT SET_OUTPUT(E2_STEP_PIN)
228
+#define E2_STEP_INIT() SET_OUTPUT(E2_STEP_PIN)
229
 #ifndef E2_STEP_WRITE
229
 #ifndef E2_STEP_WRITE
230
   #define E2_STEP_WRITE(STATE) WRITE(E2_STEP_PIN,STATE)
230
   #define E2_STEP_WRITE(STATE) WRITE(E2_STEP_PIN,STATE)
231
 #endif
231
 #endif
232
-#define E2_STEP_READ READ(E2_STEP_PIN)
232
+#define E2_STEP_READ() READ(E2_STEP_PIN)
233
 
233
 
234
 // E3 Stepper
234
 // E3 Stepper
235
 #ifndef E3_ENABLE_INIT
235
 #ifndef E3_ENABLE_INIT
242
   #define E3_DIR_WRITE(STATE) WRITE(E3_DIR_PIN,STATE)
242
   #define E3_DIR_WRITE(STATE) WRITE(E3_DIR_PIN,STATE)
243
   #define E3_DIR_READ() READ(E3_DIR_PIN)
243
   #define E3_DIR_READ() READ(E3_DIR_PIN)
244
 #endif
244
 #endif
245
-#define E3_STEP_INIT SET_OUTPUT(E3_STEP_PIN)
245
+#define E3_STEP_INIT() SET_OUTPUT(E3_STEP_PIN)
246
 #ifndef E3_STEP_WRITE
246
 #ifndef E3_STEP_WRITE
247
   #define E3_STEP_WRITE(STATE) WRITE(E3_STEP_PIN,STATE)
247
   #define E3_STEP_WRITE(STATE) WRITE(E3_STEP_PIN,STATE)
248
 #endif
248
 #endif
249
-#define E3_STEP_READ READ(E3_STEP_PIN)
249
+#define E3_STEP_READ() READ(E3_STEP_PIN)
250
 
250
 
251
 // E4 Stepper
251
 // E4 Stepper
252
 #ifndef E4_ENABLE_INIT
252
 #ifndef E4_ENABLE_INIT
259
   #define E4_DIR_WRITE(STATE) WRITE(E4_DIR_PIN,STATE)
259
   #define E4_DIR_WRITE(STATE) WRITE(E4_DIR_PIN,STATE)
260
   #define E4_DIR_READ() READ(E4_DIR_PIN)
260
   #define E4_DIR_READ() READ(E4_DIR_PIN)
261
 #endif
261
 #endif
262
-#define E4_STEP_INIT SET_OUTPUT(E4_STEP_PIN)
262
+#define E4_STEP_INIT() SET_OUTPUT(E4_STEP_PIN)
263
 #ifndef E4_STEP_WRITE
263
 #ifndef E4_STEP_WRITE
264
   #define E4_STEP_WRITE(STATE) WRITE(E4_STEP_PIN,STATE)
264
   #define E4_STEP_WRITE(STATE) WRITE(E4_STEP_PIN,STATE)
265
 #endif
265
 #endif
266
-#define E4_STEP_READ READ(E4_STEP_PIN)
266
+#define E4_STEP_READ() READ(E4_STEP_PIN)
267
 
267
 
268
 // E5 Stepper
268
 // E5 Stepper
269
 #ifndef E5_ENABLE_INIT
269
 #ifndef E5_ENABLE_INIT
276
   #define E5_DIR_WRITE(STATE) WRITE(E5_DIR_PIN,STATE)
276
   #define E5_DIR_WRITE(STATE) WRITE(E5_DIR_PIN,STATE)
277
   #define E5_DIR_READ() READ(E5_DIR_PIN)
277
   #define E5_DIR_READ() READ(E5_DIR_PIN)
278
 #endif
278
 #endif
279
-#define E5_STEP_INIT SET_OUTPUT(E5_STEP_PIN)
279
+#define E5_STEP_INIT() SET_OUTPUT(E5_STEP_PIN)
280
 #ifndef E5_STEP_WRITE
280
 #ifndef E5_STEP_WRITE
281
   #define E5_STEP_WRITE(STATE) WRITE(E5_STEP_PIN,STATE)
281
   #define E5_STEP_WRITE(STATE) WRITE(E5_STEP_PIN,STATE)
282
 #endif
282
 #endif
283
-#define E5_STEP_READ READ(E5_STEP_PIN)
283
+#define E5_STEP_READ() READ(E5_STEP_PIN)
284
 
284
 
285
 /**
285
 /**
286
  * Extruder indirection for the single E axis
286
  * Extruder indirection for the single E axis

正在加载...
取消
保存