0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Optimize stepper advance_isr

Browse source
This commit is contained in:
Scott Lahteine 2016-08-30 14:22:42 -05:00
parent 9725bcd099
commit 8c7ee4599e
1 changed files with 36 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
Marlin/stepper.cpp
View file

@ -683,29 +683,50 @@ void Stepper::isr() {
old_OCR0A += eISR_Rate; old_OCR0A += eISR_Rate;
OCR0A = old_OCR0A; OCR0A = old_OCR0A;
#define STEP_E_ONCE(INDEX) \ #define SET_E_STEP_DIR(INDEX) \
if (e_steps[INDEX] != 0) { \ E## INDEX ##_DIR_WRITE(e_steps[INDEX] <= 0 ? INVERT_E## INDEX ##_DIR : !INVERT_E## INDEX ##_DIR)
E## INDEX ##_STEP_WRITE(INVERT_E_STEP_PIN); \
if (e_steps[INDEX] < 0) { \ #define START_E_PULSE(INDEX) \
E## INDEX ##_DIR_WRITE(INVERT_E## INDEX ##_DIR); \ if (e_steps[INDEX]) E## INDEX ##_STEP_WRITE(INVERT_E_STEP_PIN)
e_steps[INDEX]++; \
} \ #define STOP_E_PULSE(INDEX) \
else { \ if (e_steps[INDEX]) { \
E## INDEX ##_DIR_WRITE(!INVERT_E## INDEX ##_DIR); \ e_steps[INDEX] < 0 ? ++e_steps[INDEX] : --e_steps[INDEX]; \
e_steps[INDEX]--; \
} \
E## INDEX ##_STEP_WRITE(!INVERT_E_STEP_PIN); \ E## INDEX ##_STEP_WRITE(!INVERT_E_STEP_PIN); \
} }
SET_E_STEP_DIR(0);
#if E_STEPPERS > 1
SET_E_STEP_DIR(1);
#if E_STEPPERS > 2
SET_E_STEP_DIR(2);
#if E_STEPPERS > 3
SET_E_STEP_DIR(3);
#endif
#endif
#endif
// Step all E steppers that have steps // Step all E steppers that have steps
for (uint8_t i = 0; i < step_loops; i++) { for (uint8_t i = 0; i < step_loops; i++) {
STEP_E_ONCE(0);
START_E_PULSE(0);
#if E_STEPPERS > 1 #if E_STEPPERS > 1
STEP_E_ONCE(1); START_E_PULSE(1);
#if E_STEPPERS > 2 #if E_STEPPERS > 2
STEP_E_ONCE(2); START_E_PULSE(2);
#if E_STEPPERS > 3 #if E_STEPPERS > 3
STEP_E_ONCE(3); START_E_PULSE(3);
#endif
#endif
#endif
STOP_E_PULSE(0);
#if E_STEPPERS > 1
STOP_E_PULSE(1);
#if E_STEPPERS > 2
STOP_E_PULSE(2);
#if E_STEPPERS > 3
STOP_E_PULSE(3);
#endif #endif
#endif #endif
#endif #endif