Tick Tock / TOUCH_TFTx2

Modified to work with two displays

Dependents:   touch2 default CANary_9341_test CANary_merge

Fork of Touch_tft by Peter Drescher

Files at this revision

API Documentation at this revision

Revision 15:f2165aa0daa6, committed 2014-05-12

Comitter:
TickTock
Date:
Mon May 12 03:19:02 2014 +0000
Parent:
14:c58c98c5020a
Child:
16:bee053b17977
Commit message:
works with new display controller

Changed in this revision

TOUCH_TFTx2.cpp Show annotated file Show diff for this revision Revisions of this file
TOUCH_TFTx2.h Show annotated file Show diff for this revision Revisions of this file 
--- a/TOUCH_TFTx2.cpp	Fri Aug 02 05:12:51 2013 +0000
+++ b/TOUCH_TFTx2.cpp	Mon May 12 03:19:02 2014 +0000
@@ -22,9 +22,9 @@
 #define numsamp 16 // number of averaging samples
 
 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):
+                     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,name) {
+        SPI_TFTx2(mosi,miso,sclk,cs0,cs1,reset,dc,name) {
     xa = xp;
     ya = yp;
 

--- a/TOUCH_TFTx2.h	Fri Aug 02 05:12:51 2013 +0000
+++ b/TOUCH_TFTx2.h	Mon May 12 03:19:02 2014 +0000
@@ -15,7 +15,7 @@
 #define MBED_TOUCH_H
 
 #include "mbed.h"
-#include "SPI_TFTx2.h"
+#include "SPI_TFTx2_ILI9341.h"
 
 struct point{
        unsigned short x;
@@ -34,9 +34,10 @@
      * @param mosi,miso,sclk SPI connection to TFT
      * @param cs pin connected to CS of display
      * @param reset pin connected to RESET of display 
+     * @param dc pin connected to WR of display
      * based on my SPI_TFT lib
      */
-    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 ="TFT");
+    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 ="TFT");
 
     unsigned short x0_off,y0_off;
     unsigned short x0_pp,y0_pp;