Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341
Dependencies: SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed
Fork of CANary by
Diff: main.cpp
- Revision:
- 76:fb6779d0963e
- Parent:
- 75:77bd26829dca
- Child:
- 77:7c136766466c
--- a/main.cpp Mon Apr 15 14:33:53 2013 +0000 +++ b/main.cpp Mon Apr 15 14:40:05 2013 +0000 @@ -49,7 +49,7 @@ // gg - revStr is used in 2 places // gg - and is easy to edit here // gg - added ZeroSecTick and revStr -char revStr[7] = "74"; // gg - fix rev number +char revStr[7] = "76"; // gg - fix rev number bool logEn = false, logOpen = false; bool yesBattLog = false ; // gg - Batt Log @@ -64,8 +64,8 @@ unsigned char battData[256]={0}; unsigned char msgChanged[100]; // inidcates which bytes changed char c; -volatile unsigned short writePointer = 0; -unsigned short readPointer=0; +volatile int writePointer = 0; +int readPointer=0; volatile unsigned short secsNoMsg = 0; volatile unsigned short secsNoTouch = 0; volatile bool canIdle;