Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341

Dependencies:   SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed

Fork of CANary by Tick Tock

Revision:
131:0d926c080a65
Parent:
130:1a9d2a6d99ce
Child:
132:08748a67280a
--- a/utility.h	Mon Jul 22 00:02:51 2013 +0000
+++ b/utility.h	Wed Jul 24 11:20:08 2013 +0000
@@ -9,9 +9,9 @@
 
 extern Timer timer;
 extern Ticker msgReq;
-extern volatile unsigned short secsNoMsg;
+extern volatile unsigned short secsNoCarCanMsg;
 extern volatile unsigned short secsNoTouch;
-extern volatile bool canIdle;
+extern volatile bool carCanIdle;
 extern volatile bool userIdle;
 extern char displayLog[20][40];
 extern unsigned char displayLoc;
@@ -66,6 +66,7 @@
 extern bool debugMode;
 extern bool shunt[96];
 extern float accV;
+extern bool showHealth;
 
 extern "C" {
     void mbed_reset();