Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341

Dependencies:   SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed

Fork of CANary by Tick Tock

Branch:
Metric
Revision:
121:553faf139a20
Parent:
119:0e2b641e98a2
Child:
123:a8c0042df617
--- a/displayModes.h	Mon Jul 08 02:08:08 2013 +0000
+++ b/displayModes.h	Thu Jul 11 05:29:18 2013 +0000
@@ -40,7 +40,7 @@
 extern unsigned char whichTouched;
 extern unsigned char skin;
 extern unsigned char dtePeriod;
-extern bool updateDTE;
+extern bool tock;
 extern DigitalOut led4;
 extern unsigned char tNavRow; // gg - 4x4
 extern unsigned short pointerSep; // log write buffer pointer separation
@@ -54,6 +54,9 @@
 extern bool debugMode;
 extern float unloadedV_x2;
 extern float Resr;
+extern bool shunt[96];
+extern float unloadedV_x2,Resr,curRmax,curRmin,redRmax,redRmin,incRmax,incRmin;
+extern signed short Imax, Imin;
 
 extern "C" {
     void printLast (bool force, bool showButtons);