test fork
Dependencies: SPI_TFTx2 SPI_TFTx2_ILI9341 TFT_fonts TOUCH_TFTx2 mbed
Fork of CANary_9341 by
Diff: main.cpp
- Revision:
- 56:0de6b316c19b
- Parent:
- 55:591406a71fa8
- Parent:
- 53:8a51361434ae
- Child:
- 57:0d81e107b449
--- a/main.cpp Tue Apr 09 06:45:46 2013 +0000 +++ b/main.cpp Tue Apr 09 12:57:46 2013 +0000 @@ -162,7 +162,8 @@ //sprintf(sTemp,"CANary firmware rev51-gg2\n"); // gg - decodes 4x4 button touches, //sprintf(sTemp,"CANary firmware rev51-gg3\n"); // gg - cleaned 4x4 button and touches, //sprintf(sTemp,"CANary firmware rev52\n"); - sprintf(sTemp,"CANary firmware rev54\n"); // merged 53 (51-gg3) and 52 + //sprintf(sTemp,"CANary firmware rev54\n"); // merged 53 (51-gg3) and 52 + sprintf(sTemp,"CANary firmware rev55\n"); logMsg(sTemp); // Look for new binary on thumbdrive @@ -351,7 +352,7 @@ } //--------------- // gg - 4x4 touch - unsigned char tScrn = 0 ; // screen 0 + //unsigned char tScrn = 0 ; // screen 0 unsigned char tCol ; unsigned char tRow ; @@ -371,7 +372,8 @@ //-------------- // gg - 4x4 touch tCol = buttonX(lastTouch.x,4) ; - if( tCol >= 4 ){ tCol -= 4; tScrn = 1 ; } // touch is on screen 1 + //if( tCol >= 4 ){ tCol -= 4; tScrn = 1 ; } // touch is on screen 1 + if( tCol >= 4 ){ tCol -= 4; } // touch is on screen 1 tRow = buttonY(lastTouch.y,4) ; if( tRow == tNavRow ) tRow = 7 ; @@ -596,7 +598,7 @@ numSsamples=0; mWs_x4=0; numWsamples=0; - if(accOn){ + if(accOn||playbackEn){ for(i=1;i<39;i++){ average=mph[i]/timeConstant[i]; mph[i]-=average;