Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341

Dependencies:   SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed

Fork of CANary by Tick Tock

Revision:
83:52b1f330a62d
Parent:
81:cf009a64eedd
Child:
87:46ac3f2519d6
--- a/utility.h	Tue Apr 16 21:55:41 2013 +0000
+++ b/utility.h	Wed Apr 17 11:48:10 2013 +0000
@@ -1,12 +1,12 @@
 // utility.h
 
-//#include "mbed.h"
 #include "CAN.h"
 #include "common.h"
 #include "TOUCH_TFTx2.h"
 #include "beep.h"
 
 extern Timer timer;
+extern Ticker msgReq;
 extern volatile unsigned short secsNoMsg;
 extern volatile unsigned short secsNoTouch;
 extern volatile bool canIdle;
@@ -60,12 +60,10 @@
     unsigned short getTimeStamp();
     void logCan (char mType, CANMessage canRXmsg);
     void logTS ();    
-    
-    void logEvent (char * errMsg); // gg - messeges    
+    void logErrMsg (char * errMsg); // gg - messeges
     //void sendCPreq();    
     //void sendTreq();    
     void sendReq();    
-
     void autoPollISR();
     void playbackISR();
     void recieve1();