diff options
| author | Leo C | 2014-10-16 11:08:47 +0200 |
|---|---|---|
| committer | Leo C | 2014-10-16 11:08:47 +0200 |
| commit | 6dc26e92c20eedcfcba9e0b75a015a5b160748c5 (patch) | |
| tree | a2a7c5a22b3353b4d26b8eb1b3a8caef7f6411ac /avr/timer.c | |
| parent | 349c01b10d1f6e223f963c6cbdf6a94d0b618895 (diff) | |
| parent | 8f23e84c6a08a384d25582f9cf79c4f5549bc852 (diff) | |
| download | z180-stamp-6dc26e92c20eedcfcba9e0b75a015a5b160748c5.zip | |
Merge branch 'master' into hostcomm_avr
Diffstat (limited to 'avr/timer.c')
| -rw-r--r-- | avr/timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/avr/timer.c b/avr/timer.c index 56c7bed..e15a55b 100644 --- a/avr/timer.c +++ b/avr/timer.c @@ -19,10 +19,10 @@ volatile uint32_t timestamp; /*---------------------------------------------------------*/ -/* 1000Hz timer interrupt generated by OC2A */ +/* 1000Hz timer interrupt generated by OC3A */ /*---------------------------------------------------------*/ -ISR(TIMER2_COMPA_vect) +ISR(TIMER3_COMPA_vect) { static int_fast8_t tick_10ms; int_fast8_t i; |