The unified diff between revisions [d0420ebd..] and [64de686d..] is displayed below. It can also be downloaded as a raw diff.
This diff has been restricted to the following files: 'main.c'
# # old_revision [d0420ebd87c820e33a32b29727989516e15980a8] # new_revision [64de686d701acb9539dc52fe0bff299405612ab0] # # patch "main.c" # from [958bdc83e26a4a7dda991daabf259c44079bc7c5] # to [7098e8a2414c2d385b9a43d19c2e3b2461ae00c0] # ============================================================ --- main.c 958bdc83e26a4a7dda991daabf259c44079bc7c5 +++ main.c 7098e8a2414c2d385b9a43d19c2e3b2461ae00c0 @@ -6,8 +6,9 @@ #include "uart.h" #include "interrupt.h" #include "event.h" -#include "stick.h" #include "led.h" +#include "status.h" +#include "watchdog.h" #define PINSEL0 (*((volatile unsigned int *) 0xE002C000)) #define PINSEL1 (*((volatile unsigned int *) 0xE002C004)) @@ -179,13 +180,12 @@ int main(void) { void menu_handler(void); int main(void) { - armed = FALSE; - init_interrupt(); init_uart(); init_i2c(); init_pins(); init_timer(); + init_status(); event_register(EVENT_UART_INPUT, menu_handler); @@ -197,11 +197,7 @@ int main(void) { putstr("prompt> "); - led_set(FALSE); timer_delay_ms(1000); - led_set(TRUE); - timer_delay_ms(1000); - led_set(FALSE); if (!wmp_init()) putstr("WMP initialisation failed\r\n"); @@ -209,12 +205,15 @@ int main(void) { timer_set_period(5*TIMER_MS); wmp_start_zero(); - led_set_pattern(led_pattern_active); + led_init(); + init_watchdog(); + /* Good luck! */ while (1) { led_update(); event_dispatch(); + watchdog_check(); } return 0;