Disable WDT as early as possible

[bike-lights.git] / firmware / main.c

diff --git a/firmware/main.c b/firmware/main.c
index a83884b86f9408101f9bbf3a2bc91fa010b7b1be..0fbdb1e9f804421fca1a07fe69f33d72bd0890a2 100644 (file)
--- a/firmware/main.c
+++ b/firmware/main.c
@@ -3,6 +3,7 @@
 #include <avr/sleep.h>
 #include <avr/interrupt.h>
 #include <avr/power.h>
+#include <avr/wdt.h>
 
 #include "lights.h"
 
@@ -33,11 +34,14 @@ static void hw_suspend()
        susp_buttons();
 }
 
-void power_down()
+void power_down(unsigned char err)
 {
        hw_suspend();
 
        do {
+               if (err)
+                       gpio_set(0, 1);
+
                // G'night
                set_sleep_mode(SLEEP_MODE_PWR_DOWN);
                sleep_enable();
@@ -58,7 +62,18 @@ void power_down()
 
 int main(void)
 {
-       init_log();
+       unsigned char mcusr_save;
+
+       // disable the WDT if running
+       wdt_reset();
+       mcusr_save = MCUSR;
+       MCUSR = 0;
+       wdt_disable();
+
+       if (mcusr_save & _BV(WDRF)) // was watchdog reset?
+               gpio_set(0, 1);
+
+       init_log(mcusr_save);
 
        power_usi_disable(); // Once for lifetime
        ACSRA |= _BV(ACD);   // disable analog comparator
@@ -66,7 +81,7 @@ int main(void)
        log_set_state(3);
 
        hw_setup();
-       power_down();
+       power_down(mcusr_save & _BV(WDRF));
 
        sei();
 #if 1