Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341

Dependencies:   SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed

Fork of CANary by Tick Tock

Revision:
143:88b5155622a5
Parent:
140:ab3e94eb0227
Child:
149:e9739523109f
--- a/utility.h	Sun Aug 04 20:59:27 2013 +0000
+++ b/utility.h	Mon Aug 05 03:34:06 2013 +0000
@@ -57,7 +57,7 @@
 extern float maxTemp;
 extern unsigned long Ah_x10000;
 extern unsigned long SOC_x10000;
-extern unsigned short SOH_x100;
+extern unsigned short SOH2_x100;
 extern bool metric;
 extern unsigned char lastDMode[2];
 extern unsigned char whichTouched;
@@ -68,6 +68,7 @@
 extern bool debugMode;
 extern bool shunt[96];
 extern float accV;
+extern float accV2;
 extern bool showHealth;
 extern float kWh_trip[0];
 extern float miles_trip[0];