diff options
| author | Keith Packard <keithp@keithp.com> | 2014-02-01 00:06:30 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-02-08 20:13:38 -0800 |
| commit | d6d56c20465455b759f60a03fc96aa228ab9102e (patch) | |
| tree | 3ce6816f52695cdc9dbede972d908ba7a7d90682 | |
| parent | 1d3420e51db4d1a46237e97aeb189d2a8eba7f5e (diff) | |
altos: Enable system timer in flash loader and prod watchdog with it
This makes it possible to reflash the board without needing to disable
the watchdog.
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | src/product/ao_flash_pins.h | 2 | ||||
| -rw-r--r-- | src/stm/ao_flash_loader_stm.c | 7 | ||||
| -rw-r--r-- | src/stm/ao_timer.c | 3 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/product/ao_flash_pins.h b/src/product/ao_flash_pins.h index dd67d820..4917ee6f 100644 --- a/src/product/ao_flash_pins.h +++ b/src/product/ao_flash_pins.h @@ -27,7 +27,9 @@ #define HAS_BEEP 0 #define HAS_TASK 0 #define HAS_ECHO 0 +#ifndef HAS_TICK #define HAS_TICK 0 +#endif #define PACKET_HAS_SLAVE 0 diff --git a/src/stm/ao_flash_loader_stm.c b/src/stm/ao_flash_loader_stm.c index 2ab548cf..6bf89234 100644 --- a/src/stm/ao_flash_loader_stm.c +++ b/src/stm/ao_flash_loader_stm.c @@ -27,6 +27,13 @@ main(void) ao_usb_init(); +#if HAS_TICK + ao_timer_init(); +#endif + +#ifdef AO_FLASH_LOADER_INIT + AO_FLASH_LOADER_INIT; +#endif ao_flash_task(); return 0; } diff --git a/src/stm/ao_timer.c b/src/stm/ao_timer.c index 34f9edb9..d93531fc 100644 --- a/src/stm/ao_timer.c +++ b/src/stm/ao_timer.c @@ -53,6 +53,9 @@ void stm_systick_isr(void) #endif } #endif +#ifdef AO_TIMER_HOOK + AO_TIMER_HOOK; +#endif } } |