The unified diff between revisions [81e4dce2..] 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 [81e4dce274e79dd9187ed4bd182e1d6fc0fdfb37]
# new_revision [64de686d701acb9539dc52fe0bff299405612ab0]
#
# patch "main.c"
#  from [b366dce1bedfd103e47161ada956b8569816f2f4]
#    to [7098e8a2414c2d385b9a43d19c2e3b2461ae00c0]
#
============================================================
--- main.c	b366dce1bedfd103e47161ada956b8569816f2f4
+++ main.c	7098e8a2414c2d385b9a43d19c2e3b2461ae00c0
@@ -6,7 +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))
@@ -178,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);
 
@@ -196,11 +197,7 @@ int main(void) {
 
 	putstr("prompt> ");
 
-	FP0XVAL &= ~0x04000000;
 	timer_delay_ms(1000);
-	FP0XVAL |= 0x04000000;
-	timer_delay_ms(1000);
-	FP0XVAL &= ~0x04000000;
 	if (!wmp_init())
 		putstr("WMP initialisation failed\r\n");
 
@@ -208,12 +205,15 @@ int main(void) {
 	timer_set_period(5*TIMER_MS);
 	wmp_start_zero();
 
-	FP0XVAL |= 0x04000000;
+	led_init();
 
+	init_watchdog();
+
 	/* Good luck! */
 	while (1) {
-		FP0XVAL ^= 0x04000000;
+		led_update();
 		event_dispatch();
+		watchdog_check();
 	}
 
 	return 0;