From 577488e08517172c1e926b6f3fb15a4ca9f6633f Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Sun, 13 Mar 2011 23:50:49 +0000 Subject: admux --- kernel/main.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'kernel/main.c') diff --git a/kernel/main.c b/kernel/main.c index bbcae3c..1588254 100644 --- a/kernel/main.c +++ b/kernel/main.c @@ -21,21 +21,16 @@ #include "tasks.h" uint8_t red, green, blue; -uint16_t adcval; - -struct rgbarg rgbargs[] = { - { &red, &green, &blue }, -}; +uint16_t adcval[ADCCHANNELS]; +struct rgbarg rgbargs = { &red, &green, &blue }; struct pwmarg pwmargs[] = { - { &red, PB2, 0, 0 }, - { &green, PB3, 0, 0 }, - { &blue, PB4, 0, 0 }, -}; - -struct adcarg adcarg[] = { - { 0, 0, 0, &adcval }, + { &red, PB2 }, + { &green, PB3 }, + { &blue, PB4 } }; +struct adcarg adcarg = { adcval }; +struct lcdarg lcdarg = { 0, 0, adcval }; int main() @@ -45,12 +40,12 @@ main() init_uart(); task(heartbeat, STACK, SEC(0), MSEC(10), 0); - task(rgb, STACK, SEC(0), MSEC(10), &rgbargs[0]); + task(rgb, STACK, SEC(0), MSEC(10), &rgbargs); task(cpwm, STACK, SEC(0), MSEC(10), &pwmargs[0]); task(cpwm, STACK, SEC(0), MSEC(10), &pwmargs[1]); task(cpwm, STACK, SEC(0), MSEC(10), &pwmargs[2]); - task(lcd, STACK, MSEC(40), SEC(1), 0); - task(adc, STACK, MSEC(0), MSEC(20), &adcarg[0]); + task(lcd, STACK, MSEC(40), SEC(1), &lcdarg); + task(adc, STACK, MSEC(0), MSEC(20), &adcarg); for (;;); -- cgit v1.2.3