3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avr: Make sure timer_high and timer_event() stay in sync 

Schedule the next wakeup time of timer_event() using timer_high.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2017-08-10 13:11:27 -04:00
parent 1051a52755
commit 8ebba6d27a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/avr/timer.c
View File

@ -137,16 +137,20 @@ timer_read_time(void)
static uint_fast8_t static uint_fast8_t
timer_event(struct timer *t) timer_event(struct timer *t)
{ {
union u32_u *nextwake = (void*)&wrap_timer.waketime;
if (TIFR1 & (1<<TOV1)) { if (TIFR1 & (1<<TOV1)) {
// Hardware timer has overflowed - update overflow counter // Hardware timer has overflowed - update overflow counter
TIFR1 = 1<<TOV1; TIFR1 = 1<<TOV1;
timer_high++; timer_high++;
*nextwake = (union u32_u){ .hi = timer_high, .lo = 0x8000 };
} else {
*nextwake = (union u32_u){ .hi = timer_high + 1, .lo = 0x0000 };
} }
wrap_timer.waketime += 0x8000;
return SF_RESCHEDULE; return SF_RESCHEDULE;
} }
static struct timer wrap_timer = { static struct timer wrap_timer = {
.func = timer_event, .func = timer_event,
.waketime = 0x8000,
}; };
#define TIMER_IDLE_REPEAT_TICKS 8000 #define TIMER_IDLE_REPEAT_TICKS 8000