ctdo
/
crashtest-r0ket
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor getInput() using getInputRaw()

This commit is contained in:
Stefan `Sec` Zehl 2011-07-21 20:37:04 +02:00
parent 148b2d9aee
commit 63572af567
1 changed files with 15 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
firmware/basic/keyin.c
View File

@ -1,63 +1,42 @@
#include <sysinit.h> #include <sysinit.h>
#include "basic/basic.h" #include "basic/basic.h"
uint8_t getInput(void) {
uint8_t result = BTN_NONE;
if (gpioGetValue(RB_BTN3)==0) {
while(gpioGetValue(RB_BTN3)==0);
result += BTN_UP;
}
if (gpioGetValue(RB_BTN2)==0) {
while(gpioGetValue(RB_BTN2)==0);
result += BTN_DOWN;
}
if (gpioGetValue(RB_BTN4)==0) {
while(gpioGetValue(RB_BTN4)==0);
result += BTN_ENTER;
}
if (gpioGetValue(RB_BTN0)==0) {
while(gpioGetValue(RB_BTN0)==0);
result += BTN_LEFT;
}
if (gpioGetValue(RB_BTN1)==0) {
while(gpioGetValue(RB_BTN1)==0);
result += BTN_RIGHT;
}
return result;
}
uint8_t getInputRaw(void) { uint8_t getInputRaw(void) {
uint8_t result = BTN_NONE; uint8_t result = BTN_NONE;
if (gpioGetValue(RB_BTN3)==0) { if (gpioGetValue(RB_BTN3)==0) {
result += BTN_UP; result |= BTN_UP;
} }
if (gpioGetValue(RB_BTN2)==0) { if (gpioGetValue(RB_BTN2)==0) {
result += BTN_DOWN; result |= BTN_DOWN;
} }
if (gpioGetValue(RB_BTN4)==0) { if (gpioGetValue(RB_BTN4)==0) {
result += BTN_ENTER; result |= BTN_ENTER;
} }
if (gpioGetValue(RB_BTN0)==0) { if (gpioGetValue(RB_BTN0)==0) {
result += BTN_LEFT; result |= BTN_LEFT;
} }
if (gpioGetValue(RB_BTN1)==0) { if (gpioGetValue(RB_BTN1)==0) {
result += BTN_RIGHT; result |= BTN_RIGHT;
} }
return result; return result;
} }
uint8_t getInput(void) {
uint8_t key = BTN_NONE;
key=getInputRaw();
if(key != BTN_NONE)
while(key==getInputRaw()); // Wait for any release
return key;
}
uint8_t getInputWait(void) { uint8_t getInputWait(void) {
uint8_t key; uint8_t key;
while ((key=getInput())==BTN_NONE) while ((key=getInput())==BTN_NONE)