Browse Source

L64XX can use hardStop for M17

See #17794
Scott Lahteine 5 years ago
parent
commit
c26725c5a0
1 changed files with 16 additions and 16 deletions
  1. 16
    16
      Marlin/src/module/stepper/L64xx.h

+ 16
- 16
Marlin/src/module/stepper/L64xx.h View File

45
 #if AXIS_IS_L64XX(X)
45
 #if AXIS_IS_L64XX(X)
46
   extern L64XX_CLASS(X)         stepperX;
46
   extern L64XX_CLASS(X)         stepperX;
47
   #define X_ENABLE_INIT()       NOOP
47
   #define X_ENABLE_INIT()       NOOP
48
-  #define X_ENABLE_WRITE(STATE) (STATE ? NOOP : stepperX.free())
48
+  #define X_ENABLE_WRITE(STATE) (STATE ? stepperX.hardStop() : stepperX.free())
49
   #define X_ENABLE_READ()       (stepperX.getStatus() & STATUS_HIZ)
49
   #define X_ENABLE_READ()       (stepperX.getStatus() & STATUS_HIZ)
50
   #if AXIS_DRIVER_TYPE_X(L6474)
50
   #if AXIS_DRIVER_TYPE_X(L6474)
51
     #define X_DIR_INIT()        SET_OUTPUT(X_DIR_PIN)
51
     #define X_DIR_INIT()        SET_OUTPUT(X_DIR_PIN)
65
 #if AXIS_IS_L64XX(Y)
65
 #if AXIS_IS_L64XX(Y)
66
   extern L64XX_CLASS(Y)         stepperY;
66
   extern L64XX_CLASS(Y)         stepperY;
67
   #define Y_ENABLE_INIT()       NOOP
67
   #define Y_ENABLE_INIT()       NOOP
68
-  #define Y_ENABLE_WRITE(STATE) (STATE ? NOOP : stepperY.free())
68
+  #define Y_ENABLE_WRITE(STATE) (STATE ? stepperY.hardStop() : stepperY.free())
69
   #define Y_ENABLE_READ()       (stepperY.getStatus() & STATUS_HIZ)
69
   #define Y_ENABLE_READ()       (stepperY.getStatus() & STATUS_HIZ)
70
   #if AXIS_DRIVER_TYPE_Y(L6474)
70
   #if AXIS_DRIVER_TYPE_Y(L6474)
71
     #define Y_DIR_INIT()        SET_OUTPUT(Y_DIR_PIN)
71
     #define Y_DIR_INIT()        SET_OUTPUT(Y_DIR_PIN)
85
 #if AXIS_IS_L64XX(Z)
85
 #if AXIS_IS_L64XX(Z)
86
   extern L64XX_CLASS(Z)         stepperZ;
86
   extern L64XX_CLASS(Z)         stepperZ;
87
   #define Z_ENABLE_INIT()       NOOP
87
   #define Z_ENABLE_INIT()       NOOP
88
-  #define Z_ENABLE_WRITE(STATE) (STATE ? NOOP : stepperZ.free())
88
+  #define Z_ENABLE_WRITE(STATE) (STATE ? stepperZ.hardStop() : stepperZ.free())
89
   #define Z_ENABLE_READ()       (stepperZ.getStatus() & STATUS_HIZ)
89
   #define Z_ENABLE_READ()       (stepperZ.getStatus() & STATUS_HIZ)
90
   #if AXIS_DRIVER_TYPE_Z(L6474)
90
   #if AXIS_DRIVER_TYPE_Z(L6474)
91
     #define Z_DIR_INIT()        SET_OUTPUT(Z_DIR_PIN)
91
     #define Z_DIR_INIT()        SET_OUTPUT(Z_DIR_PIN)
105
 #if HAS_X2_ENABLE && AXIS_IS_L64XX(X2)
105
 #if HAS_X2_ENABLE && AXIS_IS_L64XX(X2)
106
   extern L64XX_CLASS(X2)         stepperX2;
106
   extern L64XX_CLASS(X2)         stepperX2;
107
   #define X2_ENABLE_INIT()       NOOP
107
   #define X2_ENABLE_INIT()       NOOP
108
-  #define X2_ENABLE_WRITE(STATE) (STATE ? NOOP : stepperX2.free())
108
+  #define X2_ENABLE_WRITE(STATE) (STATE ? stepperX2.hardStop() : stepperX2.free())
109
   #define X2_ENABLE_READ()       (stepperX2.getStatus() & STATUS_HIZ)
109
   #define X2_ENABLE_READ()       (stepperX2.getStatus() & STATUS_HIZ)
110
   #if AXIS_DRIVER_TYPE_X2(L6474)
110
   #if AXIS_DRIVER_TYPE_X2(L6474)
111
     #define X2_DIR_INIT()        SET_OUTPUT(X2_DIR_PIN)
111
     #define X2_DIR_INIT()        SET_OUTPUT(X2_DIR_PIN)
126
 #if HAS_Y2_ENABLE && AXIS_IS_L64XX(Y2)
126
 #if HAS_Y2_ENABLE && AXIS_IS_L64XX(Y2)
127
   extern L64XX_CLASS(Y2)         stepperY2;
127
   extern L64XX_CLASS(Y2)         stepperY2;
128
   #define Y2_ENABLE_INIT()       NOOP
128
   #define Y2_ENABLE_INIT()       NOOP
129
-  #define Y2_ENABLE_WRITE(STATE) (STATE ? NOOP : stepperY2.free())
129
+  #define Y2_ENABLE_WRITE(STATE) (STATE ? stepperY2.hardStop() : stepperY2.free())
130
   #define Y2_ENABLE_READ()       (stepperY2.getStatus() & STATUS_HIZ)
130
   #define Y2_ENABLE_READ()       (stepperY2.getStatus() & STATUS_HIZ)
131
   #if AXIS_DRIVER_TYPE_Y2(L6474)
131
   #if AXIS_DRIVER_TYPE_Y2(L6474)
132
     #define Y2_DIR_INIT()        SET_OUTPUT(Y2_DIR_PIN)
132
     #define Y2_DIR_INIT()        SET_OUTPUT(Y2_DIR_PIN)
147
 #if HAS_Z2_ENABLE && AXIS_IS_L64XX(Z2)
147
 #if HAS_Z2_ENABLE && AXIS_IS_L64XX(Z2)
148
   extern L64XX_CLASS(Z2)         stepperZ2;
148
   extern L64XX_CLASS(Z2)         stepperZ2;
149
   #define Z2_ENABLE_INIT()       NOOP
149
   #define Z2_ENABLE_INIT()       NOOP
150
-  #define Z2_ENABLE_WRITE(STATE) (STATE ? NOOP : stepperZ2.free())
150
+  #define Z2_ENABLE_WRITE(STATE) (STATE ? stepperZ2.hardStop() : stepperZ2.free())
151
   #define Z2_ENABLE_READ()       (stepperZ2.getStatus() & STATUS_HIZ)
151
   #define Z2_ENABLE_READ()       (stepperZ2.getStatus() & STATUS_HIZ)
152
   #if AXIS_DRIVER_TYPE_Z2(L6474)
152
   #if AXIS_DRIVER_TYPE_Z2(L6474)
153
     #define Z2_DIR_INIT()        SET_OUTPUT(Z2_DIR_PIN)
153
     #define Z2_DIR_INIT()        SET_OUTPUT(Z2_DIR_PIN)
168
 #if HAS_Z3_ENABLE && AXIS_IS_L64XX(Z3)
168
 #if HAS_Z3_ENABLE && AXIS_IS_L64XX(Z3)
169
   extern L64XX_CLASS(Z3)         stepperZ3;
169
   extern L64XX_CLASS(Z3)         stepperZ3;
170
   #define Z3_ENABLE_INIT()       NOOP
170
   #define Z3_ENABLE_INIT()       NOOP
171
-  #define Z3_ENABLE_WRITE(STATE) (STATE ? NOOP : stepperZ3.free())
171
+  #define Z3_ENABLE_WRITE(STATE) (STATE ? stepperZ3.hardStop() : stepperZ3.free())
172
   #define Z3_ENABLE_READ()       (stepperZ3.getStatus() & STATUS_HIZ)
172
   #define Z3_ENABLE_READ()       (stepperZ3.getStatus() & STATUS_HIZ)
173
   #if AXIS_DRIVER_TYPE_Z3(L6474)
173
   #if AXIS_DRIVER_TYPE_Z3(L6474)
174
     #define Z3_DIR_INIT()        SET_OUTPUT(Z3_DIR_PIN)
174
     #define Z3_DIR_INIT()        SET_OUTPUT(Z3_DIR_PIN)
189
 #if HAS_Z4_ENABLE && AXIS_IS_L64XX(Z4)
189
 #if HAS_Z4_ENABLE && AXIS_IS_L64XX(Z4)
190
   extern L64XX_CLASS(Z4)         stepperZ4;
190
   extern L64XX_CLASS(Z4)         stepperZ4;
191
   #define Z4_ENABLE_INIT()       NOOP
191
   #define Z4_ENABLE_INIT()       NOOP
192
-  #define Z4_ENABLE_WRITE(STATE) (STATE ? NOOP : stepperZ4.free())
192
+  #define Z4_ENABLE_WRITE(STATE) (STATE ? stepperZ4.hardStop() : stepperZ4.free())
193
   #define Z4_ENABLE_READ()       (stepperZ4.getStatus() & STATUS_HIZ)
193
   #define Z4_ENABLE_READ()       (stepperZ4.getStatus() & STATUS_HIZ)
194
   #if AXIS_DRIVER_TYPE_Z4(L6474)
194
   #if AXIS_DRIVER_TYPE_Z4(L6474)
195
     #define Z4_DIR_INIT()        SET_OUTPUT(Z4_DIR_PIN)
195
     #define Z4_DIR_INIT()        SET_OUTPUT(Z4_DIR_PIN)
210
 #if AXIS_IS_L64XX(E0)
210
 #if AXIS_IS_L64XX(E0)
211
   extern L64XX_CLASS(E0)         stepperE0;
211
   extern L64XX_CLASS(E0)         stepperE0;
212
   #define E0_ENABLE_INIT()       NOOP
212
   #define E0_ENABLE_INIT()       NOOP
213
-  #define E0_ENABLE_WRITE(STATE)  (STATE ? NOOP : stepperE0.free())
213
+  #define E0_ENABLE_WRITE(STATE)  (STATE ? stepperE0.hardStop() : stepperE0.free())
214
   #define E0_ENABLE_READ()       (stepperE0.getStatus() & STATUS_HIZ)
214
   #define E0_ENABLE_READ()       (stepperE0.getStatus() & STATUS_HIZ)
215
   #if AXIS_DRIVER_TYPE_E0(L6474)
215
   #if AXIS_DRIVER_TYPE_E0(L6474)
216
     #define E0_DIR_INIT()        SET_OUTPUT(E0_DIR_PIN)
216
     #define E0_DIR_INIT()        SET_OUTPUT(E0_DIR_PIN)
230
 #if AXIS_IS_L64XX(E1)
230
 #if AXIS_IS_L64XX(E1)
231
   extern L64XX_CLASS(E1)         stepperE1;
231
   extern L64XX_CLASS(E1)         stepperE1;
232
   #define E1_ENABLE_INIT()       NOOP
232
   #define E1_ENABLE_INIT()       NOOP
233
-  #define E1_ENABLE_WRITE(STATE) (STATE ? NOOP : stepperE1.free())
233
+  #define E1_ENABLE_WRITE(STATE) (STATE ? stepperE1.hardStop() : stepperE1.free())
234
   #define E1_ENABLE_READ()       (stepperE1.getStatus() & STATUS_HIZ)
234
   #define E1_ENABLE_READ()       (stepperE1.getStatus() & STATUS_HIZ)
235
   #if AXIS_DRIVER_TYPE_E1(L6474)
235
   #if AXIS_DRIVER_TYPE_E1(L6474)
236
     #define E1_DIR_INIT()        SET_OUTPUT(E1_DIR_PIN)
236
     #define E1_DIR_INIT()        SET_OUTPUT(E1_DIR_PIN)
250
 #if AXIS_IS_L64XX(E2)
250
 #if AXIS_IS_L64XX(E2)
251
   extern L64XX_CLASS(E2)         stepperE2;
251
   extern L64XX_CLASS(E2)         stepperE2;
252
   #define E2_ENABLE_INIT()       NOOP
252
   #define E2_ENABLE_INIT()       NOOP
253
-  #define E2_ENABLE_WRITE(STATE) (STATE ? NOOP : stepperE2.free())
253
+  #define E2_ENABLE_WRITE(STATE) (STATE ? stepperE2.hardStop() : stepperE2.free())
254
   #define E2_ENABLE_READ()       (stepperE2.getStatus() & STATUS_HIZ)
254
   #define E2_ENABLE_READ()       (stepperE2.getStatus() & STATUS_HIZ)
255
   #if AXIS_DRIVER_TYPE_E2(L6474)
255
   #if AXIS_DRIVER_TYPE_E2(L6474)
256
     #define E2_DIR_INIT()        SET_OUTPUT(E2_DIR_PIN)
256
     #define E2_DIR_INIT()        SET_OUTPUT(E2_DIR_PIN)
270
 #if AXIS_IS_L64XX(E3)
270
 #if AXIS_IS_L64XX(E3)
271
   extern L64XX_CLASS(E3)         stepperE3;
271
   extern L64XX_CLASS(E3)         stepperE3;
272
   #define E3_ENABLE_INIT()       NOOP
272
   #define E3_ENABLE_INIT()       NOOP
273
-  #define E3_ENABLE_WRITE(STATE) (STATE ? NOOP : stepperE3.free())
273
+  #define E3_ENABLE_WRITE(STATE) (STATE ? stepperE3.hardStop() : stepperE3.free())
274
   #define E3_ENABLE_READ()       (stepperE3.getStatus() & STATUS_HIZ)
274
   #define E3_ENABLE_READ()       (stepperE3.getStatus() & STATUS_HIZ)
275
   #if AXIS_DRIVER_TYPE_E3(L6474)
275
   #if AXIS_DRIVER_TYPE_E3(L6474)
276
     #define E3_DIR_INIT()        SET_OUTPUT(E3_DIR_PIN)
276
     #define E3_DIR_INIT()        SET_OUTPUT(E3_DIR_PIN)
287
 #if AXIS_IS_L64XX(E4)
287
 #if AXIS_IS_L64XX(E4)
288
   extern L64XX_CLASS(E4)         stepperE4;
288
   extern L64XX_CLASS(E4)         stepperE4;
289
   #define E4_ENABLE_INIT()       NOOP
289
   #define E4_ENABLE_INIT()       NOOP
290
-  #define E4_ENABLE_WRITE(STATE) (STATE ? NOOP : stepperE4.free())
290
+  #define E4_ENABLE_WRITE(STATE) (STATE ? stepperE4.hardStop() : stepperE4.free())
291
   #define E4_ENABLE_READ()       (stepperE4.getStatus() & STATUS_HIZ)
291
   #define E4_ENABLE_READ()       (stepperE4.getStatus() & STATUS_HIZ)
292
   #if AXIS_DRIVER_TYPE_E4(L6474)
292
   #if AXIS_DRIVER_TYPE_E4(L6474)
293
     #define E4_DIR_INIT()        SET_OUTPUT(E4_DIR_PIN)
293
     #define E4_DIR_INIT()        SET_OUTPUT(E4_DIR_PIN)
307
 #if AXIS_IS_L64XX(E5)
307
 #if AXIS_IS_L64XX(E5)
308
   extern L64XX_CLASS(E5)         stepperE5;
308
   extern L64XX_CLASS(E5)         stepperE5;
309
   #define E5_ENABLE_INIT()       NOOP
309
   #define E5_ENABLE_INIT()       NOOP
310
-  #define E5_ENABLE_WRITE(STATE) (STATE ? NOOP : stepperE5.free())
310
+  #define E5_ENABLE_WRITE(STATE) (STATE ? stepperE5.hardStop() : stepperE5.free())
311
   #define E5_ENABLE_READ()       (stepperE5.getStatus() & STATUS_HIZ)
311
   #define E5_ENABLE_READ()       (stepperE5.getStatus() & STATUS_HIZ)
312
   #if AXIS_DRIVER_TYPE_E5(L6474)
312
   #if AXIS_DRIVER_TYPE_E5(L6474)
313
     #define E5_DIR_INIT()        SET_OUTPUT(E5_DIR_PIN)
313
     #define E5_DIR_INIT()        SET_OUTPUT(E5_DIR_PIN)
327
 #if AXIS_IS_L64XX(E6)
327
 #if AXIS_IS_L64XX(E6)
328
   extern L64XX_CLASS(E6)         stepperE6;
328
   extern L64XX_CLASS(E6)         stepperE6;
329
   #define E6_ENABLE_INIT()       NOOP
329
   #define E6_ENABLE_INIT()       NOOP
330
-  #define E6_ENABLE_WRITE(STATE) (STATE ? NOOP : stepperE6.free())
330
+  #define E6_ENABLE_WRITE(STATE) (STATE ? stepperE6.hardStop() : stepperE6.free())
331
   #define E6_ENABLE_READ()       (stepperE6.getStatus() & STATUS_HIZ)
331
   #define E6_ENABLE_READ()       (stepperE6.getStatus() & STATUS_HIZ)
332
   #if AXIS_DRIVER_TYPE_E6(L6474)
332
   #if AXIS_DRIVER_TYPE_E6(L6474)
333
     #define E6_DIR_INIT()        SET_OUTPUT(E6_DIR_PIN)
333
     #define E6_DIR_INIT()        SET_OUTPUT(E6_DIR_PIN)
347
 #if AXIS_IS_L64XX(E7)
347
 #if AXIS_IS_L64XX(E7)
348
   extern L64XX_CLASS(E7)         stepperE7;
348
   extern L64XX_CLASS(E7)         stepperE7;
349
   #define E7_ENABLE_INIT()       NOOP
349
   #define E7_ENABLE_INIT()       NOOP
350
-  #define E7_ENABLE_WRITE(STATE) (STATE ? NOOP : stepperE7.free())
350
+  #define E7_ENABLE_WRITE(STATE) (STATE ? stepperE7.hardStop() : stepperE7.free())
351
   #define E7_ENABLE_READ()       (stepperE7.getStatus() & STATUS_HIZ)
351
   #define E7_ENABLE_READ()       (stepperE7.getStatus() & STATUS_HIZ)
352
   #if AXIS_DRIVER_TYPE_E7(L6474)
352
   #if AXIS_DRIVER_TYPE_E7(L6474)
353
     #define E7_DIR_INIT()        SET_OUTPUT(E7_DIR_PIN)
353
     #define E7_DIR_INIT()        SET_OUTPUT(E7_DIR_PIN)

Loading…
Cancel
Save