|
@@ -182,20 +182,20 @@ volatile int32_t Stepper::endstops_trigsteps[XYZ];
|
182
|
182
|
#define LOCKED_X2_MOTOR locked_x2_motor
|
183
|
183
|
#define LOCKED_Y2_MOTOR locked_y2_motor
|
184
|
184
|
#define LOCKED_Z2_MOTOR locked_z2_motor
|
185
|
|
- #define DUAL_ENDSTOP_APPLY_STEP(AXIS,v) \
|
|
185
|
+ #define DUAL_ENDSTOP_APPLY_STEP(A,V) \
|
186
|
186
|
if (performing_homing) { \
|
187
|
|
- if (AXIS##_HOME_DIR < 0) { \
|
188
|
|
- if (!(TEST(endstops.old_endstop_bits, AXIS##_MIN) && count_direction[AXIS##_AXIS] < 0) && !LOCKED_##AXIS##_MOTOR) AXIS##_STEP_WRITE(v); \
|
189
|
|
- if (!(TEST(endstops.old_endstop_bits, AXIS##2_MIN) && count_direction[AXIS##_AXIS] < 0) && !LOCKED_##AXIS##2_MOTOR) AXIS##2_STEP_WRITE(v); \
|
|
187
|
+ if (A##_HOME_DIR < 0) { \
|
|
188
|
+ if (!(TEST(endstops.old_endstop_bits, A##_MIN) && count_direction[_AXIS(A)] < 0) && !LOCKED_##A##_MOTOR) A##_STEP_WRITE(V); \
|
|
189
|
+ if (!(TEST(endstops.old_endstop_bits, A##2_MIN) && count_direction[_AXIS(A)] < 0) && !LOCKED_##A##2_MOTOR) A##2_STEP_WRITE(V); \
|
190
|
190
|
} \
|
191
|
191
|
else { \
|
192
|
|
- if (!(TEST(endstops.old_endstop_bits, AXIS##_MAX) && count_direction[AXIS##_AXIS] > 0) && !LOCKED_##AXIS##_MOTOR) AXIS##_STEP_WRITE(v); \
|
193
|
|
- if (!(TEST(endstops.old_endstop_bits, AXIS##2_MAX) && count_direction[AXIS##_AXIS] > 0) && !LOCKED_##AXIS##2_MOTOR) AXIS##2_STEP_WRITE(v); \
|
|
192
|
+ if (!(TEST(endstops.old_endstop_bits, A##_MAX) && count_direction[_AXIS(A)] > 0) && !LOCKED_##A##_MOTOR) A##_STEP_WRITE(V); \
|
|
193
|
+ if (!(TEST(endstops.old_endstop_bits, A##2_MAX) && count_direction[_AXIS(A)] > 0) && !LOCKED_##A##2_MOTOR) A##2_STEP_WRITE(V); \
|
194
|
194
|
} \
|
195
|
195
|
} \
|
196
|
196
|
else { \
|
197
|
|
- AXIS##_STEP_WRITE(v); \
|
198
|
|
- AXIS##2_STEP_WRITE(v); \
|
|
197
|
+ A##_STEP_WRITE(V); \
|
|
198
|
+ A##2_STEP_WRITE(V); \
|
199
|
199
|
}
|
200
|
200
|
#endif
|
201
|
201
|
|