The unified diff between revisions [dea51752..] and [23a3e9a5..] 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 [dea51752ff3061ddca80de6685b04dac53ac77e1] # new_revision [23a3e9a50b4034343e3bd217d2c225dcaec064dd] # # patch "main.c" # from [9bd0eaef2d3775dda620602212855b3826601db4] # to [e1a823b4962f3e8dc43b519a1f57745854ae6689] # ============================================================ --- main.c 9bd0eaef2d3775dda620602212855b3826601db4 +++ main.c e1a823b4962f3e8dc43b519a1f57745854ae6689 @@ -4,6 +4,7 @@ #include "timer.h" #include "uart.h" #include "interrupt.h" +#include "event.h" #define PINSEL0 (*((volatile unsigned char *) 0xE002C000)) #define FP0XDIR (*((volatile unsigned int *) 0x3FFFC000)) @@ -158,19 +159,44 @@ void average_sample(void) putstr(")\r\n"); } +void timer_event_handler(void) +{ + wmp_start_sample(); +} + +void menu_handler(void); + int main(void) { - int i; init_interrupt(); init_uart(); init_i2c(); init_pins(); init_timer(); + + event_register(EVENT_UART_INPUT, menu_handler); + + event_register(EVENT_I2C_COMPLETE, wmp_event_handler); + + event_register(EVENT_TIMER, timer_event_handler); + putstr("Your entire life has been a mathematical error... a mathematical error I'm about to correct!\r\n"); + putstr("prompt> "); + while (1) { - char c; - putstr("prompt> "); - c = getch(); + FP0XVAL ^= 0x04000000; + event_dispatch(); + } + + return 0; +} + +void menu_handler(void) +{ + int i; + char c; + + while (getch(&c)) { if (c == 0x0a) continue; putch(c); @@ -193,8 +219,6 @@ int main(void) { reply("Help is not available. Try a psychiatrist."); break; case 'T': - putstr("I2C status was: "); - puthex(i2cstat); putstr(" I2C status is: "); puthex(i2c_statreg()); reply("."); @@ -202,18 +226,6 @@ int main(void) { puthex(i2c_conreg()); reply("."); break; - case 'S': - putstr("Sending START... "); - if (i2c_send_start()) - reply("OK"); - else - reply("FAIL"); - break; - case 'O': - putstr("Sending STOP... "); - i2c_send_stop(); - reply("sent"); - break; case 'I': putstr("Initialising WMP... "); if (wmp_init()) @@ -265,14 +277,16 @@ int main(void) { break; case 'P': putstr("Initialising timer... "); - timer_set_period(10000*TIMER_MS); + /* We want a 100Hz loop but two samples per iteration. + * So, we go for 200Hz. */ + timer_set_period(5*TIMER_MS); reply("done"); + wmp_start_zero(); break; default: reply("Unrecognised command."); break; } + putstr("prompt> "); } - - return 0; }