Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341

Dependencies:   SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed

Fork of CANary by Tick Tock

Committer:
TickTock
Date:
Sat May 17 13:29:40 2014 +0000
Revision:
185:f45e18d7b801
Parent:
180:5fdeeb86f3a3
Merge branch

Who changed what in which revision?

UserRevisionLine numberNew contents of line
TickTock 13:62e0f7f39ff5 1 #define offScreen 0
TickTock 13:62e0f7f39ff5 2 #define logScreen 1
TickTock 41:8d4609ea7259 3 #define mainScreen 2
TickTock 13:62e0f7f39ff5 4 #define brakeScreen 3
TickTock 50:83d5864c64a0 5 #define effScreen 4
TickTock 50:83d5864c64a0 6 #define dteScreen 5
TickTock 50:83d5864c64a0 7 #define cpScreen 6
TickTock 50:83d5864c64a0 8 #define cpHistScreen 7
TickTock 50:83d5864c64a0 9 #define cpBarScreen 8
TickTock 50:83d5864c64a0 10 #define monitorScreen 9
TickTock 50:83d5864c64a0 11 #define changedScreen 10
TickTock 50:83d5864c64a0 12 #define playbackScreen 11
TickTock 50:83d5864c64a0 13 #define dateScreen 12
leafman 98:9f8bab96edff 14 #define configScreen 13
TickTock 157:1a100a5ed06f 15 #define config2Screen 14
TickTock 157:1a100a5ed06f 16 #define indexScreen 15
TickTock 157:1a100a5ed06f 17 #define tripScreen 16
TickTock 168:9227024c4e3a 18 #define ccTripScreen 17
TickTock 168:9227024c4e3a 19 #define healthScreen 18
TickTock 168:9227024c4e3a 20 #define testScreen 19
TickTock 178:bf6404312c45 21 #define whpgScreen 20
TickTock 180:5fdeeb86f3a3 22 #define whScreen 21
TickTock 180:5fdeeb86f3a3 23 #define maxScreens 21
garygid 54:6ce808d0995e 24
TickTock 25:ddf0ec209f03 25 #define btnGap 10
TickTock 48:d1ce92104a1f 26 #define ttSkin 0
TickTock 48:d1ce92104a1f 27 #define ggSkin 1
garygid 65:821fc79cd7fe 28 #define maxSkin 1
TickTock 25:ddf0ec209f03 29
TickTock 84:fd21e5d32dab 30 #define maxBufLen 1024
TickTock 134:ad243e4f1a17 31 #define canTimeout 10
TickTock 35:5acbd8a64a89 32 #define userTimeout 15
garygid 87:46ac3f2519d6 33
TickTock 124:0d622967b764 34 #define BatDataBaseG1 0x00 // 6 frames - SOH, SOC, Ah
TickTock 124:0d622967b764 35 #define BatDataBaseG2 0x06 // 29 frames - Cell Pair data
TickTock 124:0d622967b764 36 #define BatDataBaseG3 0x23 // 5 frames
TickTock 124:0d622967b764 37 #define BatDataBaseG4 0x28 // 3 frames - Temperature data
TickTock 124:0d622967b764 38 #define BatDataBaseG5 0x2B // 11 frames
TickTock 124:0d622967b764 39 #define BatDataBaseG6 0x36 // 4 frames
TickTock 124:0d622967b764 40 #define BatDataBaseG7 0x3A
TickTock 124:0d622967b764 41 #define BatDataBufMax 0x196 // 7 x 3A bytes
TickTock 120:041edeec08f5 42
TickTock 134:ad243e4f1a17 43 #define VP230Sleep 0 // Set to 0 if using VP231 (sleep disables RX)
TickTock 134:ad243e4f1a17 44
TickTock 140:ab3e94eb0227 45 #define minTirePressure 128 // 34psi X 4