cleanup

1 files changed, 6 insertions, 13 deletions

diff --git a/touchpad.c b/touchpad.c
index cb4603d4..d34ea308 100755..100644
--- a/touchpad.c
+++ b/touchpad.c
@@ -1,4 +1,5 @@
 #include "touchpad.h"
+#include "glcd.h"
 
 static void spicb(SPIDriver *spip);
 static const SPIConfig spicfg = {
@@ -12,18 +13,6 @@ void tpInit(void) {
 	spiStart(&SPID1, &spicfg);	
 }
 
-void tpWriteData(uint8_t data) {
-	uint16_t tx = 0xAA;
-
-	SET_CS(0);
-	spiSend(&SPID1, 1, &tx);
-	SET_CS(1);
-}
-
-uint16_t tpReadData(void) {
-
-}
-
 uint16_t tpReadX(void) {
 	uint8_t txbuf[1];
 	uint8_t rxbuf[2];
@@ -37,6 +26,8 @@ uint16_t tpReadX(void) {
 
 	x = rxbuf[0] << 4;
 	x |= rxbuf[1] >> 4;
+	
+	x = (((lcdGetWidth()-1) * x)/2048);
 
 	return x;
 }
@@ -55,6 +46,8 @@ uint16_t tpReadY(void) {
     y = rxbuf[0] << 4;
     y |= rxbuf[1] >> 4;
 
-    return y;
+    y = (((lcdGetHeight()-1) * y)/2048);
+
+	return y;
 }