Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341
Dependencies: SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed
Fork of CANary by
Diff: main.cpp
- Branch:
- Metric
- Revision:
- 114:3f8c59a8a2b9
- Parent:
- 113:f388b4505463
- Child:
- 115:549410af477d
--- a/main.cpp Mon Jul 01 02:54:46 2013 +0000 +++ b/main.cpp Tue Jul 02 02:57:36 2013 +0000 @@ -24,7 +24,7 @@ #include "displayModes.h" #include "TOUCH_TFTx2.h" -char revStr[7] = "113"; // gg - revision string, max 6 characters +char revStr[7] = "114"; // gg - revision string, max 6 characters FATFS USBdrive; LocalFileSystem local("local"); @@ -613,6 +613,7 @@ case 32: // right col, bottom row (not nav) if (dMode[whichTouched] == configScreen) { + logEn=false; updateFirmware(); } else if (dMode[whichTouched] == tripScreen) { miles_trip[2]=0; @@ -709,7 +710,8 @@ //compute historic efficiency if(numSsamples>0){ // Avoid div0 - mph[0]=((float) motorRPM)/numSsamples/215; // Empirically derived - may change car to car + //mph[0]=((float) motorRPM)/numSsamples/215; // Empirically derived - may change car to car + mph[0]=((float) motorRPM)/numSsamples/219; // Empirically derived - may change car to car } else { mph[0]=0; }