Browse Source

Fix compile error with `*_DUAL_STEPPER_DRIVERS`

- Patch up macros in stepper.cpp
Scott Lahteine 9 years ago
parent
commit
582cd780cd
1 changed files with 7 additions and 13 deletions
  1. 7
    13
      Marlin/stepper.cpp

+ 7
- 13
Marlin/stepper.cpp View File

@@ -102,11 +102,8 @@ volatile signed char count_direction[NUM_AXIS] = { 1, 1, 1, 1 };
102 102
       X_DIR_WRITE(v); \
103 103
       X2_DIR_WRITE(v); \
104 104
     } \
105
-    else{ \
106
-      if (current_block->active_extruder) \
107
-        X2_DIR_WRITE(v); \
108
-      else \
109
-        X_DIR_WRITE(v); \
105
+    else { \
106
+      if (current_block->active_extruder) X2_DIR_WRITE(v); else X_DIR_WRITE(v); \
110 107
     }
111 108
   #define X_APPLY_STEP(v,ALWAYS) \
112 109
     if (extruder_duplication_enabled || ALWAYS) { \
@@ -114,10 +111,7 @@ volatile signed char count_direction[NUM_AXIS] = { 1, 1, 1, 1 };
114 111
       X2_STEP_WRITE(v); \
115 112
     } \
116 113
     else { \
117
-      if (current_block->active_extruder != 0) \
118
-        X2_STEP_WRITE(v); \
119
-      else \
120
-        X_STEP_WRITE(v); \
114
+      if (current_block->active_extruder != 0) X2_STEP_WRITE(v); else X_STEP_WRITE(v); \
121 115
     }
122 116
 #else
123 117
   #define X_APPLY_DIR(v,Q) X_DIR_WRITE(v)
@@ -125,16 +119,16 @@ volatile signed char count_direction[NUM_AXIS] = { 1, 1, 1, 1 };
125 119
 #endif
126 120
 
127 121
 #ifdef Y_DUAL_STEPPER_DRIVERS
128
-  #define Y_APPLY_DIR(v,Q) Y_DIR_WRITE(v), Y2_DIR_WRITE((v) != INVERT_Y2_VS_Y_DIR)
129
-  #define Y_APPLY_STEP(v,Q) Y_STEP_WRITE(v), Y2_STEP_WRITE(v)
122
+  #define Y_APPLY_DIR(v,Q) { Y_DIR_WRITE(v); Y2_DIR_WRITE((v) != INVERT_Y2_VS_Y_DIR); }
123
+  #define Y_APPLY_STEP(v,Q) { Y_STEP_WRITE(v); Y2_STEP_WRITE(v); }
130 124
 #else
131 125
   #define Y_APPLY_DIR(v,Q) Y_DIR_WRITE(v)
132 126
   #define Y_APPLY_STEP(v,Q) Y_STEP_WRITE(v)
133 127
 #endif
134 128
 
135 129
 #ifdef Z_DUAL_STEPPER_DRIVERS
136
-  #define Z_APPLY_DIR(v,Q) Z_DIR_WRITE(v), Z2_DIR_WRITE(v)
137
-  #define Z_APPLY_STEP(v,Q) Z_STEP_WRITE(v), Z2_STEP_WRITE(v)
130
+  #define Z_APPLY_DIR(v,Q) { Z_DIR_WRITE(v); Z2_DIR_WRITE(v); }
131
+  #define Z_APPLY_STEP(v,Q) { Z_STEP_WRITE(v); Z2_STEP_WRITE(v); }
138 132
 #else
139 133
   #define Z_APPLY_DIR(v,Q) Z_DIR_WRITE(v)
140 134
   #define Z_APPLY_STEP(v,Q) Z_STEP_WRITE(v)

Loading…
Cancel
Save