diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-01-11 17:52:35 -0500 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-01-11 17:52:35 -0500 |
| commit | 0f867796de6f24a202463e125c1b4bc961621bf7 (patch) | |
| tree | 945b108a0a6afbaeb645bb2b9cdf8459d2ddacb7 /tmk_core | |
| parent | 29de37d5c0ea9fc6b5539ce4493c7b10a2a7f33f (diff) | |
timer 3
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common/avr/timer.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tmk_core/common/avr/timer.c b/tmk_core/common/avr/timer.c index 1a695a9aae..292b41c3a6 100644 --- a/tmk_core/common/avr/timer.c +++ b/tmk_core/common/avr/timer.c @@ -29,24 +29,24 @@ volatile uint32_t timer_count = 0; void timer_init(void) { // Timer0 CTC mode - TCCR1A = 0x02; + TCCR0A = 0x02; #if TIMER_PRESCALER == 1 - TCCR1B = 0x01; + TCCR0B = 0x01; #elif TIMER_PRESCALER == 8 - TCCR1B = 0x02; + TCCR0B = 0x02; #elif TIMER_PRESCALER == 64 - TCCR1B = 0x03; + TCCR0B = 0x03; #elif TIMER_PRESCALER == 256 - TCCR1B = 0x04; + TCCR0B = 0x04; #elif TIMER_PRESCALER == 1024 - TCCR1B = 0x05; + TCCR0B = 0x05; #else # error "Timer prescaler value is NOT vaild." #endif - OCR1A = TIMER_RAW_TOP; - TIMSK1 = (1<<OCIE1A); + OCR0A = TIMER_RAW_TOP; + TIMSK0 = (1<<OCIE0A); } inline @@ -111,7 +111,7 @@ uint32_t timer_elapsed32(uint32_t last) } // excecuted once per 1ms.(excess for just timer count?) -ISR(TIMER1_COMPA_vect) +ISR(TIMER0_COMPA_vect) { timer_count++; } |