Browse Source

Add AXIS_HAS_SQUARE_WAVE shorthand

Scott Lahteine 5 years ago
parent
commit
fc73a8b004
1 changed files with 15 additions and 13 deletions
  1. 15
    13
      Marlin/src/module/stepper_indirection.h

+ 15
- 13
Marlin/src/module/stepper_indirection.h View File

@@ -95,6 +95,8 @@
95 95
 void restore_stepper_drivers();  // Called by PSU_ON
96 96
 void reset_stepper_drivers();    // Called by settings.load / settings.reset
97 97
 
98
+#define AXIS_HAS_SQUARE_WAVE(A) (AXIS_IS_TMC(A) && ENABLED(SQUARE_WAVE_STEPPING))
99
+
98 100
 // X Stepper
99 101
 #if AXIS_DRIVER_TYPE_X(L6470)
100 102
   extern L6470 stepperX;
@@ -127,7 +129,7 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
127 129
   #define X_DIR_READ READ(X_DIR_PIN)
128 130
 #endif
129 131
 #define X_STEP_INIT SET_OUTPUT(X_STEP_PIN)
130
-#if AXIS_IS_TMC(X) && ENABLED(SQUARE_WAVE_STEPPING)
132
+#if AXIS_HAS_SQUARE_WAVE(X)
131 133
   #define X_STEP_WRITE(STATE) do { if(STATE) TOGGLE(X_STEP_PIN); } while(0)
132 134
 #else
133 135
   #define X_STEP_WRITE(STATE) WRITE(X_STEP_PIN,STATE)
@@ -166,7 +168,7 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
166 168
   #define Y_DIR_READ READ(Y_DIR_PIN)
167 169
 #endif
168 170
 #define Y_STEP_INIT SET_OUTPUT(Y_STEP_PIN)
169
-#if AXIS_IS_TMC(Y) && ENABLED(SQUARE_WAVE_STEPPING)
171
+#if AXIS_HAS_SQUARE_WAVE(Y)
170 172
   #define Y_STEP_WRITE(STATE) do { if (STATE) TOGGLE(Y_STEP_PIN); } while(0)
171 173
 #else
172 174
   #define Y_STEP_WRITE(STATE) WRITE(Y_STEP_PIN,STATE)
@@ -205,7 +207,7 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
205 207
   #define Z_DIR_READ READ(Z_DIR_PIN)
206 208
 #endif
207 209
 #define Z_STEP_INIT SET_OUTPUT(Z_STEP_PIN)
208
-#if AXIS_IS_TMC(Z) && ENABLED(SQUARE_WAVE_STEPPING)
210
+#if AXIS_HAS_SQUARE_WAVE(Z)
209 211
   #define Z_STEP_WRITE(STATE) do { if(STATE) TOGGLE(Z_STEP_PIN); } while(0)
210 212
 #else
211 213
   #define Z_STEP_WRITE(STATE) WRITE(Z_STEP_PIN,STATE)
@@ -245,7 +247,7 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
245 247
     #define X2_DIR_READ READ(X2_DIR_PIN)
246 248
   #endif
247 249
   #define X2_STEP_INIT SET_OUTPUT(X2_STEP_PIN)
248
-  #if AXIS_IS_TMC(X2) && ENABLED(SQUARE_WAVE_STEPPING)
250
+  #if AXIS_HAS_SQUARE_WAVE(X2)
249 251
     #define X2_STEP_WRITE(STATE) do { if(STATE) TOGGLE(X2_STEP_PIN); } while(0)
250 252
   #else
251 253
     #define X2_STEP_WRITE(STATE) WRITE(X2_STEP_PIN,STATE)
@@ -287,7 +289,7 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
287 289
     #define Y2_DIR_READ READ(Y2_DIR_PIN)
288 290
   #endif
289 291
   #define Y2_STEP_INIT SET_OUTPUT(Y2_STEP_PIN)
290
-  #if AXIS_IS_TMC(Y2) && ENABLED(SQUARE_WAVE_STEPPING)
292
+  #if AXIS_HAS_SQUARE_WAVE(Y2)
291 293
     #define Y2_STEP_WRITE(STATE) do { if(STATE) TOGGLE(Y2_STEP_PIN); } while(0)
292 294
   #else
293 295
     #define Y2_STEP_WRITE(STATE) WRITE(Y2_STEP_PIN,STATE)
@@ -331,7 +333,7 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
331 333
     #define Z2_DIR_READ READ(Z2_DIR_PIN)
332 334
   #endif
333 335
   #define Z2_STEP_INIT SET_OUTPUT(Z2_STEP_PIN)
334
-  #if AXIS_IS_TMC(Z2) && ENABLED(SQUARE_WAVE_STEPPING)
336
+  #if AXIS_HAS_SQUARE_WAVE(Z2)
335 337
     #define Z2_STEP_WRITE(STATE) do { if(STATE) TOGGLE(Z2_STEP_PIN); } while(0)
336 338
   #else
337 339
     #define Z2_STEP_WRITE(STATE) WRITE(Z2_STEP_PIN,STATE)
@@ -375,7 +377,7 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
375 377
     #define Z3_DIR_READ READ(Z3_DIR_PIN)
376 378
   #endif
377 379
   #define Z3_STEP_INIT SET_OUTPUT(Z3_STEP_PIN)
378
-  #if AXIS_IS_TMC(Z3) && ENABLED(SQUARE_WAVE_STEPPING)
380
+  #if AXIS_HAS_SQUARE_WAVE(Z3)
379 381
     #define Z3_STEP_WRITE(STATE) do { if(STATE) TOGGLE(Z3_STEP_PIN); } while(0)
380 382
   #else
381 383
     #define Z3_STEP_WRITE(STATE) WRITE(Z3_STEP_PIN,STATE)
@@ -418,7 +420,7 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
418 420
   #define E0_DIR_READ READ(E0_DIR_PIN)
419 421
 #endif
420 422
 #define E0_STEP_INIT SET_OUTPUT(E0_STEP_PIN)
421
-#if AXIS_IS_TMC(E0) && ENABLED(SQUARE_WAVE_STEPPING)
423
+#if AXIS_HAS_SQUARE_WAVE(E0)
422 424
   #define E0_STEP_WRITE(STATE) do { if(STATE) TOGGLE(E0_STEP_PIN); } while(0)
423 425
 #else
424 426
   #define E0_STEP_WRITE(STATE) WRITE(E0_STEP_PIN,STATE)
@@ -457,7 +459,7 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
457 459
   #define E1_DIR_READ READ(E1_DIR_PIN)
458 460
 #endif
459 461
 #define E1_STEP_INIT SET_OUTPUT(E1_STEP_PIN)
460
-#if AXIS_IS_TMC(E1) && ENABLED(SQUARE_WAVE_STEPPING)
462
+#if AXIS_HAS_SQUARE_WAVE(E1)
461 463
   #define E1_STEP_WRITE(STATE) do { if(STATE) TOGGLE(E1_STEP_PIN); } while(0)
462 464
 #else
463 465
   #define E1_STEP_WRITE(STATE) WRITE(E1_STEP_PIN,STATE)
@@ -496,7 +498,7 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
496 498
   #define E2_DIR_READ READ(E2_DIR_PIN)
497 499
 #endif
498 500
 #define E2_STEP_INIT SET_OUTPUT(E2_STEP_PIN)
499
-#if AXIS_IS_TMC(E2) && ENABLED(SQUARE_WAVE_STEPPING)
501
+#if AXIS_HAS_SQUARE_WAVE(E2)
500 502
   #define E2_STEP_WRITE(STATE) do { if(STATE) TOGGLE(E2_STEP_PIN); } while(0)
501 503
 #else
502 504
   #define E2_STEP_WRITE(STATE) WRITE(E2_STEP_PIN,STATE)
@@ -535,7 +537,7 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
535 537
   #define E3_DIR_READ READ(E3_DIR_PIN)
536 538
 #endif
537 539
 #define E3_STEP_INIT SET_OUTPUT(E3_STEP_PIN)
538
-#if AXIS_IS_TMC(E3) && ENABLED(SQUARE_WAVE_STEPPING)
540
+#if AXIS_HAS_SQUARE_WAVE(E3)
539 541
   #define E3_STEP_WRITE(STATE) do { if(STATE) TOGGLE(E3_STEP_PIN); } while(0)
540 542
 #else
541 543
   #define E3_STEP_WRITE(STATE) WRITE(E3_STEP_PIN,STATE)
@@ -574,7 +576,7 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
574 576
   #define E4_DIR_READ READ(E4_DIR_PIN)
575 577
 #endif
576 578
 #define E4_STEP_INIT SET_OUTPUT(E4_STEP_PIN)
577
-#if AXIS_IS_TMC(E4) && ENABLED(SQUARE_WAVE_STEPPING)
579
+#if AXIS_HAS_SQUARE_WAVE(E4)
578 580
   #define E4_STEP_WRITE(STATE) do { if(STATE) TOGGLE(E4_STEP_PIN); } while(0)
579 581
 #else
580 582
   #define E4_STEP_WRITE(STATE) WRITE(E4_STEP_PIN,STATE)
@@ -613,7 +615,7 @@ void reset_stepper_drivers();    // Called by settings.load / settings.reset
613 615
   #define E5_DIR_READ READ(E5_DIR_PIN)
614 616
 #endif
615 617
 #define E5_STEP_INIT SET_OUTPUT(E5_STEP_PIN)
616
-#if AXIS_IS_TMC(E5) && ENABLED(SQUARE_WAVE_STEPPING)
618
+#if AXIS_HAS_SQUARE_WAVE(E5)
617 619
   #define E5_STEP_WRITE(STATE) do { if(STATE) TOGGLE(E5_STEP_PIN); } while(0)
618 620
 #else
619 621
   #define E5_STEP_WRITE(STATE) WRITE(E5_STEP_PIN,STATE)

Loading…
Cancel
Save