ソースを参照

Use bool in pin compare

Scott Lahteine 5年前
コミット
dda76e50a9
2個のファイルの変更46行の追加46行の削除
  1. 7
    7
      Marlin/src/feature/controllerfan.cpp
  2. 39
    39
      Marlin/src/module/stepper/indirection.h

+ 7
- 7
Marlin/src/feature/controllerfan.cpp ファイルの表示

36
   if (ELAPSED(ms, nextMotorCheck)) {
36
   if (ELAPSED(ms, nextMotorCheck)) {
37
     nextMotorCheck = ms + 2500UL; // Not a time critical function, so only check every 2.5s
37
     nextMotorCheck = ms + 2500UL; // Not a time critical function, so only check every 2.5s
38
 
38
 
39
-    const bool xory = X_ENABLE_READ() == X_ENABLE_ON || Y_ENABLE_READ() == Y_ENABLE_ON;
39
+    const bool xory = X_ENABLE_READ() == bool(X_ENABLE_ON) || Y_ENABLE_READ() == bool(Y_ENABLE_ON);
40
 
40
 
41
     // If any of the drivers or the bed are enabled...
41
     // If any of the drivers or the bed are enabled...
42
-    if (xory || Z_ENABLE_READ() == Z_ENABLE_ON
42
+    if (xory || Z_ENABLE_READ() == bool(Z_ENABLE_ON)
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
46
       #if HAS_X2_ENABLE
47
-        || X2_ENABLE_READ() == X_ENABLE_ON
47
+        || X2_ENABLE_READ() == bool(X_ENABLE_ON)
48
       #endif
48
       #endif
49
       #if HAS_Y2_ENABLE
49
       #if HAS_Y2_ENABLE
50
-        || Y2_ENABLE_READ() == Y_ENABLE_ON
50
+        || Y2_ENABLE_READ() == bool(Y_ENABLE_ON)
51
       #endif
51
       #endif
52
       #if HAS_Z2_ENABLE
52
       #if HAS_Z2_ENABLE
53
-        || Z2_ENABLE_READ() == Z_ENABLE_ON
53
+        || Z2_ENABLE_READ() == bool(Z_ENABLE_ON)
54
       #endif
54
       #endif
55
       #if HAS_Z3_ENABLE
55
       #if HAS_Z3_ENABLE
56
-        || Z3_ENABLE_READ() == Z_ENABLE_ON
56
+        || Z3_ENABLE_READ() == bool(Z_ENABLE_ON)
57
       #endif
57
       #endif
58
       #if E_STEPPERS
58
       #if E_STEPPERS
59
-        #define _OR_ENABLED_E(N) || E##N##_ENABLE_READ() == E_ENABLE_ON
59
+        #define _OR_ENABLED_E(N) || E##N##_ENABLE_READ() == bool(E_ENABLE_ON)
60
         REPEAT(E_STEPPERS, _OR_ENABLED_E)
60
         REPEAT(E_STEPPERS, _OR_ENABLED_E)
61
       #endif
61
       #endif
62
     ) {
62
     ) {

+ 39
- 39
Marlin/src/module/stepper/indirection.h ファイルの表示

51
 #ifndef X_ENABLE_INIT
51
 #ifndef X_ENABLE_INIT
52
   #define X_ENABLE_INIT() SET_OUTPUT(X_ENABLE_PIN)
52
   #define X_ENABLE_INIT() SET_OUTPUT(X_ENABLE_PIN)
53
   #define X_ENABLE_WRITE(STATE) WRITE(X_ENABLE_PIN,STATE)
53
   #define X_ENABLE_WRITE(STATE) WRITE(X_ENABLE_PIN,STATE)
54
-  #define X_ENABLE_READ() READ(X_ENABLE_PIN)
54
+  #define X_ENABLE_READ() bool(READ(X_ENABLE_PIN))
55
 #endif
55
 #endif
56
 #ifndef X_DIR_INIT
56
 #ifndef X_DIR_INIT
57
   #define X_DIR_INIT() SET_OUTPUT(X_DIR_PIN)
57
   #define X_DIR_INIT() SET_OUTPUT(X_DIR_PIN)
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() bool(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() bool(READ(X_STEP_PIN))
66
 
66
 
67
 // Y Stepper
67
 // Y Stepper
68
 #ifndef Y_ENABLE_INIT
68
 #ifndef Y_ENABLE_INIT
69
   #define Y_ENABLE_INIT() SET_OUTPUT(Y_ENABLE_PIN)
69
   #define Y_ENABLE_INIT() SET_OUTPUT(Y_ENABLE_PIN)
70
   #define Y_ENABLE_WRITE(STATE) WRITE(Y_ENABLE_PIN,STATE)
70
   #define Y_ENABLE_WRITE(STATE) WRITE(Y_ENABLE_PIN,STATE)
71
-  #define Y_ENABLE_READ() READ(Y_ENABLE_PIN)
71
+  #define Y_ENABLE_READ() bool(READ(Y_ENABLE_PIN))
72
 #endif
72
 #endif
73
 #ifndef Y_DIR_INIT
73
 #ifndef Y_DIR_INIT
74
   #define Y_DIR_INIT() SET_OUTPUT(Y_DIR_PIN)
74
   #define Y_DIR_INIT() SET_OUTPUT(Y_DIR_PIN)
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() bool(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() bool(READ(Y_STEP_PIN))
83
 
83
 
84
 // Z Stepper
84
 // Z Stepper
85
 #ifndef Z_ENABLE_INIT
85
 #ifndef Z_ENABLE_INIT
86
   #define Z_ENABLE_INIT() SET_OUTPUT(Z_ENABLE_PIN)
86
   #define Z_ENABLE_INIT() SET_OUTPUT(Z_ENABLE_PIN)
87
   #define Z_ENABLE_WRITE(STATE) WRITE(Z_ENABLE_PIN,STATE)
87
   #define Z_ENABLE_WRITE(STATE) WRITE(Z_ENABLE_PIN,STATE)
88
-  #define Z_ENABLE_READ() READ(Z_ENABLE_PIN)
88
+  #define Z_ENABLE_READ() bool(READ(Z_ENABLE_PIN))
89
 #endif
89
 #endif
90
 #ifndef Z_DIR_INIT
90
 #ifndef Z_DIR_INIT
91
   #define Z_DIR_INIT() SET_OUTPUT(Z_DIR_PIN)
91
   #define Z_DIR_INIT() SET_OUTPUT(Z_DIR_PIN)
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() bool(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() bool(READ(Z_STEP_PIN))
100
 
100
 
101
 // X2 Stepper
101
 // X2 Stepper
102
 #if HAS_X2_ENABLE
102
 #if HAS_X2_ENABLE
103
   #ifndef X2_ENABLE_INIT
103
   #ifndef X2_ENABLE_INIT
104
     #define X2_ENABLE_INIT() SET_OUTPUT(X2_ENABLE_PIN)
104
     #define X2_ENABLE_INIT() SET_OUTPUT(X2_ENABLE_PIN)
105
     #define X2_ENABLE_WRITE(STATE) WRITE(X2_ENABLE_PIN,STATE)
105
     #define X2_ENABLE_WRITE(STATE) WRITE(X2_ENABLE_PIN,STATE)
106
-    #define X2_ENABLE_READ() READ(X2_ENABLE_PIN)
106
+    #define X2_ENABLE_READ() bool(READ(X2_ENABLE_PIN))
107
   #endif
107
   #endif
108
   #ifndef X2_DIR_INIT
108
   #ifndef X2_DIR_INIT
109
     #define X2_DIR_INIT() SET_OUTPUT(X2_DIR_PIN)
109
     #define X2_DIR_INIT() SET_OUTPUT(X2_DIR_PIN)
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() bool(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() bool(READ(X2_STEP_PIN))
118
 #endif
118
 #endif
119
 
119
 
120
 // Y2 Stepper
120
 // Y2 Stepper
122
   #ifndef Y2_ENABLE_INIT
122
   #ifndef Y2_ENABLE_INIT
123
     #define Y2_ENABLE_INIT() SET_OUTPUT(Y2_ENABLE_PIN)
123
     #define Y2_ENABLE_INIT() SET_OUTPUT(Y2_ENABLE_PIN)
124
     #define Y2_ENABLE_WRITE(STATE) WRITE(Y2_ENABLE_PIN,STATE)
124
     #define Y2_ENABLE_WRITE(STATE) WRITE(Y2_ENABLE_PIN,STATE)
125
-    #define Y2_ENABLE_READ() READ(Y2_ENABLE_PIN)
125
+    #define Y2_ENABLE_READ() bool(READ(Y2_ENABLE_PIN))
126
   #endif
126
   #endif
127
   #ifndef Y2_DIR_INIT
127
   #ifndef Y2_DIR_INIT
128
     #define Y2_DIR_INIT() SET_OUTPUT(Y2_DIR_PIN)
128
     #define Y2_DIR_INIT() SET_OUTPUT(Y2_DIR_PIN)
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() bool(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() bool(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
143
   #ifndef Z2_ENABLE_INIT
143
   #ifndef Z2_ENABLE_INIT
144
     #define Z2_ENABLE_INIT() SET_OUTPUT(Z2_ENABLE_PIN)
144
     #define Z2_ENABLE_INIT() SET_OUTPUT(Z2_ENABLE_PIN)
145
     #define Z2_ENABLE_WRITE(STATE) WRITE(Z2_ENABLE_PIN,STATE)
145
     #define Z2_ENABLE_WRITE(STATE) WRITE(Z2_ENABLE_PIN,STATE)
146
-    #define Z2_ENABLE_READ() READ(Z2_ENABLE_PIN)
146
+    #define Z2_ENABLE_READ() bool(READ(Z2_ENABLE_PIN))
147
   #endif
147
   #endif
148
   #ifndef Z2_DIR_INIT
148
   #ifndef Z2_DIR_INIT
149
     #define Z2_DIR_INIT() SET_OUTPUT(Z2_DIR_PIN)
149
     #define Z2_DIR_INIT() SET_OUTPUT(Z2_DIR_PIN)
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() bool(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() bool(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
164
   #ifndef Z3_ENABLE_INIT
164
   #ifndef Z3_ENABLE_INIT
165
     #define Z3_ENABLE_INIT() SET_OUTPUT(Z3_ENABLE_PIN)
165
     #define Z3_ENABLE_INIT() SET_OUTPUT(Z3_ENABLE_PIN)
166
     #define Z3_ENABLE_WRITE(STATE) WRITE(Z3_ENABLE_PIN,STATE)
166
     #define Z3_ENABLE_WRITE(STATE) WRITE(Z3_ENABLE_PIN,STATE)
167
-    #define Z3_ENABLE_READ() READ(Z3_ENABLE_PIN)
167
+    #define Z3_ENABLE_READ() bool(READ(Z3_ENABLE_PIN))
168
   #endif
168
   #endif
169
   #ifndef Z3_DIR_INIT
169
   #ifndef Z3_DIR_INIT
170
     #define Z3_DIR_INIT() SET_OUTPUT(Z3_DIR_PIN)
170
     #define Z3_DIR_INIT() SET_OUTPUT(Z3_DIR_PIN)
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() bool(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() bool(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
184
 #ifndef E0_ENABLE_INIT
184
 #ifndef E0_ENABLE_INIT
185
   #define E0_ENABLE_INIT() SET_OUTPUT(E0_ENABLE_PIN)
185
   #define E0_ENABLE_INIT() SET_OUTPUT(E0_ENABLE_PIN)
186
   #define E0_ENABLE_WRITE(STATE) WRITE(E0_ENABLE_PIN,STATE)
186
   #define E0_ENABLE_WRITE(STATE) WRITE(E0_ENABLE_PIN,STATE)
187
-  #define E0_ENABLE_READ() READ(E0_ENABLE_PIN)
187
+  #define E0_ENABLE_READ() bool(READ(E0_ENABLE_PIN))
188
 #endif
188
 #endif
189
 #ifndef E0_DIR_INIT
189
 #ifndef E0_DIR_INIT
190
   #define E0_DIR_INIT() SET_OUTPUT(E0_DIR_PIN)
190
   #define E0_DIR_INIT() SET_OUTPUT(E0_DIR_PIN)
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() bool(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() bool(READ(E0_STEP_PIN))
199
 
199
 
200
 // E1 Stepper
200
 // E1 Stepper
201
 #ifndef E1_ENABLE_INIT
201
 #ifndef E1_ENABLE_INIT
202
   #define E1_ENABLE_INIT() SET_OUTPUT(E1_ENABLE_PIN)
202
   #define E1_ENABLE_INIT() SET_OUTPUT(E1_ENABLE_PIN)
203
   #define E1_ENABLE_WRITE(STATE) WRITE(E1_ENABLE_PIN,STATE)
203
   #define E1_ENABLE_WRITE(STATE) WRITE(E1_ENABLE_PIN,STATE)
204
-  #define E1_ENABLE_READ() READ(E1_ENABLE_PIN)
204
+  #define E1_ENABLE_READ() bool(READ(E1_ENABLE_PIN))
205
 #endif
205
 #endif
206
 #ifndef E1_DIR_INIT
206
 #ifndef E1_DIR_INIT
207
   #define E1_DIR_INIT() SET_OUTPUT(E1_DIR_PIN)
207
   #define E1_DIR_INIT() SET_OUTPUT(E1_DIR_PIN)
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() bool(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() bool(READ(E1_STEP_PIN))
216
 
216
 
217
 // E2 Stepper
217
 // E2 Stepper
218
 #ifndef E2_ENABLE_INIT
218
 #ifndef E2_ENABLE_INIT
219
   #define E2_ENABLE_INIT() SET_OUTPUT(E2_ENABLE_PIN)
219
   #define E2_ENABLE_INIT() SET_OUTPUT(E2_ENABLE_PIN)
220
   #define E2_ENABLE_WRITE(STATE) WRITE(E2_ENABLE_PIN,STATE)
220
   #define E2_ENABLE_WRITE(STATE) WRITE(E2_ENABLE_PIN,STATE)
221
-  #define E2_ENABLE_READ() READ(E2_ENABLE_PIN)
221
+  #define E2_ENABLE_READ() bool(READ(E2_ENABLE_PIN))
222
 #endif
222
 #endif
223
 #ifndef E2_DIR_INIT
223
 #ifndef E2_DIR_INIT
224
   #define E2_DIR_INIT() SET_OUTPUT(E2_DIR_PIN)
224
   #define E2_DIR_INIT() SET_OUTPUT(E2_DIR_PIN)
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() bool(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() bool(READ(E2_STEP_PIN))
233
 
233
 
234
 // E3 Stepper
234
 // E3 Stepper
235
 #ifndef E3_ENABLE_INIT
235
 #ifndef E3_ENABLE_INIT
236
   #define E3_ENABLE_INIT() SET_OUTPUT(E3_ENABLE_PIN)
236
   #define E3_ENABLE_INIT() SET_OUTPUT(E3_ENABLE_PIN)
237
   #define E3_ENABLE_WRITE(STATE) WRITE(E3_ENABLE_PIN,STATE)
237
   #define E3_ENABLE_WRITE(STATE) WRITE(E3_ENABLE_PIN,STATE)
238
-  #define E3_ENABLE_READ() READ(E3_ENABLE_PIN)
238
+  #define E3_ENABLE_READ() bool(READ(E3_ENABLE_PIN))
239
 #endif
239
 #endif
240
 #ifndef E3_DIR_INIT
240
 #ifndef E3_DIR_INIT
241
   #define E3_DIR_INIT() SET_OUTPUT(E3_DIR_PIN)
241
   #define E3_DIR_INIT() SET_OUTPUT(E3_DIR_PIN)
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() bool(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() bool(READ(E3_STEP_PIN))
250
 
250
 
251
 // E4 Stepper
251
 // E4 Stepper
252
 #ifndef E4_ENABLE_INIT
252
 #ifndef E4_ENABLE_INIT
253
   #define E4_ENABLE_INIT() SET_OUTPUT(E4_ENABLE_PIN)
253
   #define E4_ENABLE_INIT() SET_OUTPUT(E4_ENABLE_PIN)
254
   #define E4_ENABLE_WRITE(STATE) WRITE(E4_ENABLE_PIN,STATE)
254
   #define E4_ENABLE_WRITE(STATE) WRITE(E4_ENABLE_PIN,STATE)
255
-  #define E4_ENABLE_READ() READ(E4_ENABLE_PIN)
255
+  #define E4_ENABLE_READ() bool(READ(E4_ENABLE_PIN))
256
 #endif
256
 #endif
257
 #ifndef E4_DIR_INIT
257
 #ifndef E4_DIR_INIT
258
   #define E4_DIR_INIT() SET_OUTPUT(E4_DIR_PIN)
258
   #define E4_DIR_INIT() SET_OUTPUT(E4_DIR_PIN)
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() bool(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() bool(READ(E4_STEP_PIN))
267
 
267
 
268
 // E5 Stepper
268
 // E5 Stepper
269
 #ifndef E5_ENABLE_INIT
269
 #ifndef E5_ENABLE_INIT
270
   #define E5_ENABLE_INIT() SET_OUTPUT(E5_ENABLE_PIN)
270
   #define E5_ENABLE_INIT() SET_OUTPUT(E5_ENABLE_PIN)
271
   #define E5_ENABLE_WRITE(STATE) WRITE(E5_ENABLE_PIN,STATE)
271
   #define E5_ENABLE_WRITE(STATE) WRITE(E5_ENABLE_PIN,STATE)
272
-  #define E5_ENABLE_READ() READ(E5_ENABLE_PIN)
272
+  #define E5_ENABLE_READ() bool(READ(E5_ENABLE_PIN))
273
 #endif
273
 #endif
274
 #ifndef E5_DIR_INIT
274
 #ifndef E5_DIR_INIT
275
   #define E5_DIR_INIT() SET_OUTPUT(E5_DIR_PIN)
275
   #define E5_DIR_INIT() SET_OUTPUT(E5_DIR_PIN)
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() bool(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() bool(READ(E5_STEP_PIN))
284
 
284
 
285
 /**
285
 /**
286
  * Extruder indirection for the single E axis
286
  * Extruder indirection for the single E axis

読み込み中…
キャンセル
保存