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:
Sun Mar 03 17:06:12 2013 +0000
Revision:
13:62e0f7f39ff5
Parent:
12:8e42d7ba8468
Child:
22:a43df3905863
More partitioning

Who changed what in which revision?

UserRevisionLine numberNew contents of line
TickTock 12:8e42d7ba8468 1 // This contains all the display subroutines
TickTock 12:8e42d7ba8468 2
TickTock 12:8e42d7ba8468 3 #include "TOUCH_TFTx2.h"
TickTock 12:8e42d7ba8468 4 #include "Arial12x12.h"
TickTock 12:8e42d7ba8468 5 #include "Arial12x12_prop.h"
TickTock 12:8e42d7ba8468 6 #include "Arial28x28.h"
TickTock 12:8e42d7ba8468 7 #include "Neu42x35.h"
TickTock 12:8e42d7ba8468 8 #include "SCProSB31x55.h"
TickTock 13:62e0f7f39ff5 9 #include "common.h"
TickTock 12:8e42d7ba8468 10
TickTock 13:62e0f7f39ff5 11 extern CANMessage lastMsg[100];
TickTock 13:62e0f7f39ff5 12 extern unsigned char indexOffset;
TickTock 13:62e0f7f39ff5 13 extern unsigned char msgChanged[100];
TickTock 13:62e0f7f39ff5 14 extern char displayLog[20][40];
TickTock 13:62e0f7f39ff5 15 extern unsigned char displayLoc;
TickTock 13:62e0f7f39ff5 16 extern char indexLastMsg[0x800];
TickTock 13:62e0f7f39ff5 17 extern unsigned char battData[256];
TickTock 13:62e0f7f39ff5 18 extern bool showCP;
TickTock 13:62e0f7f39ff5 19 extern unsigned char dMode[2];
TickTock 13:62e0f7f39ff5 20 extern unsigned char lastDMode[2];
TickTock 13:62e0f7f39ff5 21 extern unsigned char sMode;
TickTock 13:62e0f7f39ff5 22 extern TOUCH_TFTx2 tt;
TickTock 12:8e42d7ba8468 23
TickTock 12:8e42d7ba8468 24 extern "C" {
TickTock 13:62e0f7f39ff5 25 void printLast (bool force);
TickTock 13:62e0f7f39ff5 26 void printChanged (bool force);
TickTock 13:62e0f7f39ff5 27 void printLog (bool force);
TickTock 13:62e0f7f39ff5 28 void printDTE (bool force);
TickTock 13:62e0f7f39ff5 29 void braking (bool force, bool prdata);
TickTock 13:62e0f7f39ff5 30 void cpData(bool force);
TickTock 13:62e0f7f39ff5 31 void updateDisplay(char display);
TickTock 12:8e42d7ba8468 32 }