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:
102:fd19f777a0b4
Parent:
98:9f8bab96edff
Child:
107:e9be732c1ad4
--- a/common.h	Sat Jun 15 19:05:32 2013 +0000
+++ b/common.h	Thu Jun 20 05:35:36 2013 +0000
@@ -24,13 +24,22 @@
 #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 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
+#define BatDataBaseG4 0x28 // 3 frames - Temperature data
+#define BatDataBaseG5 0x2B // 11 frames
+#define BatDataBaseG6 0x36
 #define BatDataBufMax 0x1B2 // 7 x 3E bytes
 
+
 // gg - 4x4 touch
 // #define tNavRow = 2 ; // for 3x3
 extern unsigned char tNavRow ; // gg - 4x4