From 1e2fdb0ef861177a8e7be7d0102edc98dae8d456 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Thu, 15 Mar 2012 17:08:34 +0000 Subject: disable watchdog at boot --- firmware/firmware.c | 6 +++++- kernel/kernel.c | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/firmware/firmware.c b/firmware/firmware.c index e6015fe..f423d70 100644 --- a/firmware/firmware.c +++ b/firmware/firmware.c @@ -17,6 +17,7 @@ #include #include +#include #include /* depends on BAUD & F_CPU env vars */ #define TIMEOUT (F_CPU >> 4) /* ~ 1 sec */ @@ -36,11 +37,14 @@ main(void) { uint32_t c = 0; uint16_t off = 0; - uint16_t n = 0; + uint8_t n = 0; uint8_t ch = 0; uint8_t sum = 0; uint8_t state = INIT; + MCUSR = 0; + wdt_disable(); + UCSR0B = _BV(RXEN0) | _BV(TXEN0); UBRR0H = UBRRH_VALUE; UBRR0L = UBRRL_VALUE; diff --git a/kernel/kernel.c b/kernel/kernel.c index 169108c..983f052 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -116,6 +116,8 @@ init(uint8_t stack) uint8_t i; cli(); + MCUSR = 0; + wdt_disable(); /* Set up timer 1 */ TCNT1 = 0; /* reset timer */ -- cgit v1.2.3