added guiDrawKeymatrix() v1
This commit is contained in:
parent
94e949bd63
commit
e78a613078
1 changed files with 27 additions and 19 deletions
46
gui.c
46
gui.c
|
@ -25,45 +25,53 @@ static msg_t buttonThread(struct button_t *a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
static msg_t keymatrixThread(struct keymatrix_t *a) {
|
static msg_t keymatrixThread(struct keymatrix_t *a) {
|
||||||
uint16_t i, x0, y0, size, off;
|
uint16_t i, tpx, tpy, x0, y0, size, off;
|
||||||
|
|
||||||
x0 = a->x0;
|
x0 = a->x0;
|
||||||
y0 = a->y0;
|
y0 = a->y0;
|
||||||
off = a->off;
|
off = a->off;
|
||||||
size = a->size;
|
size = a->size;
|
||||||
memset(a->number, 0, sizeof(a->number));
|
memset(a->number, 0, a->digits * sizeof(a->number));
|
||||||
|
i = 0;
|
||||||
|
|
||||||
while(TRUE) {
|
while(TRUE) {
|
||||||
|
while(!tpIRQ());
|
||||||
for(i = 0; i < a->digits; i++) {
|
tpx = tpReadX();
|
||||||
while(tpIRQ());
|
tpy = tpReadY();
|
||||||
if(x >= x0 && x <= x0+size && y >= y0 && y <= y0+size)
|
if(tpx >= x0 && tpx <= x0+size && tpy >= y0 && tpy <= y0+size)
|
||||||
a->number[i] = 7;
|
a->number[i] = 7;
|
||||||
else if(x >= x0+off && x <= x0+off+size && y >= y0 && y <= y0+size)
|
else if(tpx >= x0+off && tpx <= x0+off+size && tpy >= y0 && tpy <= y0+size)
|
||||||
a->number[i] = 8;
|
a->number[i] = 8;
|
||||||
else if(x >= x0+off+off && x <= x0+off+off+size && y >= y0 && y <= y0+size)
|
else if(tpx >= x0+off+off && tpx <= x0+off+off+size && tpy >= y0 && tpy <= y0+size)
|
||||||
a->number[i] = 9;
|
a->number[i] = 9;
|
||||||
else if(x >= x0 && x <= x0+size && y >= y0+off && y <= y0+off+size)
|
else if(tpx >= x0 && tpx <= x0+size && tpy >= y0+off && tpy <= y0+off+size)
|
||||||
a->number[i] = 4;
|
a->number[i] = 4;
|
||||||
else if(x >= x0+off && x <= x0+off+size && y >= y0+off && y <= y0+off+size)
|
else if(tpx >= x0+off && tpx <= x0+off+size && tpy >= y0+off && tpy <= y0+off+size)
|
||||||
a->number[i] = 5;
|
a->number[i] = 5;
|
||||||
else if(x >= x0+off+off && x <= x0+off+off+size && y >= y0+off && y <= y0+off+size)
|
else if(tpx >= x0+off+off && tpx <= x0+off+off+size && tpy >= y0+off && tpy <= y0+off+size)
|
||||||
a->number[i] = 6;
|
a->number[i] = 6;
|
||||||
else if(x >= x0 && x <= x0+size && y >= y0+off+off && y <= y0+off+off+size)
|
else if(tpx >= x0 && tpx <= x0+size && tpy >= y0+off+off && tpy <= y0+off+off+size)
|
||||||
a->number[i] = 1;
|
a->number[i] = 1;
|
||||||
else if(x >= x0+off && x <= x0+off+size && y >= y0+off+off && y <= y0+off+off+size)
|
else if(tpx >= x0+off && tpx <= x0+off+size && tpy >= y0+off+off && tpy <= y0+off+off+size)
|
||||||
a->number[i] = 2;
|
a->number[i] = 2;
|
||||||
else if(x >= x0+off+off && x <= x0+off+off+size && y >= y0+off+off && y <= y0+off+off+size)
|
else if(tpx >= x0+off+off && tpx <= x0+off+off+size && tpy >= y0+off+off && tpy <= y0+off+off+size)
|
||||||
a->number[i] = 3;
|
a->number[i] = 3;
|
||||||
else if(x >= x0 && x <= x0+size && y >= y0+off+off+off && y <= y0+off+off+off+size)
|
else if(tpx >= x0 && tpx <= x0+size && tpy >= y0+off+off+off && tpy <= y0+off+off+off+size)
|
||||||
a->number[i] = 0;
|
a->number[i] = 0;
|
||||||
else if(x >= x0+off && x <= x0+off+size && y >= y0+off+off+off && y <= y0+off+off+off+size)
|
else if(tpx >= x0+off && tpx <= x0+off+size && tpy >= y0+off+off+off && tpy <= y0+off+off+off+size)
|
||||||
a->number[i] = 0;
|
a->number[i] = 0;
|
||||||
else if(x >= x0+off+off && x <= x0+off+off+size && y >= y0+off+off+off && y <= y0+off+off+off+size)
|
else if(tpx >= x0+off+off && tpx <= x0+off+off+size && tpy >= y0+off+off+off && tpy <= y0+off+off+off+size)
|
||||||
a->number[i] = 0;
|
a->number[i] = 0;
|
||||||
while(!tpIRQ());
|
|
||||||
|
if(i >= a->digits) {
|
||||||
|
i = 0;
|
||||||
|
memset(a->number, 0, a->digits * sizeof(a->number));
|
||||||
|
} else {
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
|
||||||
|
while(tpIRQ());
|
||||||
chThdSleepMilliseconds(a->interval);
|
chThdSleepMilliseconds(a->interval);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue