Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341
Dependencies: SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed
Fork of CANary by
Diff: main.cpp
- Revision:
- 79:68f0dd8d1f19
- Parent:
- 78:a383971fe02f
- Child:
- 126:e0d039096891
--- a/main.cpp Tue Apr 16 13:01:13 2013 +0000 +++ b/main.cpp Tue Apr 16 22:31:47 2013 +0000 @@ -51,7 +51,7 @@ // gg - revStr is used in 2 places // gg - and is easy to edit here // gg - added ZeroSecTick and revStr -char revStr[7] = "78"; +char revStr[7] = "79"; bool logEn = false, logOpen = false; bool yesBattLog = false ; // gg - Batt Log @@ -226,7 +226,7 @@ readConfig(); // Start 15ms timer for requests - msgReq.attach(&sendReq,0.015); + //msgReq.attach(&sendReq,0.015); // Start monitors can1.monitor(true); // set to snoop mode @@ -422,10 +422,13 @@ dMode[whichTouched] = brakeScreen ; // GoTo Brake Screen } else if (dMode[whichTouched]==cpScreen) { reqMsgCnt=0; + msgReq.attach(&sendReq,0.015); } else if (dMode[whichTouched]==cpHistScreen) { // gg - hist reqMsgCnt=0; + msgReq.attach(&sendReq,0.015); } else if (dMode[whichTouched]==cpBarScreen) { // gg - cpbars reqMsgCnt=0; + msgReq.attach(&sendReq,0.015); } else if (dMode[whichTouched]==config1Screen) { mbed_reset(); } else if (dMode[whichTouched]==playbackScreen) { // pause/unpause