Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch stepper.cpp to allow omitting steppers #4720

Merged
merged 1 commit into from
Aug 28, 2016
Merged

Patch stepper.cpp to allow omitting steppers #4720

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 27 additions & 9 deletions Marlin/stepper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,9 +289,15 @@ void Stepper::set_directions() {
count_direction[AXIS ##_AXIS] = 1; \
}

SET_STEP_DIR(X); // A
SET_STEP_DIR(Y); // B
SET_STEP_DIR(Z); // C
#if HAS_X_DIR
SET_STEP_DIR(X); // A
#endif
#if HAS_Y_DIR
SET_STEP_DIR(Y); // B
#endif
#if HAS_Z_DIR
SET_STEP_DIR(Z); // C
#endif

#if DISABLED(ADVANCE)
if (motor_direction(E_AXIS)) {
Expand Down Expand Up @@ -447,9 +453,15 @@ void Stepper::isr() {
_COUNTER(AXIS) += current_block->steps[_AXIS(AXIS)]; \
if (_COUNTER(AXIS) > 0) { _APPLY_STEP(AXIS)(!_INVERT_STEP_PIN(AXIS),0); }

STEP_ADD(X);
STEP_ADD(Y);
STEP_ADD(Z);
#if HAS_X_STEP
STEP_ADD(X);
#endif
#if HAS_Y_STEP
STEP_ADD(Y);
#endif
#if HAS_Z_STEP
STEP_ADD(Z);
#endif

#if DISABLED(ADVANCE) && DISABLED(LIN_ADVANCE)
#if ENABLED(MIXING_EXTRUDER)
Expand All @@ -474,9 +486,15 @@ void Stepper::isr() {
_APPLY_STEP(AXIS)(_INVERT_STEP_PIN(AXIS),0); \
}

STEP_IF_COUNTER(X);
STEP_IF_COUNTER(Y);
STEP_IF_COUNTER(Z);
#if HAS_X_STEP
STEP_IF_COUNTER(X);
#endif
#if HAS_Y_STEP
STEP_IF_COUNTER(Y);
#endif
#if HAS_Z_STEP
STEP_IF_COUNTER(Z);
#endif

#if DISABLED(ADVANCE) && DISABLED(LIN_ADVANCE)
#if ENABLED(MIXING_EXTRUDER)
Expand Down