Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341

Dependencies:   SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed

Fork of CANary by Tick Tock

Revision:
145:47cdacc468a4
Parent:
144:b0c9d30dd346
Child:
146:88f7bda79d8e
--- a/main.cpp	Tue Aug 06 01:26:17 2013 +0000
+++ b/main.cpp	Tue Aug 06 03:19:24 2013 +0000
@@ -11,9 +11,7 @@
 // * Add trip history display
 
 // rev144
-// added accessory volt read from battData
-// put a copy of the config.txt on the USB drive during firmware update
-// added current trip efficiency below 10 minute efficiency to dte display
+// fixed compiler error
 
 #include "mbed.h"
 #include "CAN.h"
@@ -24,7 +22,7 @@
 #include "utility.h"
 #include "displayModes.h"
 #include "TOUCH_TFTx2.h"
-char revStr[7] = "144"; // gg - revision string, max 6 characters
+char revStr[7] = "145"; // gg - revision string, max 6 characters
 
 FATFS USBdrive;
 LocalFileSystem local("local");