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

Revert "added ads7843 lld functions"

Browse source 
This reverts commit 163a42e48e.
This commit is contained in:
Tectu 2012-06-11 13:23:57 +02:00
parent 163a42e48e
commit df8cfae7a0
3 changed files with 28 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
drivers/ads7843.c
View file

@ -1,41 +0,0 @@
#include "drivers/ads7843.h"
#ifdef TOUCHPAD_USE_ADS7843
__inline uint16_t lld_readX(void) {
uint8_t txbuf[1];
uint8_t rxbuf[2];
uint16_t x;
txbuf[0] = 0xd0;
SET_CS(0);
spiSend(&SPID1, 1, txbuf);
spiReceive(&SPID1, 2, rxbuf);
SET_CS(1);
x = rxbuf[0] << 4;
x |= rxbuf[1] >> 4;
return x;
}
__inline uint16_t lld_readY(void) {
uint8_t txbuf[1];
uint8_t rxbuf[2];
uint16_t x;
txbuf[0] = 0x90;
SET_CS(0);
spiSend(&SPID1, 1, txbuf);
spiReceive(&SPID1, 2, rxbuf);
SET_CS(1);
x = rxbuf[0] << 4;
x |= rxbuf[1] >> 4;
return x;
}
#endif

11
drivers/ads7843.h
View file

@ -1,11 +0,0 @@
#ifndef ADS7843_H
#define ADS7843_h
#ifdef TOUCHPAD_USE_ADS7843
#include "touchpad.h"
uint16_t lld_readX(void):
uint16_t lld_readY(void)
#endif
#endif

30
touchpad.c
View file

@ -17,11 +17,37 @@ void tpInit(SPIDriver *spip) {
} }
static __inline uint16_t readX(void) { static __inline uint16_t readX(void) {
return lld_readX(); uint8_t txbuf[1];
uint8_t rxbuf[2];
uint16_t x;
txbuf[0] = 0xd0;
SET_CS(0);
spiSend(&SPID1, 1, txbuf);
spiReceive(&SPID1, 2, rxbuf);
SET_CS(1);
x = rxbuf[0] << 4;
x |= rxbuf[1] >> 4;
return x;
} }
static __inline uint16_t readY(void) { static __inline uint16_t readY(void) {
return lld_readY(); uint8_t txbuf[1];
uint8_t rxbuf[2];
uint16_t y;
txbuf[0] = 0x90;
SET_CS(0);
spiSend(&SPID1, 1, txbuf);
spiReceive(&SPID1, 2, rxbuf);
SET_CS(1);
y = rxbuf[0] << 4;
y |= rxbuf[1] >> 4;
return y;
} }
uint8_t tpIRQ(void) { uint8_t tpIRQ(void) {