Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341
Dependencies: SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed
Fork of CANary by
Diff: main.cpp
- Revision:
- 139:ac227b203ef2
- Parent:
- 138:a2f5af85ed0d
- Child:
- 140:ab3e94eb0227
--- a/main.cpp Fri Aug 02 05:13:26 2013 +0000 +++ b/main.cpp Fri Aug 02 14:11:23 2013 +0000 @@ -10,10 +10,8 @@ // * Subtract accessory power from efficiency history (add back in when displaying) // * Add trip history display -// rev138 -// Added update if screen touched on power -// Fixed hang on immediate USB access -// Fixed metric DTE formatting +// rev139 +// Fixed right justify (compare to 9.5, 99.5 instead of 10, 100) #include "mbed.h" #include "CAN.h" @@ -25,7 +23,7 @@ #include "displayModes.h" #include "TOUCH_TFTx2.h" -char revStr[7] = "138"; // gg - revision string, max 6 characters +char revStr[7] = "139"; // gg - revision string, max 6 characters FATFS USBdrive; LocalFileSystem local("local"); @@ -608,6 +606,8 @@ dMode[whichTouched] = playbackScreen ; // GoTo Playback Screen } else if (dMode[whichTouched]==configScreen) { metric = !metric; // toggle metric/imperial display + lastDMode[0]=99;//repaint + lastDMode[1]=99;//repaint } else { lastDMode[whichTouched]=99;//repaint to clear highlight }