summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Schodet2012-05-14 23:38:35 +0200
committerNicolas Schodet2012-05-14 23:41:42 +0200
commit54a6cc41ee4cef0d01958f9dab12493827795cc1 (patch)
treec69268b40413caf5f25712253f31058950e9fc1b
parent98b61784f4f14cce88431aeddac1af1277faf03e (diff)
digital/ai, digital/io: fix for io board after using interrupts for chrono
-rw-r--r--digital/ai/src/utils/timer.avr.c4
-rw-r--r--digital/io/src/init.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/digital/ai/src/utils/timer.avr.c b/digital/ai/src/utils/timer.avr.c
index 7045b9c8..d00278f8 100644
--- a/digital/ai/src/utils/timer.avr.c
+++ b/digital/ai/src/utils/timer.avr.c
@@ -62,7 +62,11 @@ timer_init (void)
TCCR0B = regv (FOC0A, FOC0B, 5, 4, WGM02, CS02, CS01, CS00,
0, 0, 0, 0, 0, 1, 0, 0);
#endif
+#ifdef TIMSK0
TIMSK0 = _BV (TOIE0);
+#else
+ TIMSK |= _BV (TOIE0);
+#endif
}
uint8_t
diff --git a/digital/io/src/init.c b/digital/io/src/init.c
index eda6435c..1236b11c 100644
--- a/digital/io/src/init.c
+++ b/digital/io/src/init.c
@@ -227,6 +227,6 @@ FSM_TRANS (INIT_WAIT_SECOND_JACK_OUT,
/* Set the flag to transmit to other FSM. */
init_match_is_started = 1;
/* Start the chrono. */
- chrono_init ();
+ chrono_start ();
return FSM_NEXT (INIT_WAIT_SECOND_JACK_OUT, jack_removed_from_bot);
}