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:
Mon Aug 05 03:34:06 2013 +0000
Revision:
143:88b5155622a5
Parent:
140:ab3e94eb0227
Child:
144:b0c9d30dd346
added accessory volt read from battData; put a copy of the config.txt on the USB drive during firmware update;

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
TickTock 124:0d622967b764 19 //extern unsigned char battData[256]; //
TickTock 124:0d622967b764 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 108:29b5a760adc2 24 extern bool usbEn;
TickTock 48:d1ce92104a1f 25 extern bool yesBattLog; // gg - Batt Log
TickTock 33:a277743ebdeb 26 extern bool repeatPoll;
TickTock 13:62e0f7f39ff5 27 extern unsigned char dMode[2];
TickTock 13:62e0f7f39ff5 28 extern unsigned char lastDMode[2];
TickTock 13:62e0f7f39ff5 29 extern unsigned char sMode;
TickTock 13:62e0f7f39ff5 30 extern TOUCH_TFTx2 tt;
TickTock 25:ddf0ec209f03 31 extern unsigned char dtMode;
TickTock 35:5acbd8a64a89 32 extern float accV;
TickTock 143:88b5155622a5 33 extern float accV2;
TickTock 36:dbd39c315258 34 extern bool playbackEn;
TickTock 36:dbd39c315258 35 extern bool playbackOpen;
TickTock 36:dbd39c315258 36 extern float playbackInt;
TickTock 107:e9be732c1ad4 37 extern float miles_trip[3];
TickTock 107:e9be732c1ad4 38 extern float kWh_trip[3];
TickTock 49:a3d2c5bb3cfa 39 extern float kW[39];
TickTock 49:a3d2c5bb3cfa 40 extern float mpkWh[39];
TickTock 42:4533b13b297d 41 extern unsigned char whichTouched;
TickTock 48:d1ce92104a1f 42 extern unsigned char skin;
TickTock 50:83d5864c64a0 43 extern unsigned char dtePeriod;
TickTock 121:553faf139a20 44 extern bool tock;
TickTock 108:29b5a760adc2 45 extern DigitalOut led4;
TickTock 73:62ee8eae3a84 46 extern unsigned char tNavRow; // gg - 4x4
TickTock 73:62ee8eae3a84 47 extern unsigned short pointerSep; // log write buffer pointer separation
TickTock 108:29b5a760adc2 48 extern float maxTemp;
TickTock 102:fd19f777a0b4 49 extern unsigned long Ah_x10000;
TickTock 102:fd19f777a0b4 50 extern unsigned long SOC_x10000;
TickTock 143:88b5155622a5 51 extern unsigned short SOH2_x100;
leafman 98:9f8bab96edff 52 extern bool metric;
TickTock 118:02010b18efdc 53 extern unsigned char tNavRow ; // gg - 4x4
TickTock 118:02010b18efdc 54 extern char revStr[7]; // gg - version
TickTock 118:02010b18efdc 55 extern bool debugMode;
TickTock 119:0e2b641e98a2 56 extern float unloadedV_x2;
TickTock 118:02010b18efdc 57 extern float Resr;
TickTock 121:553faf139a20 58 extern bool shunt[96];
TickTock 121:553faf139a20 59 extern float unloadedV_x2,Resr,curRmax,curRmin,redRmax,redRmin,incRmax,incRmin;
TickTock 121:553faf139a20 60 extern signed short Imax, Imin;
TickTock 131:0d926c080a65 61 extern bool showHealth;
TickTock 132:08748a67280a 62 extern float maxTripEff, minTripEff;
TickTock 140:ab3e94eb0227 63 extern bool brakeMon;
TickTock 140:ab3e94eb0227 64 //extern unsigned short chirpInt;
TickTock 12:8e42d7ba8468 65
TickTock 12:8e42d7ba8468 66 extern "C" {
TickTock 42:4533b13b297d 67 void printLast (bool force, bool showButtons);
TickTock 42:4533b13b297d 68 void printChanged (bool force, bool showButtons);
TickTock 42:4533b13b297d 69 void printLog (bool force, bool showButtons);
TickTock 42:4533b13b297d 70 void mainDisplay (bool force, bool showButtons);
TickTock 50:83d5864c64a0 71 void dteDisplay (bool force, bool showButtons, bool showMiles);
TickTock 42:4533b13b297d 72 void braking (bool force, bool showButtons, bool prdata);
TickTock 42:4533b13b297d 73 void cpData(bool force, bool showButtons);
TickTock 47:9cc7d876dd6d 74 void cpHistogram(bool force, bool showButtons); // gg - hist
TickTock 48:d1ce92104a1f 75 void cpBarPlot(bool force, bool showButtons); // gg - cpbars
garygid 67:2022fce701d0 76 void showIndex(bool force, bool showButtons); // gg - index
TickTock 42:4533b13b297d 77 void showDateTime(bool force, bool showButtons);
TickTock 13:62e0f7f39ff5 78 void updateDisplay(char display);
TickTock 24:6cf76ed8c432 79 void showButton(unsigned char column, unsigned char row, char * text1, char * text2, unsigned char columns, unsigned char rows);
TickTock 62:ffd15edb5431 80 void highlightButton(unsigned char column, unsigned char row, unsigned char tScn, unsigned char columns, unsigned char rows);
leafman 98:9f8bab96edff 81 float convertDistance(float input); // LM - Metric
leafman 98:9f8bab96edff 82 float convertTemperature(float input); // LM - Metric
leafman 98:9f8bab96edff 83 char* distanceUnit(); // LM - Metric
leafman 98:9f8bab96edff 84 char* temperatureUnit(); // LM - Metric
TickTock 12:8e42d7ba8468 85 }