MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge pull request #4720 from thinkyhead/rc_allow_stepper_omission

Browse Source 
Patch stepper.cpp to allow omitting steppers
This commit is contained in:
Scott Lahteine 2016-08-27 20:36:22 -05:00 committed by GitHub
commit 8241cf9901
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Marlin/stepper.cpp
View File

@ -289,9 +289,15 @@ void Stepper::set_directions() {
count_direction[AXIS ##_AXIS] = 1; \ count_direction[AXIS ##_AXIS] = 1; \
} }
#if HAS_X_DIR
SET_STEP_DIR(X); // A SET_STEP_DIR(X); // A
#endif
#if HAS_Y_DIR
SET_STEP_DIR(Y); // B SET_STEP_DIR(Y); // B
#endif
#if HAS_Z_DIR
SET_STEP_DIR(Z); // C SET_STEP_DIR(Z); // C
#endif
#if DISABLED(ADVANCE) #if DISABLED(ADVANCE)
if (motor_direction(E_AXIS)) { if (motor_direction(E_AXIS)) {
@ -447,9 +453,15 @@ void Stepper::isr() {
_COUNTER(AXIS) += current_block->steps[_AXIS(AXIS)]; \ _COUNTER(AXIS) += current_block->steps[_AXIS(AXIS)]; \
if (_COUNTER(AXIS) > 0) { _APPLY_STEP(AXIS)(!_INVERT_STEP_PIN(AXIS),0); } if (_COUNTER(AXIS) > 0) { _APPLY_STEP(AXIS)(!_INVERT_STEP_PIN(AXIS),0); }
#if HAS_X_STEP
STEP_ADD(X); STEP_ADD(X);
#endif
#if HAS_Y_STEP
STEP_ADD(Y); STEP_ADD(Y);
#endif
#if HAS_Z_STEP
STEP_ADD(Z); STEP_ADD(Z);
#endif
#if DISABLED(ADVANCE) && DISABLED(LIN_ADVANCE) #if DISABLED(ADVANCE) && DISABLED(LIN_ADVANCE)
#if ENABLED(MIXING_EXTRUDER) #if ENABLED(MIXING_EXTRUDER)
@ -474,9 +486,15 @@ void Stepper::isr() {
_APPLY_STEP(AXIS)(_INVERT_STEP_PIN(AXIS),0); \ _APPLY_STEP(AXIS)(_INVERT_STEP_PIN(AXIS),0); \
} }
#if HAS_X_STEP
STEP_IF_COUNTER(X); STEP_IF_COUNTER(X);
#endif
#if HAS_Y_STEP
STEP_IF_COUNTER(Y); STEP_IF_COUNTER(Y);
#endif
#if HAS_Z_STEP
STEP_IF_COUNTER(Z); STEP_IF_COUNTER(Z);
#endif
#if DISABLED(ADVANCE) && DISABLED(LIN_ADVANCE) #if DISABLED(ADVANCE) && DISABLED(LIN_ADVANCE)
#if ENABLED(MIXING_EXTRUDER) #if ENABLED(MIXING_EXTRUDER)