|
@@ -79,7 +79,7 @@
|
79
|
79
|
#if ENABLED(HAVE_L6470DRIVER) && ENABLED(X_IS_L6470)
|
80
|
80
|
extern L6470 stepperX;
|
81
|
81
|
#define X_ENABLE_INIT NOOP
|
82
|
|
- #define X_ENABLE_WRITE(STATE) do{if(STATE) stepperX.Step_Clock(stepperX.getStatus() & STATUS_HIZ); else stepperX.softFree();}while(0)
|
|
82
|
+ #define X_ENABLE_WRITE(STATE) do{ if (STATE) stepperX.Step_Clock(stepperX.getStatus() & STATUS_HIZ); else stepperX.softFree(); }while(0)
|
83
|
83
|
#define X_ENABLE_READ (stepperX.getStatus() & STATUS_HIZ)
|
84
|
84
|
#define X_DIR_INIT NOOP
|
85
|
85
|
#define X_DIR_WRITE(STATE) stepperX.Step_Clock(STATE)
|
|
@@ -112,7 +112,7 @@
|
112
|
112
|
#if ENABLED(HAVE_L6470DRIVER) && ENABLED(Y_IS_L6470)
|
113
|
113
|
extern L6470 stepperY;
|
114
|
114
|
#define Y_ENABLE_INIT NOOP
|
115
|
|
- #define Y_ENABLE_WRITE(STATE) do{if(STATE) stepperY.Step_Clock(stepperY.getStatus() & STATUS_HIZ); else stepperY.softFree();}while(0)
|
|
115
|
+ #define Y_ENABLE_WRITE(STATE) do{ if (STATE) stepperY.Step_Clock(stepperY.getStatus() & STATUS_HIZ); else stepperY.softFree(); }while(0)
|
116
|
116
|
#define Y_ENABLE_READ (stepperY.getStatus() & STATUS_HIZ)
|
117
|
117
|
#define Y_DIR_INIT NOOP
|
118
|
118
|
#define Y_DIR_WRITE(STATE) stepperY.Step_Clock(STATE)
|
|
@@ -145,7 +145,7 @@
|
145
|
145
|
#if ENABLED(HAVE_L6470DRIVER) && ENABLED(Z_IS_L6470)
|
146
|
146
|
extern L6470 stepperZ;
|
147
|
147
|
#define Z_ENABLE_INIT NOOP
|
148
|
|
- #define Z_ENABLE_WRITE(STATE) do{if(STATE) stepperZ.Step_Clock(stepperZ.getStatus() & STATUS_HIZ); else stepperZ.softFree();}while(0)
|
|
148
|
+ #define Z_ENABLE_WRITE(STATE) do{ if (STATE) stepperZ.Step_Clock(stepperZ.getStatus() & STATUS_HIZ); else stepperZ.softFree(); }while(0)
|
149
|
149
|
#define Z_ENABLE_READ (stepperZ.getStatus() & STATUS_HIZ)
|
150
|
150
|
#define Z_DIR_INIT NOOP
|
151
|
151
|
#define Z_DIR_WRITE(STATE) stepperZ.Step_Clock(STATE)
|
|
@@ -179,7 +179,7 @@
|
179
|
179
|
#if ENABLED(HAVE_L6470DRIVER) && ENABLED(X2_IS_L6470)
|
180
|
180
|
extern L6470 stepperX2;
|
181
|
181
|
#define X2_ENABLE_INIT NOOP
|
182
|
|
- #define X2_ENABLE_WRITE(STATE) do{if(STATE) stepperX2.Step_Clock(stepperX2.getStatus() & STATUS_HIZ); else stepperX2.softFree();}while(0)
|
|
182
|
+ #define X2_ENABLE_WRITE(STATE) do{ if (STATE) stepperX2.Step_Clock(stepperX2.getStatus() & STATUS_HIZ); else stepperX2.softFree(); }while(0)
|
183
|
183
|
#define X2_ENABLE_READ (stepperX2.getStatus() & STATUS_HIZ)
|
184
|
184
|
#define X2_DIR_INIT NOOP
|
185
|
185
|
#define X2_DIR_WRITE(STATE) stepperX2.Step_Clock(STATE)
|
|
@@ -214,7 +214,7 @@
|
214
|
214
|
#if ENABLED(HAVE_L6470DRIVER) && ENABLED(Y2_IS_L6470)
|
215
|
215
|
extern L6470 stepperY2;
|
216
|
216
|
#define Y2_ENABLE_INIT NOOP
|
217
|
|
- #define Y2_ENABLE_WRITE(STATE) do{if(STATE) stepperY2.Step_Clock(stepperY2.getStatus() & STATUS_HIZ); else stepperY2.softFree();}while(0)
|
|
217
|
+ #define Y2_ENABLE_WRITE(STATE) do{ if (STATE) stepperY2.Step_Clock(stepperY2.getStatus() & STATUS_HIZ); else stepperY2.softFree(); }while(0)
|
218
|
218
|
#define Y2_ENABLE_READ (stepperY2.getStatus() & STATUS_HIZ)
|
219
|
219
|
#define Y2_DIR_INIT NOOP
|
220
|
220
|
#define Y2_DIR_WRITE(STATE) stepperY2.Step_Clock(STATE)
|
|
@@ -249,7 +249,7 @@
|
249
|
249
|
#if ENABLED(HAVE_L6470DRIVER) && ENABLED(Z2_IS_L6470)
|
250
|
250
|
extern L6470 stepperZ2;
|
251
|
251
|
#define Z2_ENABLE_INIT NOOP
|
252
|
|
- #define Z2_ENABLE_WRITE(STATE) do{if(STATE) stepperZ2.Step_Clock(stepperZ2.getStatus() & STATUS_HIZ); else stepperZ2.softFree();}while(0)
|
|
252
|
+ #define Z2_ENABLE_WRITE(STATE) do{ if (STATE) stepperZ2.Step_Clock(stepperZ2.getStatus() & STATUS_HIZ); else stepperZ2.softFree(); }while(0)
|
253
|
253
|
#define Z2_ENABLE_READ (stepperZ2.getStatus() & STATUS_HIZ)
|
254
|
254
|
#define Z2_DIR_INIT NOOP
|
255
|
255
|
#define Z2_DIR_WRITE(STATE) stepperZ2.Step_Clock(STATE)
|
|
@@ -283,7 +283,7 @@
|
283
|
283
|
#if ENABLED(HAVE_L6470DRIVER) && ENABLED(E0_IS_L6470)
|
284
|
284
|
extern L6470 stepperE0;
|
285
|
285
|
#define E0_ENABLE_INIT NOOP
|
286
|
|
- #define E0_ENABLE_WRITE(STATE) do{if(STATE) stepperE0.Step_Clock(stepperE0.getStatus() & STATUS_HIZ); else stepperE0.softFree();}while(0)
|
|
286
|
+ #define E0_ENABLE_WRITE(STATE) do{ if (STATE) stepperE0.Step_Clock(stepperE0.getStatus() & STATUS_HIZ); else stepperE0.softFree(); }while(0)
|
287
|
287
|
#define E0_ENABLE_READ (stepperE0.getStatus() & STATUS_HIZ)
|
288
|
288
|
#define E0_DIR_INIT NOOP
|
289
|
289
|
#define E0_DIR_WRITE(STATE) stepperE0.Step_Clock(STATE)
|
|
@@ -316,7 +316,7 @@
|
316
|
316
|
#if ENABLED(HAVE_L6470DRIVER) && ENABLED(E1_IS_L6470)
|
317
|
317
|
extern L6470 stepperE1;
|
318
|
318
|
#define E1_ENABLE_INIT NOOP
|
319
|
|
- #define E1_ENABLE_WRITE(STATE) do{if(STATE) stepperE1.Step_Clock(stepperE1.getStatus() & STATUS_HIZ); else stepperE1.softFree();}while(0)
|
|
319
|
+ #define E1_ENABLE_WRITE(STATE) do{ if (STATE) stepperE1.Step_Clock(stepperE1.getStatus() & STATUS_HIZ); else stepperE1.softFree(); }while(0)
|
320
|
320
|
#define E1_ENABLE_READ (stepperE1.getStatus() & STATUS_HIZ)
|
321
|
321
|
#define E1_DIR_INIT NOOP
|
322
|
322
|
#define E1_DIR_WRITE(STATE) stepperE1.Step_Clock(STATE)
|
|
@@ -349,7 +349,7 @@
|
349
|
349
|
#if ENABLED(HAVE_L6470DRIVER) && ENABLED(E2_IS_L6470)
|
350
|
350
|
extern L6470 stepperE2;
|
351
|
351
|
#define E2_ENABLE_INIT NOOP
|
352
|
|
- #define E2_ENABLE_WRITE(STATE) do{if(STATE) stepperE2.Step_Clock(stepperE2.getStatus() & STATUS_HIZ); else stepperE2.softFree();}while(0)
|
|
352
|
+ #define E2_ENABLE_WRITE(STATE) do{ if (STATE) stepperE2.Step_Clock(stepperE2.getStatus() & STATUS_HIZ); else stepperE2.softFree(); }while(0)
|
353
|
353
|
#define E2_ENABLE_READ (stepperE2.getStatus() & STATUS_HIZ)
|
354
|
354
|
#define E2_DIR_INIT NOOP
|
355
|
355
|
#define E2_DIR_WRITE(STATE) stepperE2.Step_Clock(STATE)
|
|
@@ -382,7 +382,7 @@
|
382
|
382
|
#if ENABLED(HAVE_L6470DRIVER) && ENABLED(E3_IS_L6470)
|
383
|
383
|
extern L6470 stepperE3;
|
384
|
384
|
#define E3_ENABLE_INIT NOOP
|
385
|
|
- #define E3_ENABLE_WRITE(STATE) do{if(STATE) stepperE3.Step_Clock(stepperE3.getStatus() & STATUS_HIZ); else stepperE3.softFree();}while(0)
|
|
385
|
+ #define E3_ENABLE_WRITE(STATE) do{ if (STATE) stepperE3.Step_Clock(stepperE3.getStatus() & STATUS_HIZ); else stepperE3.softFree(); }while(0)
|
386
|
386
|
#define E3_ENABLE_READ (stepperE3.getStatus() & STATUS_HIZ)
|
387
|
387
|
#define E3_DIR_INIT NOOP
|
388
|
388
|
#define E3_DIR_WRITE(STATE) stepperE3.Step_Clock(STATE)
|
|
@@ -450,8 +450,8 @@
|
450
|
450
|
#if ENABLED(SWITCHING_EXTRUDER)
|
451
|
451
|
#if EXTRUDERS == 2
|
452
|
452
|
#define E_STEP_WRITE(v) E0_STEP_WRITE(v)
|
453
|
|
- #define NORM_E_DIR() E0_DIR_WRITE(current_block->active_extruder ? INVERT_E0_DIR : !INVERT_E0_DIR)
|
454
|
|
- #define REV_E_DIR() E0_DIR_WRITE(current_block->active_extruder ? !INVERT_E0_DIR : INVERT_E0_DIR)
|
|
453
|
+ #define NORM_E_DIR() do{ E0_DIR_WRITE(current_block->active_extruder ? INVERT_E0_DIR : !INVERT_E0_DIR); }while(0)
|
|
454
|
+ #define REV_E_DIR() do{ E0_DIR_WRITE(current_block->active_extruder ? !INVERT_E0_DIR : INVERT_E0_DIR); }while(0)
|
455
|
455
|
#elif EXTRUDERS > 4
|
456
|
456
|
#define E_STEP_WRITE(v) do{ if (current_block->active_extruder < 2) E0_STEP_WRITE(v); else if (current_block->active_extruder < 4) E1_STEP_WRITE(v); else E2_STEP_WRITE(v); }while(0)
|
457
|
457
|
#define NORM_E_DIR() do{ switch (current_block->active_extruder) { case 0: E0_DIR_WRITE(!INVERT_E0_DIR); break; case 1: E0_DIR_WRITE(INVERT_E0_DIR); break; case 2: E1_DIR_WRITE(!INVERT_E1_DIR); break; case 3: E1_DIR_WRITE(INVERT_E1_DIR); break; case 4: E2_DIR_WRITE(!INVERT_E2_DIR); } }while(0)
|
|
@@ -463,8 +463,8 @@
|
463
|
463
|
#endif
|
464
|
464
|
#elif ENABLED(MK2_MULTIPLEXER) // Even-numbered steppers are reversed
|
465
|
465
|
#define E_STEP_WRITE(v) E0_STEP_WRITE(v)
|
466
|
|
- #define NORM_E_DIR() E0_DIR_WRITE(TEST(current_block->active_extruder, 0) ? !INVERT_E0_DIR: INVERT_E0_DIR)
|
467
|
|
- #define REV_E_DIR() E0_DIR_WRITE(TEST(current_block->active_extruder, 0) ? INVERT_E0_DIR: !INVERT_E0_DIR)
|
|
466
|
+ #define NORM_E_DIR() do{ E0_DIR_WRITE(TEST(current_block->active_extruder, 0) ? !INVERT_E0_DIR: INVERT_E0_DIR); }while(0)
|
|
467
|
+ #define REV_E_DIR() do{ E0_DIR_WRITE(TEST(current_block->active_extruder, 0) ? INVERT_E0_DIR: !INVERT_E0_DIR); }while(0)
|
468
|
468
|
#elif EXTRUDERS > 4
|
469
|
469
|
#define E_STEP_WRITE(v) do{ switch (current_block->active_extruder) { case 0: E0_STEP_WRITE(v); break; case 1: E1_STEP_WRITE(v); break; case 2: E2_STEP_WRITE(v); break; case 3: E3_STEP_WRITE(v); break; case 4: E4_STEP_WRITE(v); } }while(0)
|
470
|
470
|
#define NORM_E_DIR() do{ switch (current_block->active_extruder) { case 0: E0_DIR_WRITE(!INVERT_E0_DIR); break; case 1: E1_DIR_WRITE(!INVERT_E1_DIR); break; case 2: E2_DIR_WRITE(!INVERT_E2_DIR); break; case 3: E3_DIR_WRITE(!INVERT_E3_DIR); break; case 4: E4_DIR_WRITE(!INVERT_E4_DIR); } }while(0)
|