Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341
Dependencies: SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed
Fork of CANary by
Diff: displayModes.h
- Revision:
- 148:6e3b9135fad2
- Parent:
- 144:b0c9d30dd346
- Child:
- 149:e9739523109f
--- a/displayModes.h Wed Aug 07 13:36:13 2013 +0000 +++ b/displayModes.h Thu Sep 12 14:42:22 2013 +0000 @@ -62,6 +62,7 @@ extern float maxTripEff, minTripEff; extern bool brakeMon; extern float curEff; +extern unsigned short uMsgId[8]; extern "C" { void printLast (bool force, bool showButtons); @@ -79,7 +80,8 @@ void showButton(unsigned char column, unsigned char row, char * text1, char * text2, unsigned char columns, unsigned char rows); void highlightButton(unsigned char column, unsigned char row, unsigned char tScn, unsigned char columns, unsigned char rows); float convertDistance(float input); // LM - Metric - float convertTemperature(float input); // LM - Metric + float convertC(float input); // LM - Metric + float convertF(float input); // LM - Metric char* distanceUnit(); // LM - Metric char* temperatureUnit(); // LM - Metric } \ No newline at end of file