aboutsummaryrefslogtreecommitdiff
path: root/kernel/lcd3.c
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2011-03-13 23:50:49 +0000
committerDimitri Sokolyuk <demon@dim13.org>2011-03-13 23:50:49 +0000
commit577488e08517172c1e926b6f3fb15a4ca9f6633f (patch)
tree66b3c07488fb3b69d8088b5d9a2856582e5501a5 /kernel/lcd3.c
parentb4f72c586c36539fab69a6613ff40858b501a16d (diff)
admux
Diffstat (limited to 'kernel/lcd3.c')
-rw-r--r--kernel/lcd3.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/kernel/lcd3.c b/kernel/lcd3.c
index 2259da8..b4125b1 100644
--- a/kernel/lcd3.c
+++ b/kernel/lcd3.c
@@ -145,6 +145,7 @@ itohex(uint32_t x)
void
lcd(void *arg)
{
+ struct lcdarg *a = (struct lcdarg *)arg;
uint8_t i, t;
PORTDIR |= (_BV(DATA) | _BV(CLOCK) | _BV(E));
@@ -167,21 +168,21 @@ lcd(void *arg)
/* entry mode */
write_cmd(ENTRY_MODE_SET | INC_DDRAM, 39);
- snooze(100);
+ home();
mvputs(0, 0, "ADC0");
- mvputs(1, 0, "Time");
+ mvputs(1, 0, "ADC1");
for (;;) {
- extern uint16_t adcval;
/*
t = previous() - 1; // 0 is idle
for (i = 0; i < TASKS; i++)
mvputch(0, 5 + i, t == i ? '1' + t : '-');
- */
- mvputs(0, 5, itohex(adcval));
mvputs(1, 5, itohex(now()));
+ */
+ mvputs(0, 5, itohex(a->adc[0]));
+ mvputs(1, 5, itohex(a->adc[1]));
lcdargs.r = lcdargs.d + MSEC(100);
lcdargs.d += MSEC(50);