Dual CANbus monitor and instrumentation cluster supporting ILI9341 display controller
Dependencies: SPI_TFTx2_ILI9341 TOUCH_TFTx2_ILI9341 TFT_fonts mbed
Fork of CANary by
Diff: displayModes.cpp
- Branch:
- Metric
- Revision:
- 128:25314f339565
- Parent:
- 127:27c739fd6d71
- Child:
- 130:1a9d2a6d99ce
--- a/displayModes.cpp Sun Jul 21 11:27:43 2013 +0000 +++ b/displayModes.cpp Sun Jul 21 23:44:10 2013 +0000 @@ -572,7 +572,7 @@ showButton(3,1," GoTo"," Config",4,4); // bottom (not Nav) row showButton(0,2," GoTo","Playback",4,4); - showButton(1,2," GoTo","Set Time",4,4); + //showButton(1,2," GoTo","Set Time",4,4); showButton(2,2," GoTo"," Log",4,4); showButton(3,2," GoTo"," Trip",4,4); @@ -844,7 +844,7 @@ //-------- top row -------- showButton(0,0,"Calibrate"," Touch",4,4); // gg - 4x4 showButton(1,0," Reset","",4,4); - showButton(2,0," Save"," Config",4,4); + showButton(2,0," Save"," Config",4,4); // a button to step to the next skin unsigned int nextSkin = skin + 1 ; @@ -854,7 +854,7 @@ else if( nextSkin == ggSkin ) sprintf(sTemp1,"Skin GG"); else sprintf(sTemp1,"Skin %d",nextSkin); - showButton(3,0," Use",sTemp1,4,4); + showButton(3,0," Use",sTemp1,4,4); //------- second row ----- if (logEn&&usbEn) { @@ -881,9 +881,9 @@ // add Enable/Disable Debug - debugMode if (debugMode) { - sprintf(sTemp1,"Disable"); + sprintf(sTemp1," Disable"); } else { - sprintf(sTemp1,"Enable"); + sprintf(sTemp1," Enable"); } showButton(3,1,sTemp1," Debug",4,4); @@ -892,6 +892,13 @@ else showButton(0,2,"Metric","",4,4); + showButton(1,2," Set"," Time",4,4); + if (showHealth) { + sprintf(sTemp1," Hide"); + } else { + sprintf(sTemp1," Show"); + } + showButton(2,2,sTemp1," Health",4,4); showButton(3,2,"Update","Firmware",4,4); } @@ -959,9 +966,6 @@ case 5: sprintf(sTemp1,"Second"); break; - case 6: - sprintf(sTemp1,"Select"); - break; default: break; }