Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341

Dependencies:   SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed

Fork of CANary by Tick Tock

Committer:
leafman
Date:
Mon Jun 10 12:00:48 2013 +0000
Branch:
Metric
Revision:
98:9f8bab96edff
Parent:
95:248b3c25a7df
Child:
102:fd19f777a0b4
Metric Initial Commit

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];
garygid 87:46ac3f2519d6 18
garygid 87:46ac3f2519d6 19 //extern unsigned char battData[256]; //
garygid 87:46ac3f2519d6 20 extern unsigned char battData[BatDataBufMax]; // BatDataBufMax
garygid 87:46ac3f2519d6 21
TickTock 13:62e0f7f39ff5 22 extern bool showCP;
TickTock 23:cd03f9c3395e 23 extern bool logEn;
TickTock 48:d1ce92104a1f 24 extern bool yesBattLog; // gg - Batt Log
TickTock 33:a277743ebdeb 25 extern bool repeatPoll;
TickTock 13:62e0f7f39ff5 26 extern unsigned char dMode[2];
TickTock 13:62e0f7f39ff5 27 extern unsigned char lastDMode[2];
TickTock 13:62e0f7f39ff5 28 extern unsigned char sMode;
TickTock 13:62e0f7f39ff5 29 extern TOUCH_TFTx2 tt;
TickTock 25:ddf0ec209f03 30 extern unsigned char dtMode;
TickTock 35:5acbd8a64a89 31 extern float accV;
TickTock 36:dbd39c315258 32 extern bool playbackEn;
TickTock 36:dbd39c315258 33 extern bool playbackOpen;
TickTock 36:dbd39c315258 34 extern float playbackInt;
TickTock 49:a3d2c5bb3cfa 35 extern float kW[39];
TickTock 49:a3d2c5bb3cfa 36 extern float mpkWh[39];
TickTock 42:4533b13b297d 37 extern unsigned char whichTouched;
TickTock 48:d1ce92104a1f 38 extern unsigned char skin;
TickTock 50:83d5864c64a0 39 extern unsigned char dtePeriod;
TickTock 49:a3d2c5bb3cfa 40 extern bool updateDTE;
TickTock 73:62ee8eae3a84 41 extern unsigned char tNavRow; // gg - 4x4
TickTock 73:62ee8eae3a84 42 extern unsigned short pointerSep; // log write buffer pointer separation
TickTock 95:248b3c25a7df 43 extern unsigned char battTemp_x4;
leafman 98:9f8bab96edff 44 extern bool metric;
TickTock 12:8e42d7ba8468 45
TickTock 12:8e42d7ba8468 46 extern "C" {
TickTock 42:4533b13b297d 47 void printLast (bool force, bool showButtons);
TickTock 42:4533b13b297d 48 void printChanged (bool force, bool showButtons);
TickTock 42:4533b13b297d 49 void printLog (bool force, bool showButtons);
TickTock 42:4533b13b297d 50 void mainDisplay (bool force, bool showButtons);
TickTock 50:83d5864c64a0 51 void dteDisplay (bool force, bool showButtons, bool showMiles);
TickTock 42:4533b13b297d 52 void braking (bool force, bool showButtons, bool prdata);
TickTock 42:4533b13b297d 53 void cpData(bool force, bool showButtons);
TickTock 47:9cc7d876dd6d 54 void cpHistogram(bool force, bool showButtons); // gg - hist
TickTock 48:d1ce92104a1f 55 void cpBarPlot(bool force, bool showButtons); // gg - cpbars
garygid 67:2022fce701d0 56 void showIndex(bool force, bool showButtons); // gg - index
TickTock 42:4533b13b297d 57 void showDateTime(bool force, bool showButtons);
TickTock 13:62e0f7f39ff5 58 void updateDisplay(char display);
TickTock 24:6cf76ed8c432 59 void showButton(unsigned char column, unsigned char row, char * text1, char * text2, unsigned char columns, unsigned char rows);
TickTock 62:ffd15edb5431 60 void highlightButton(unsigned char column, unsigned char row, unsigned char tScn, unsigned char columns, unsigned char rows);
leafman 98:9f8bab96edff 61 float convertDistance(float input); // LM - Metric
leafman 98:9f8bab96edff 62 float convertTemperature(float input); // LM - Metric
leafman 98:9f8bab96edff 63 char* distanceUnit(); // LM - Metric
leafman 98:9f8bab96edff 64 char* temperatureUnit(); // LM - Metric
TickTock 12:8e42d7ba8468 65 }