Disable WDT as early as possible

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

diff --git a/firmware/main.c b/firmware/main.c
index efebdabafb5d2aa30571b65e49ca1683b006a2c6..0fbdb1e9f804421fca1a07fe69f33d72bd0890a2 100644 (file)
--- a/firmware/main.c
+++ b/firmware/main.c
@@ -2,41 +2,104 @@
 #include <util/delay.h>
 #include <avr/sleep.h>
 #include <avr/interrupt.h>
+#include <avr/power.h>
 #include <avr/wdt.h>
 
 #include "lights.h"
 
-void hw_setup()
+static void hw_setup()
 {
+       init_battery();
        init_pwm();
        init_adc();
        init_tmr();
        init_buttons();
 
-       pwmled_init();
-       gpio_init();
-       ambient_init();
-       pattern_init();
+       init_pwmled();
+       init_gpio();
+       init_ambient();
+       init_pattern();
+       init_control();
 
        set_sleep_mode(SLEEP_MODE_IDLE);
 }
 
-int main(void)
+static void hw_suspend()
 {
-       log_init();
-       wdt_enable(WDTO_1S);
+       susp_pwm();
+       susp_adc();
+       susp_tmr();
+       susp_gpio();
+       susp_ambient();
+       susp_buttons();
+}
+
+void power_down(unsigned char err)
+{
+       hw_suspend();
+
+       do {
+               if (err)
+                       gpio_set(0, 1);
 
-       _delay_ms(100);
+               // G'night
+               set_sleep_mode(SLEEP_MODE_PWR_DOWN);
+               sleep_enable();
+               sleep_bod_disable();
+               sei();
+               sleep_cpu();
 
+               // G'morning
+               cli();
+               sleep_disable();
+
+               // allow wakeup by long button-press only
+       } while (!buttons_wait_for_release());
+
+       // ok, so I will wake up
        hw_setup();
+}
+
+int main(void)
+{
+       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
 
        log_set_state(3);
 
+       hw_setup();
+       power_down(mcusr_save & _BV(WDRF));
+
        sei();
 #if 1
        while (1) {
-               wdt_reset();
-               sleep_mode();
+               cli();
+               if (TIMER1_IS_ON()) {
+                       set_sleep_mode(SLEEP_MODE_IDLE);
+               } else if (adc_is_on) {
+                       set_sleep_mode(SLEEP_MODE_ADC);
+               } else {
+                       set_sleep_mode(SLEEP_MODE_PWR_DOWN);
+               }
+
+               sleep_enable();
+               // keep BOD active, no sleep_bod_disable();
+               sei();
+               sleep_cpu();
+               sleep_disable();
        }
 #endif