瀏覽代碼

Wrap NORM_E_DIR/REV_E_DIR macros in do{}while(0)

Scott Lahteine 7 年之前
父節點
當前提交
8d32fd997f
共有 1 個檔案被更改,包括 14 行新增14 行删除
  1. 14
    14
      Marlin/src/module/stepper_indirection.h

+ 14
- 14
Marlin/src/module/stepper_indirection.h 查看文件

79
 #if ENABLED(HAVE_L6470DRIVER) && ENABLED(X_IS_L6470)
79
 #if ENABLED(HAVE_L6470DRIVER) && ENABLED(X_IS_L6470)
80
   extern L6470 stepperX;
80
   extern L6470 stepperX;
81
   #define X_ENABLE_INIT NOOP
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
   #define X_ENABLE_READ (stepperX.getStatus() & STATUS_HIZ)
83
   #define X_ENABLE_READ (stepperX.getStatus() & STATUS_HIZ)
84
   #define X_DIR_INIT NOOP
84
   #define X_DIR_INIT NOOP
85
   #define X_DIR_WRITE(STATE) stepperX.Step_Clock(STATE)
85
   #define X_DIR_WRITE(STATE) stepperX.Step_Clock(STATE)
112
 #if ENABLED(HAVE_L6470DRIVER) && ENABLED(Y_IS_L6470)
112
 #if ENABLED(HAVE_L6470DRIVER) && ENABLED(Y_IS_L6470)
113
   extern L6470 stepperY;
113
   extern L6470 stepperY;
114
   #define Y_ENABLE_INIT NOOP
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
   #define Y_ENABLE_READ (stepperY.getStatus() & STATUS_HIZ)
116
   #define Y_ENABLE_READ (stepperY.getStatus() & STATUS_HIZ)
117
   #define Y_DIR_INIT NOOP
117
   #define Y_DIR_INIT NOOP
118
   #define Y_DIR_WRITE(STATE) stepperY.Step_Clock(STATE)
118
   #define Y_DIR_WRITE(STATE) stepperY.Step_Clock(STATE)
145
 #if ENABLED(HAVE_L6470DRIVER) && ENABLED(Z_IS_L6470)
145
 #if ENABLED(HAVE_L6470DRIVER) && ENABLED(Z_IS_L6470)
146
   extern L6470 stepperZ;
146
   extern L6470 stepperZ;
147
   #define Z_ENABLE_INIT NOOP
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
   #define Z_ENABLE_READ (stepperZ.getStatus() & STATUS_HIZ)
149
   #define Z_ENABLE_READ (stepperZ.getStatus() & STATUS_HIZ)
150
   #define Z_DIR_INIT NOOP
150
   #define Z_DIR_INIT NOOP
151
   #define Z_DIR_WRITE(STATE) stepperZ.Step_Clock(STATE)
151
   #define Z_DIR_WRITE(STATE) stepperZ.Step_Clock(STATE)
179
   #if ENABLED(HAVE_L6470DRIVER) && ENABLED(X2_IS_L6470)
179
   #if ENABLED(HAVE_L6470DRIVER) && ENABLED(X2_IS_L6470)
180
     extern L6470 stepperX2;
180
     extern L6470 stepperX2;
181
     #define X2_ENABLE_INIT NOOP
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
     #define X2_ENABLE_READ (stepperX2.getStatus() & STATUS_HIZ)
183
     #define X2_ENABLE_READ (stepperX2.getStatus() & STATUS_HIZ)
184
     #define X2_DIR_INIT NOOP
184
     #define X2_DIR_INIT NOOP
185
     #define X2_DIR_WRITE(STATE) stepperX2.Step_Clock(STATE)
185
     #define X2_DIR_WRITE(STATE) stepperX2.Step_Clock(STATE)
214
   #if ENABLED(HAVE_L6470DRIVER) && ENABLED(Y2_IS_L6470)
214
   #if ENABLED(HAVE_L6470DRIVER) && ENABLED(Y2_IS_L6470)
215
     extern L6470 stepperY2;
215
     extern L6470 stepperY2;
216
     #define Y2_ENABLE_INIT NOOP
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
     #define Y2_ENABLE_READ (stepperY2.getStatus() & STATUS_HIZ)
218
     #define Y2_ENABLE_READ (stepperY2.getStatus() & STATUS_HIZ)
219
     #define Y2_DIR_INIT NOOP
219
     #define Y2_DIR_INIT NOOP
220
     #define Y2_DIR_WRITE(STATE) stepperY2.Step_Clock(STATE)
220
     #define Y2_DIR_WRITE(STATE) stepperY2.Step_Clock(STATE)
249
   #if ENABLED(HAVE_L6470DRIVER) && ENABLED(Z2_IS_L6470)
249
   #if ENABLED(HAVE_L6470DRIVER) && ENABLED(Z2_IS_L6470)
250
     extern L6470 stepperZ2;
250
     extern L6470 stepperZ2;
251
     #define Z2_ENABLE_INIT NOOP
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
     #define Z2_ENABLE_READ (stepperZ2.getStatus() & STATUS_HIZ)
253
     #define Z2_ENABLE_READ (stepperZ2.getStatus() & STATUS_HIZ)
254
     #define Z2_DIR_INIT NOOP
254
     #define Z2_DIR_INIT NOOP
255
     #define Z2_DIR_WRITE(STATE) stepperZ2.Step_Clock(STATE)
255
     #define Z2_DIR_WRITE(STATE) stepperZ2.Step_Clock(STATE)
283
 #if ENABLED(HAVE_L6470DRIVER) && ENABLED(E0_IS_L6470)
283
 #if ENABLED(HAVE_L6470DRIVER) && ENABLED(E0_IS_L6470)
284
   extern L6470 stepperE0;
284
   extern L6470 stepperE0;
285
   #define E0_ENABLE_INIT NOOP
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
   #define E0_ENABLE_READ (stepperE0.getStatus() & STATUS_HIZ)
287
   #define E0_ENABLE_READ (stepperE0.getStatus() & STATUS_HIZ)
288
   #define E0_DIR_INIT NOOP
288
   #define E0_DIR_INIT NOOP
289
   #define E0_DIR_WRITE(STATE) stepperE0.Step_Clock(STATE)
289
   #define E0_DIR_WRITE(STATE) stepperE0.Step_Clock(STATE)
316
 #if ENABLED(HAVE_L6470DRIVER) && ENABLED(E1_IS_L6470)
316
 #if ENABLED(HAVE_L6470DRIVER) && ENABLED(E1_IS_L6470)
317
   extern L6470 stepperE1;
317
   extern L6470 stepperE1;
318
   #define E1_ENABLE_INIT NOOP
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
   #define E1_ENABLE_READ (stepperE1.getStatus() & STATUS_HIZ)
320
   #define E1_ENABLE_READ (stepperE1.getStatus() & STATUS_HIZ)
321
   #define E1_DIR_INIT NOOP
321
   #define E1_DIR_INIT NOOP
322
   #define E1_DIR_WRITE(STATE) stepperE1.Step_Clock(STATE)
322
   #define E1_DIR_WRITE(STATE) stepperE1.Step_Clock(STATE)
349
 #if ENABLED(HAVE_L6470DRIVER) && ENABLED(E2_IS_L6470)
349
 #if ENABLED(HAVE_L6470DRIVER) && ENABLED(E2_IS_L6470)
350
   extern L6470 stepperE2;
350
   extern L6470 stepperE2;
351
   #define E2_ENABLE_INIT NOOP
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
   #define E2_ENABLE_READ (stepperE2.getStatus() & STATUS_HIZ)
353
   #define E2_ENABLE_READ (stepperE2.getStatus() & STATUS_HIZ)
354
   #define E2_DIR_INIT NOOP
354
   #define E2_DIR_INIT NOOP
355
   #define E2_DIR_WRITE(STATE) stepperE2.Step_Clock(STATE)
355
   #define E2_DIR_WRITE(STATE) stepperE2.Step_Clock(STATE)
382
 #if ENABLED(HAVE_L6470DRIVER) && ENABLED(E3_IS_L6470)
382
 #if ENABLED(HAVE_L6470DRIVER) && ENABLED(E3_IS_L6470)
383
   extern L6470 stepperE3;
383
   extern L6470 stepperE3;
384
   #define E3_ENABLE_INIT NOOP
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
   #define E3_ENABLE_READ (stepperE3.getStatus() & STATUS_HIZ)
386
   #define E3_ENABLE_READ (stepperE3.getStatus() & STATUS_HIZ)
387
   #define E3_DIR_INIT NOOP
387
   #define E3_DIR_INIT NOOP
388
   #define E3_DIR_WRITE(STATE) stepperE3.Step_Clock(STATE)
388
   #define E3_DIR_WRITE(STATE) stepperE3.Step_Clock(STATE)
450
 #if ENABLED(SWITCHING_EXTRUDER)
450
 #if ENABLED(SWITCHING_EXTRUDER)
451
   #if EXTRUDERS == 2
451
   #if EXTRUDERS == 2
452
     #define E_STEP_WRITE(v) E0_STEP_WRITE(v)
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
   #elif EXTRUDERS > 4
455
   #elif EXTRUDERS > 4
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)
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
     #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)
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
   #endif
463
   #endif
464
 #elif ENABLED(MK2_MULTIPLEXER) // Even-numbered steppers are reversed
464
 #elif ENABLED(MK2_MULTIPLEXER) // Even-numbered steppers are reversed
465
   #define E_STEP_WRITE(v) E0_STEP_WRITE(v)
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
 #elif EXTRUDERS > 4
468
 #elif EXTRUDERS > 4
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)
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
   #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)
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)

Loading…
取消
儲存