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

Merge pull request #5587 from thinkyhead/rc_never

Browse Source 
Define ADV_NEVER, ADV_RATE
This commit is contained in:
Scott Lahteine 2016-12-23 19:00:57 -08:00 committed by GitHub
commit 78459d5de1
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Marlin/stepper.cpp
View File

@ -91,9 +91,11 @@ volatile uint32_t Stepper::step_events_completed = 0; // The number of step even
#if ENABLED(ADVANCE) || ENABLED(LIN_ADVANCE) #if ENABLED(ADVANCE) || ENABLED(LIN_ADVANCE)
constexpr uint16_t ADV_NEVER = 65535;
uint16_t Stepper::nextMainISR = 0, uint16_t Stepper::nextMainISR = 0,
Stepper::nextAdvanceISR = 65535, Stepper::nextAdvanceISR = ADV_NEVER,
Stepper::eISR_Rate = 65535; Stepper::eISR_Rate = ADV_NEVER;
#if ENABLED(LIN_ADVANCE) #if ENABLED(LIN_ADVANCE)
volatile int Stepper::e_steps[E_STEPPERS]; volatile int Stepper::e_steps[E_STEPPERS];
@ -107,6 +109,9 @@ volatile uint32_t Stepper::step_events_completed = 0; // The number of step even
Stepper::advance_rate, Stepper::advance_rate,
Stepper::advance; Stepper::advance;
#endif #endif
#define ADV_RATE(T, L) (e_steps[TOOL_E_INDEX] ? (T) * (L) / abs(e_steps[TOOL_E_INDEX]) : ADV_NEVER)
#endif #endif
long Stepper::acceleration_time, Stepper::deceleration_time; long Stepper::acceleration_time, Stepper::deceleration_time;
@ -632,7 +637,7 @@ void Stepper::isr() {
#endif // ADVANCE or LIN_ADVANCE #endif // ADVANCE or LIN_ADVANCE
#if ENABLED(ADVANCE) || ENABLED(LIN_ADVANCE) #if ENABLED(ADVANCE) || ENABLED(LIN_ADVANCE)
eISR_Rate = !e_steps[TOOL_E_INDEX] ? 65535 : timer * step_loops / abs(e_steps[TOOL_E_INDEX]); eISR_Rate = ADV_RATE(timer, step_loops);
#endif #endif
} }
else if (step_events_completed > (uint32_t)current_block->decelerate_after) { else if (step_events_completed > (uint32_t)current_block->decelerate_after) {
@ -683,7 +688,7 @@ void Stepper::isr() {
#endif // ADVANCE or LIN_ADVANCE #endif // ADVANCE or LIN_ADVANCE
#if ENABLED(ADVANCE) || ENABLED(LIN_ADVANCE) #if ENABLED(ADVANCE) || ENABLED(LIN_ADVANCE)
eISR_Rate = !e_steps[TOOL_E_INDEX] ? 65535 : timer * step_loops / abs(e_steps[TOOL_E_INDEX]); eISR_Rate = ADV_RATE(timer, step_loops);
#endif #endif
} }
else { else {
@ -693,7 +698,7 @@ void Stepper::isr() {
if (current_block->use_advance_lead) if (current_block->use_advance_lead)
current_estep_rate[TOOL_E_INDEX] = final_estep_rate; current_estep_rate[TOOL_E_INDEX] = final_estep_rate;
eISR_Rate = !e_steps[TOOL_E_INDEX] ? 65535 : OCR1A_nominal * step_loops_nominal / abs(e_steps[TOOL_E_INDEX]); eISR_Rate = ADV_RATE(OCR1A_nominal, step_loops_nominal);
#endif #endif
@ -812,7 +817,7 @@ void Stepper::isr() {
// The next main ISR comes first // The next main ISR comes first
OCR1A = nextMainISR; OCR1A = nextMainISR;
// New interval for the next advance ISR, if any // New interval for the next advance ISR, if any
if (nextAdvanceISR && nextAdvanceISR != 65535) if (nextAdvanceISR && nextAdvanceISR != ADV_NEVER)
nextAdvanceISR -= nextMainISR; nextAdvanceISR -= nextMainISR;
// Will call Stepper::isr on the next interrupt // Will call Stepper::isr on the next interrupt
nextMainISR = 0; nextMainISR = 0;