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:
120:041edeec08f5
Child:
122:138a40892a4c
--- a/utility.h	Mon Jul 08 02:08:08 2013 +0000
+++ b/utility.h	Thu Jul 11 05:29:18 2013 +0000
@@ -27,15 +27,11 @@
 extern char indexLastMsg[0x800];
 extern unsigned char dMode[2];
 extern unsigned char msgChanged[100];
-
-//extern unsigned char battData[256]; // 
 extern unsigned char battData[BatDataBufMax]; // BatDataBufMax
-
 extern CANMessage lastMsg[100];
 extern CAN can1,can2;
 extern unsigned int fwCount;
 extern DigitalOut can1SleepMode,can2SleepMode;
-//extern DigitalInOut can1SleepMode,can2SleepMode;
 extern bool tick;
 extern bool ZeroSecTick;
 extern bool headlights;
@@ -64,9 +60,11 @@
 extern unsigned char lastDMode[2];
 extern unsigned char whichTouched;
 extern float unloadedV_x2,Resr,curRmax,curRmin,redRmax,redRmin,incRmax,incRmin;
+extern signed short Imax, Imin;
 extern unsigned char tNavRow ; // gg - 4x4
 extern char revStr[7]; // gg - version
 extern bool debugMode;
+extern bool shunt[96];
 
 extern "C" {
     void mbed_reset();