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

touchpad fix

Browse source
This commit is contained in:
Tectu 2012-07-22 22:21:19 +02:00
parent 637b0b7d5d
commit 952b0b69e8
5 changed files with 17 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/touchpad/ads7843_lld.c
View file

@ -2,7 +2,7 @@
#ifdef TOUCHPAD_USE_ADS7843
__inline uint16_t lld_readX(void) {
__inline uint16_t lld_tpReadX(void) {
uint8_t txbuf[1];
uint8_t rxbuf[2];
uint16_t x;
@ -19,7 +19,7 @@ __inline uint16_t lld_readX(void) {
return x;
}
__inline uint16_t lld_readY(void) {
__inline uint16_t lld_tpReadY(void) {
uint8_t txbuf[1];
uint8_t rxbuf[2];
uint16_t y;
@ -36,7 +36,7 @@ __inline uint16_t lld_readY(void) {
return y;
}
__inline uint16_t lld_readZ(void) {
__inline uint16_t lld_tpReadZ(void) {
return 0;
}

6
drivers/touchpad/ads7843_lld.h
View file

@ -6,9 +6,9 @@
#ifdef TOUCHPAD_USE_ADS7843
uint16_t lld_readX(void);
uint16_t lld_readY(void);
uint16_t lld_readZ(void);
uint16_t lld_tpReadX(void);
uint16_t lld_tpReadY(void);
uint16_t lld_tpReadZ(void);
#endif
#endif

6
drivers/touchpad/xpt2046_lld.c
View file

@ -2,7 +2,7 @@
#ifdef TOUCHPAD_USE_XPT2046
__inline uint16_t lld_readX(void) {
__inline uint16_t lld_tpReadX(void) {
uint8_t txbuf[1];
uint8_t rxbuf[2];
uint16_t x;
@ -19,7 +19,7 @@ __inline uint16_t lld_readX(void) {
return x;
}
__inline uint16_t lld_readY(void) {
__inline uint16_t lld_tpReadY(void) {
uint8_t txbuf[1];
uint8_t rxbuf[2];
uint16_t y;
@ -36,7 +36,7 @@ __inline uint16_t lld_readY(void) {
return y;
}
__inline uint16_t lld_readZ(void) {
__inline uint16_t lld_tpReadZ(void) {
return 0;
}

6
drivers/touchpad/xpt2046_lld.h
View file

@ -6,9 +6,9 @@
#ifdef TOUCHPAD_USE_XPT2046
uint16_t lld_readX(void);
uint16_t lld_readY(void);
uint16_t lld_readZ(void);
uint16_t lld_tpReadX(void);
uint16_t lld_tpReadY(void);
uint16_t lld_tpReadZ(void);
#endif
#endif

18
touchpad/touchpad.c
View file

@ -16,14 +16,6 @@ void tpInit(SPIDriver *spip) {
spiStart(spip, &spicfg);
}
static __inline uint16_t readX(void) {
return lld_readX();
}
static __inline uint16_t readY(void) {
return lld_readY();
}
uint8_t tpIRQ(void) {
return (!palReadPad(TP_IRQ_PORT, TP_IRQ));
}
@ -33,8 +25,8 @@ static uint16_t tpReadRealX(void) {
uint16_t i, x;
for(i=0; i<CONVERSIONS; i++) {
readX();
results += readX();
lld_tpReadX();
results += lld_tpReadX();
}
x = (((SCREEN_WIDTH-1) * (results/CONVERSIONS)) / 2048);
@ -47,8 +39,8 @@ static uint16_t tpReadRealY(void) {
uint16_t i, y;
for(i=0; i<CONVERSIONS; i++) {
readY();
results += readY();
lld_tpReadY();
results += lld_tpReadY();
}
y = (((SCREEN_HEIGHT-1) * (results/CONVERSIONS)) / 2048);
@ -97,7 +89,7 @@ uint16_t tpReadY(void) {
}
uint16_t tpReadZ(void) {
return lld_readZ();
return lld_tpReadZ();
}
static void tpDrawCross(uint16_t x, uint16_t y) {