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:
Wed Apr 10 12:55:22 2013 +0000
Revision:
62:ffd15edb5431
Parent:
58:4d06288d75a2
Child:
66:b7476ce7a59e
Child:
67:2022fce701d0
Merged with Gary's edit

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 22:a43df3905863 6 #include "Arial24x23.h"
TickTock 12:8e42d7ba8468 7 #include "Arial28x28.h"
TickTock 12:8e42d7ba8468 8 #include "Neu42x35.h"
TickTock 12:8e42d7ba8468 9 #include "SCProSB31x55.h"
TickTock 13:62e0f7f39ff5 10 #include "common.h"
TickTock 12:8e42d7ba8468 11
TickTock 13:62e0f7f39ff5 12 extern CANMessage lastMsg[100];
TickTock 13:62e0f7f39ff5 13 extern unsigned char indexOffset;
TickTock 13:62e0f7f39ff5 14 extern unsigned char msgChanged[100];
TickTock 13:62e0f7f39ff5 15 extern char displayLog[20][40];
TickTock 13:62e0f7f39ff5 16 extern unsigned char displayLoc;
TickTock 13:62e0f7f39ff5 17 extern char indexLastMsg[0x800];
TickTock 13:62e0f7f39ff5 18 extern unsigned char battData[256];
TickTock 13:62e0f7f39ff5 19 extern bool showCP;
TickTock 23:cd03f9c3395e 20 extern bool logEn;
TickTock 48:d1ce92104a1f 21 extern bool yesBattLog; // gg - Batt Log
TickTock 33:a277743ebdeb 22 extern bool repeatPoll;
TickTock 13:62e0f7f39ff5 23 extern unsigned char dMode[2];
TickTock 13:62e0f7f39ff5 24 extern unsigned char lastDMode[2];
TickTock 13:62e0f7f39ff5 25 extern unsigned char sMode;
TickTock 13:62e0f7f39ff5 26 extern TOUCH_TFTx2 tt;
TickTock 25:ddf0ec209f03 27 extern unsigned char dtMode;
TickTock 35:5acbd8a64a89 28 extern float accV;
TickTock 36:dbd39c315258 29 extern bool playbackEn;
TickTock 36:dbd39c315258 30 extern bool playbackOpen;
TickTock 36:dbd39c315258 31 extern float playbackInt;
TickTock 49:a3d2c5bb3cfa 32 extern float kW[39];
TickTock 49:a3d2c5bb3cfa 33 extern float mpkWh[39];
TickTock 42:4533b13b297d 34 extern unsigned char whichTouched;
TickTock 48:d1ce92104a1f 35 extern unsigned char skin;
TickTock 50:83d5864c64a0 36 extern unsigned char dtePeriod;
TickTock 49:a3d2c5bb3cfa 37 extern bool updateDTE;
TickTock 12:8e42d7ba8468 38
TickTock 12:8e42d7ba8468 39 extern "C" {
TickTock 42:4533b13b297d 40 void printLast (bool force, bool showButtons);
TickTock 42:4533b13b297d 41 void printChanged (bool force, bool showButtons);
TickTock 42:4533b13b297d 42 void printLog (bool force, bool showButtons);
TickTock 42:4533b13b297d 43 void mainDisplay (bool force, bool showButtons);
TickTock 50:83d5864c64a0 44 void dteDisplay (bool force, bool showButtons, bool showMiles);
TickTock 42:4533b13b297d 45 void braking (bool force, bool showButtons, bool prdata);
TickTock 42:4533b13b297d 46 void cpData(bool force, bool showButtons);
TickTock 47:9cc7d876dd6d 47 void cpHistogram(bool force, bool showButtons); // gg - hist
TickTock 48:d1ce92104a1f 48 void cpBarPlot(bool force, bool showButtons); // gg - cpbars
TickTock 42:4533b13b297d 49 void showDateTime(bool force, bool showButtons);
TickTock 13:62e0f7f39ff5 50 void updateDisplay(char display);
TickTock 24:6cf76ed8c432 51 void showButton(unsigned char column, unsigned char row, char * text1, char * text2, unsigned char columns, unsigned char rows);
TickTock 62:ffd15edb5431 52 void highlightButton(unsigned char column, unsigned char row, unsigned char tScn, unsigned char columns, unsigned char rows);
garygid 58:4d06288d75a2 53
TickTock 12:8e42d7ba8468 54 }