fixed timer initialization. timer works now.
This commit is contained in:
parent
285732c1a0
commit
bad75eb419
12
timer.c
12
timer.c
@ -17,10 +17,10 @@
|
||||
/* timer_time gets increased on every interrupt
|
||||
* those interrupts happen every 1ms
|
||||
*/
|
||||
static volatile uint32_t timer_time;
|
||||
static volatile uint32_t _timer_time;
|
||||
|
||||
ISR(TIMER0_COMPA_vect) {
|
||||
++timer_time;
|
||||
++_timer_time;
|
||||
return;
|
||||
}
|
||||
|
||||
@ -38,7 +38,7 @@ void timer_init(void)
|
||||
cli();
|
||||
|
||||
// Reset timer to zero
|
||||
timer_time = 0;
|
||||
_timer_time = 0;
|
||||
|
||||
// - Time accuracy: 1 millisecond (corresponding frequency: 1kHz)
|
||||
// ==> F_CPU = 20Mhz
|
||||
@ -52,8 +52,8 @@ void timer_init(void)
|
||||
// provided, we can't get any closer to the desired frequency of
|
||||
// 1kHz :(
|
||||
OCR0A = 77;
|
||||
TCCR0B = (1<<WGM01);
|
||||
TCCR0A = (1<<CS02);
|
||||
TCCR0A = (1<<WGM01);
|
||||
TCCR0B = (1<<CS02);
|
||||
|
||||
// Interrupts setzen
|
||||
TIMSK0 |= (1<<OCIE0A);
|
||||
@ -72,7 +72,7 @@ inline uint32_t timer_get(void)
|
||||
|
||||
sreg = SREG;
|
||||
cli();
|
||||
t = timer_time;
|
||||
t = _timer_time;
|
||||
SREG = sreg;
|
||||
return t;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user