uGFX
/
ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

XPT2046 cleanup

remotes/origin_old/ugfx_release_2.6
Tectu 2012-08-16 12:52:34 +02:00
parent df680e6d6e
commit b402228265
1 changed files with 61 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/touchpad/XPT2046/touchpad_lld.c
View File

@ -79,9 +79,9 @@
* @notapi * @notapi
*/ */
void tp_lld_init(const TOUCHPADDriver *tp) { void tp_lld_init(const TOUCHPADDriver *tp) {
tpDriver=tp; tpDriver = tp;
if (tpDriver->direct_init) if(tpDriver->direct_init)
spiStart(tpDriver->spip, tpDriver->spicfg); spiStart(tpDriver->spip, tpDriver->spicfg);
} }
@ -99,11 +99,11 @@ void tp_lld_init(const TOUCHPADDriver *tp) {
* @notapi * @notapi
*/ */
uint16_t tp_lld_read_value(uint8_t cmd) { uint16_t tp_lld_read_value(uint8_t cmd) {
static uint8_t txbuf[3]={0}; static uint8_t txbuf[3] = {0};
static uint8_t rxbuf[3]={0}; static uint8_t rxbuf[3] = {0};
uint16_t ret; uint16_t ret;
txbuf[0]=cmd; txbuf[0] = cmd;
spiExchange(tpDriver->spip, 3, txbuf, rxbuf); spiExchange(tpDriver->spip, 3, txbuf, rxbuf);
@ -123,17 +123,16 @@ static void tp_lld_filter(void) {
uint16_t temp; uint16_t temp;
int i,j; int i,j;
for (i=0; i<4; i++) { for(i = 0; i < 4; i++) {
for (j=i; j<7; j++) { for(j=i; j < 7; j++) {
if (sampleBuf[i] > sampleBuf[j]) { if(sampleBuf[i] > sampleBuf[j]) {
/* Swap the values */ /* Swap the values */
temp=sampleBuf[i]; temp = sampleBuf[i];
sampleBuf[i]=sampleBuf[j]; sampleBuf[i] = sampleBuf[j];
sampleBuf[j]=temp; sampleBuf[j] = temp;
} }
} }
} }
} }
/** /**
@ -158,7 +157,7 @@ uint16_t tp_lld_read_x(void) {
*/ */
tp_lld_read_value(0xD1); tp_lld_read_value(0xD1);
for (i=0;i<7;i++) { for(i = 0; i < 7; i++) {
sampleBuf[i]=tp_lld_read_value(0xD1); sampleBuf[i]=tp_lld_read_value(0xD1);
} }
@ -198,8 +197,8 @@ uint16_t tp_lld_read_y(void) {
*/ */
tp_lld_read_value(0x91); tp_lld_read_value(0x91);
for (i=0;i<7;i++) { for(i = 0; i < 7; i++) {
sampleBuf[i]=tp_lld_read_value(0x91); sampleBuf[i] = tp_lld_read_value(0x91);
} }
/* Switch on PENIRQ once again - perform a dummy read */ /* Switch on PENIRQ once again - perform a dummy read */