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

ADS7843 cleanup

ugfx_release_2.6
Tectu 2012-08-16 12:55:18 +02:00
parent b402228265
commit 53000e3c19
1 changed files with 248 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/touchpad/ADS7843/touchpad_lld.c
View File

@ -19,7 +19,7 @@
*/
/**
* @file touchpadADS7843/touchpad_lld.c
* @file touchpadXPT2046/touchpad_lld.c
* @brief Touchpad Driver subsystem low level driver source.
*
* @addtogroup TOUCHPAD
@ -79,9 +79,9 @@
* @notapi
*/
void tp_lld_init(const TOUCHPADDriver *tp) {
tpDriver=tp;
tpDriver = tp;
if (tpDriver->direct_init)
if(tpDriver->direct_init)
spiStart(tpDriver->spip, tpDriver->spicfg);
}
@ -99,11 +99,11 @@ void tp_lld_init(const TOUCHPADDriver *tp) {
* @notapi
*/
uint16_t tp_lld_read_value(uint8_t cmd) {
static uint8_t txbuf[3]={0};
static uint8_t rxbuf[3]={0};
static uint8_t txbuf[3] = {0};
static uint8_t rxbuf[3] = {0};
uint16_t ret;
txbuf[0]=cmd;
txbuf[0] = cmd;
spiExchange(tpDriver->spip, 3, txbuf, rxbuf);
@ -123,17 +123,16 @@ static void tp_lld_filter(void) {
uint16_t temp;
int i,j;
for (i=0; i<4; i++) {
for (j=i; j<7; j++) {
if (sampleBuf[i] > sampleBuf[j]) {
for(i = 0; i < 4; i++) {
for(j=i; j < 7; j++) {
if(sampleBuf[i] > sampleBuf[j]) {
/* Swap the values */
temp=sampleBuf[i];
sampleBuf[i]=sampleBuf[j];
sampleBuf[j]=temp;
temp = sampleBuf[i];
sampleBuf[i] = sampleBuf[j];
sampleBuf[j] = temp;
}
}
}
}
/**
@ -158,7 +157,7 @@ uint16_t tp_lld_read_x(void) {
*/
tp_lld_read_value(0xD1);
for (i=0;i<7;i++) {
for(i = 0; i < 7; i++) {
sampleBuf[i]=tp_lld_read_value(0xD1);
}
@ -198,8 +197,8 @@ uint16_t tp_lld_read_y(void) {
*/
tp_lld_read_value(0x91);
for (i=0;i<7;i++) {
sampleBuf[i]=tp_lld_read_value(0x91);
for(i = 0; i < 7; i++) {
sampleBuf[i] = tp_lld_read_value(0x91);
}
/* Switch on PENIRQ once again - perform a dummy read */
@ -232,6 +231,18 @@ uint16_t tp_lld_read_y(void) {
}
#endif
#if TOUCHPAD_HAS_PRESSURE || defined(__DOXYGEN__)
/*
* @brief Reads out the Z direction / pressure.
*
* @notapi
*/
uint16_t tp_lld_read_z(void) {
/* ToDo */
return 42;
}
#endif
#endif /* HAL_USE_TOUCHPAD */
/** @} */