Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341
Dependencies: SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed
Fork of CANary by
Diff: main.cpp
- Revision:
- 61:3ab6a40a1086
- Parent:
- 60:9d191ff745fb
- Child:
- 62:ffd15edb5431
diff -r 9d191ff745fb -r 3ab6a40a1086 main.cpp --- a/main.cpp Wed Apr 10 04:11:58 2013 +0000 +++ b/main.cpp Wed Apr 10 04:20:44 2013 +0000 @@ -166,7 +166,8 @@ //sprintf(sTemp,"CANary firmware rev57\n"); //sprintf(sTemp,"CANary firmware rev57-gg1\n"); // gg - highlight experiment //sprintf(sTemp,"CANary firmware rev58\n"); // gg - highlight experiment commit and publish - sprintf(sTemp,"CANary firmware rev59\n"); // gg - highlight buttons with set_display + //sprintf(sTemp,"CANary firmware rev59\n"); // gg - highlight buttons with set_display + sprintf(sTemp,"CANary firmware rev61\n"); // gg - merge with v60 logMsg(sTemp); // Look for new binary on thumbdrive