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
- Revision:
- 87:46ac3f2519d6
- Parent:
- 84:fd21e5d32dab
- Child:
- 89:2263d349b484
diff -r d1c9e8ac1c4b -r 46ac3f2519d6 displayModes.cpp --- a/displayModes.cpp Wed Apr 17 20:41:14 2013 +0000 +++ b/displayModes.cpp Fri Apr 19 02:06:59 2013 +0000 @@ -336,10 +336,16 @@ } tt.cls(); tt.locate(0,6); - printf(" MAX MIN AVG CVLI T1 T2 T3 T4\n %04d %04d %04d %04d %02dC %02dC %02dC %02dC\n\n",max,min,avg,jv,battData[224+5],battData[224+8],battData[224+11],battData[224+14]); + // BatDataBaseG4 * 7 = 224 + printf(" MAX MIN AVG CVLI T1 T2 T3 T4\n %04d %04d %04d %04d %02dC %02dC %02dC %02dC\n\n", + max,min,avg,jv, battData[224+5],battData[224+8],battData[224+11],battData[224+14]); tt.locate(0,36); for(i=0; i<16; i++){ - printf("%02d-%02d : %04d %04d %04d %04d %04d %04d\n",i*6+1,i*6+6,(battData[i*12+3]<<8)+battData[i*12+4],(battData[i*12+5]<<8)+battData[i*12+6],(battData[i*12+7]<<8)+battData[i*12+8],(battData[i*12+9]<<8)+battData[i*12+10],(battData[i*12+11]<<8)+battData[i*12+12],(battData[i*12+13]<<8)+battData[i*12+14]); + printf("%02d-%02d : %04d %04d %04d %04d %04d %04d\n", + i*6+1,i*6+6, + (battData[i*12+3]<<8)+battData[i*12+4],(battData[i*12+5]<<8)+battData[i*12+6], + (battData[i*12+7]<<8)+battData[i*12+8],(battData[i*12+9]<<8)+battData[i*12+10], + (battData[i*12+11]<<8)+battData[i*12+12],(battData[i*12+13]<<8)+battData[i*12+14]); } tt.rect(8+0*41,16,40+0*41,28,Green); tt.rect(8+1*41,16,40+1*41,28,Yellow); @@ -480,11 +486,10 @@ } // values, for now + // BatDataBaseG4 * 7 = 224 tt.locate( 0, yWinMax+40 ); printf(" MAX MIN AVG CVLI T1 T2 T3 T4\n %04d %04d %04d %04d %02dC %02dC %02dC %02dC\n\n", - max,min,avg,jv, - battData[224+5],battData[224+8], - battData[224+11],battData[224+14]); + max,min,avg,jv, battData[224+5],battData[224+8], battData[224+11],battData[224+14]); // label the X axis (approximate) tt.locate( 2, yWinMax+5); printf("%04d", min ); @@ -604,8 +609,10 @@ } // the values, for now + // BatDataBaseG4 * 7 = 224 tt.locate( 0, yWinMax+40 ); - printf(" MAX MIN AVG CVLI T1 T2 T3 T4\n %04d %04d %04d %04d %02dC %02dC %02dC %02dC\n\n",max,min,avg,jv,battData[224+5],battData[224+8],battData[224+11],battData[224+14]); + printf(" MAX MIN AVG CVLI T1 T2 T3 T4\n %04d %04d %04d %04d %02dC %02dC %02dC %02dC\n\n", + max,min,avg,jv, battData[224+5],battData[224+8], battData[224+11],battData[224+14]); //--------------- // show the bars @@ -687,6 +694,14 @@ sprintf(sTemp1,"Enable"); } showButton(2,1,sTemp1,"Batt Log",4,4); + + // add Enable/Disable Debug - debugMode + if (debugMode) { + sprintf(sTemp1,"Disable"); + } else { + sprintf(sTemp1,"Enable"); + } + showButton(3,1,sTemp1," Debug",4,4); } void pbScreen(bool force, bool showButtons){