Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341
Dependencies: SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed
Fork of CANary by
Diff: main.cpp
- Revision:
- 71:7e87256d6c9a
- Parent:
- 70:0700b769ac15
- Child:
- 72:f9a6faa28873
--- a/main.cpp Sun Apr 14 02:10:40 2013 +0000 +++ b/main.cpp Sun Apr 14 02:33:00 2013 +0000 @@ -46,10 +46,10 @@ Beep spkr(p21); // revision string, max 6 characters -//char revStr[7] = "65"; // gg - revStr is used in 2 places -//char revStr[7] = "65-gg1"; // gg - and is easy to edit here -//char revStr[7] = "69-gg1"; // gg - ZeroSecTick -char revStr[7] = "69-gg1"; // gg - trying to merge with TT +// gg - revStr is used in 2 places +// gg - and is easy to edit here +// gg - added ZeroSecTick and revStr +char revStr[7] = "71"; // gg - fix rev number bool logEn = false, logOpen = false; bool yesBattLog = false ; // gg - Batt Log