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: common.h

Branch:
Metric
Revision:
107:e9be732c1ad4
Parent:
102:fd19f777a0b4
Child:
118:02010b18efdc
--- a/common.h	Fri Jun 28 20:26:11 2013 +0000
+++ b/common.h	Sat Jun 29 02:44:02 2013 +0000
@@ -13,7 +13,8 @@
 #define dateScreen 12
 #define configScreen 13
 #define indexScreen 14
-#define maxScreens 14
+#define tripScreen 15
+#define maxScreens 15
 
 #define btnGap 10
 #define ttSkin 0
@@ -24,13 +25,6 @@
 #define canTimeout 5
 #define userTimeout 15
 
-//#define BatDataBaseG1 0x24 
-//#define BatDataBaseG2 0x00 // Cell Pair data
-//#define BatDataBaseG3 0x2B 
-//#define BatDataBaseG4 0x20 // Temperature data 0x20 * 7 = 224
-//#define BatDataBaseG5 0x31
-//#define BatDataBufMax 0x1B2 // 7 x 3E bytes
-
 #define BatDataBaseG1 0x00 // 6 frames - SOH, SOC, Ah
 #define BatDataBaseG2 0x06 // 29 frames - Cell Pair data
 #define BatDataBaseG3 0x23 // 5 frames