3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use the nominal frequency to merge ticks

Browse source
This commit is contained in:
Yuri D'Elia 2019-05-19 16:32:14 +02:00
parent c6dbcc494f
commit aae5cce28f
1 changed files with 2 additions and 2 deletions

4
Firmware/stepper.cpp
View file

@ -885,7 +885,7 @@ FORCE_INLINE void advance_isr_scheduler() {
} }
// Run the next advance isr if triggered now or soon enough // Run the next advance isr if triggered now or soon enough
bool eisr = nextAdvanceISR < (TCNT1 + nextAdvanceISR / LA_FREQ_MDIV); bool eisr = nextAdvanceISR < (TCNT1 + eISR_Rate / LA_FREQ_MDIV);
if (eisr) if (eisr)
{ {
#ifdef LA_DEBUG_LOGIC #ifdef LA_DEBUG_LOGIC
@ -915,7 +915,7 @@ FORCE_INLINE void advance_isr_scheduler() {
// Schedule the next closest tick, ignoring advance if scheduled too // Schedule the next closest tick, ignoring advance if scheduled too
// soon in order to avoid skewing the regular stepper acceleration // soon in order to avoid skewing the regular stepper acceleration
if (nextAdvanceISR != ADV_NEVER && (nextAdvanceISR + TCNT1 + nextAdvanceISR / LA_FREQ_MDIV) < nextMainISR) if (nextAdvanceISR != ADV_NEVER && (nextAdvanceISR + TCNT1 + eISR_Rate / LA_FREQ_MDIV) < nextMainISR)
OCR1A = nextAdvanceISR; OCR1A = nextAdvanceISR;
else else
OCR1A = nextMainISR; OCR1A = nextMainISR;