aboutsummaryrefslogtreecommitdiff
path: root/kernel/dmx.c
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2011-11-02 18:21:08 +0000
committerDimitri Sokolyuk <demon@dim13.org>2011-11-02 18:21:08 +0000
commit25a00477652beed65cb818d8708f032bfa2f0fb0 (patch)
tree2ce07626c6ea11899799ef8d6f25c687433382cd /kernel/dmx.c
parent8f3692ab517b7cc7108c4dd27ded31db55adb025 (diff)
re-add adc
Diffstat (limited to 'kernel/dmx.c')
-rw-r--r--kernel/dmx.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/kernel/dmx.c b/kernel/dmx.c
index 4b30f1e..0cd641a 100644
--- a/kernel/dmx.c
+++ b/kernel/dmx.c
@@ -20,7 +20,9 @@
#include "kernel.h"
#include "tasks.h"
-struct rgbarg rgbargs;
+uint16_t adcval[ADCCHANNELS];
+
+struct rgbarg rgbargs = { 0, 0, 0, 0, &adcval[0] };
struct pwmarg pwmargs[] = {
{ &rgbargs.r, PB2, &rgbargs.m },
@@ -28,7 +30,10 @@ struct pwmarg pwmargs[] = {
{ &rgbargs.b, PB4, &rgbargs.m }
};
+struct adcarg adcarg = { adcval };
+
struct lcdarg lcdarg;
+struct clockarg clockarg = { &lcdarg, &adcarg };
int
main()
@@ -41,7 +46,7 @@ main()
#endif
#if 1
- exec(rgb, STACK + 16, &rgbargs);
+ exec(rgb, STACK, &rgbargs);
exec(pwm, STACK, &pwmargs[0]);
exec(pwm, STACK, &pwmargs[1]);
exec(pwm, STACK, &pwmargs[2]);
@@ -52,10 +57,14 @@ main()
#endif
#if 1
+ exec(adc, STACK, &adcarg);
+#endif
+
+#if 1
exec(lcd, STACK, &lcdarg);
- exec(clock, STACK, &lcdarg);
+ exec(clock, STACK, &clockarg);
#endif
- idle();
+ IDLE();
return 0;
}