Diff: TOUCH_TFTx2.cpp

Revision:

16:bee053b17977

Parent:

15:f2165aa0daa6

diff -r f2165aa0daa6 -r bee053b17977 TOUCH_TFTx2.cpp
--- a/TOUCH_TFTx2.cpp	Mon May 12 03:19:02 2014 +0000
+++ b/TOUCH_TFTx2.cpp	Sun May 18 12:45:30 2014 +0000
@@ -21,14 +21,27 @@
 #define accuracy 1000 // noise filter
 #define numsamp 16 // number of averaging samples
 
+#if USE_ILI9341== 1
 TOUCH_TFTx2::TOUCH_TFTx2(PinName xp, PinName xm, PinName yp, PinName ym,
-                     PinName mosi, PinName miso, PinName sclk, PinName cs0, PinName cs1, PinName reset, PinName dc,const char* name):
+                     PinName mosi, PinName miso, PinName sclk, PinName cs0, 
+                     PinName cs1, PinName reset, PinName dc, 
+                     const char* name):
         _xp(xp),_xm(xm),_yp(yp),_ym(ym),_ax(xp),_ay(yp),
-        SPI_TFTx2(mosi,miso,sclk,cs0,cs1,reset,dc,name) {
+        SPI_TFTx2_ILI9341(mosi,miso,sclk,cs0,cs1,reset,dc,name) {
     xa = xp;
     ya = yp;
-
 }
+#else
+TOUCH_TFTx2::TOUCH_TFTx2(PinName xp, PinName xm, PinName yp, PinName ym,
+                     PinName mosi, PinName miso, PinName sclk, PinName cs0, 
+                     PinName cs1, PinName reset, 
+                     const char* name):
+        _xp(xp),_xm(xm),_yp(yp),_ym(ym),_ax(xp),_ay(yp),
+        SPI_TFTx2(mosi,miso,sclk,cs0,cs1,reset,name) {
+    xa = xp;
+    ya = yp;
+}
+#endif
 
 point TOUCH_TFTx2::get_touch() {
     unsigned short x1, x2=0, y1, y2=0, i=0, j=0, k;