Tick Tock / Mbed 2 deprecated CANary_merge

Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341

Dependencies:   SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed

Fork of CANary by Tick Tock

Diff: displayModes.h

Revision:
143:88b5155622a5
Parent:
140:ab3e94eb0227
Child:
144:b0c9d30dd346
--- a/displayModes.h	Sun Aug 04 20:59:27 2013 +0000
+++ b/displayModes.h	Mon Aug 05 03:34:06 2013 +0000
@@ -30,6 +30,7 @@
 extern TOUCH_TFTx2 tt;
 extern unsigned char dtMode;
 extern float accV;
+extern float accV2;
 extern bool playbackEn;
 extern bool playbackOpen;
 extern float playbackInt;
@@ -47,7 +48,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 tNavRow ; // gg - 4x4
 extern char revStr[7]; // gg - version