test fork
Dependencies: SPI_TFTx2 SPI_TFTx2_ILI9341 TFT_fonts TOUCH_TFTx2 mbed
Fork of CANary_9341 by
Diff: displayModes.cpp
- Revision:
- 41:8d4609ea7259
- Parent:
- 40:0e6e71a7323f
- Child:
- 42:4533b13b297d
--- a/displayModes.cpp Sun Mar 31 17:45:05 2013 +0000 +++ b/displayModes.cpp Sun Mar 31 18:57:36 2013 +0000 @@ -75,7 +75,7 @@ lastDisplayLoc=displayLoc; } -void printDTE (bool force){ +void mainDisplay (bool force){ unsigned short gids, SOC, packV; static unsigned short lgids=0, lSOC=0, lpackV=0; static float lmpkWh=0, laccV=0;; @@ -412,26 +412,20 @@ } } -void test(bool force){ - unsigned char left,right; - CANMessage msg; - static unsigned char lleft=0; - - msg = lastMsg[indexLastMsg[0x284]]; - right = msg.data[7]; - msg = lastMsg[indexLastMsg[0x280]]; - left = msg.data[6]; - +void dteDisplay(bool force){ + static float lmpkWh=0; + static float lMPH=0; tt.background(Navy); if(force) tt.cls(); - if(force||left!=lleft){ + if(force||mpkWh!=lmpkWh||MPH!=lMPH){ tt.foreground(Yellow); tt.set_font((unsigned char*) Arial28x28); tt.locate(10,200); - printf("%d \n",left); + printf("%3.1f\n",MPH); tt.locate(200,200); - printf("%d \n",right); - lleft=left; + printf("%3.1f\n",mpkWh); + lmpkWh=mpkWh; + lMPH=MPH; } } @@ -443,14 +437,14 @@ case logScreen: printLog(changed); break; - case dteScreen: - printDTE(changed); + case mainScreen: + mainDisplay(changed); break; case brakeScreen: braking(changed); break; - case testScreen: - test(changed); + case dteScreen: + dteDisplay(changed); break; case monitorScreen: printLast(changed); @@ -485,10 +479,45 @@ sprintf(sTemp1,"<-Prev"); sprintf(sTemp2,""); showButton(0,2,sTemp1,sTemp2,3,3); - sprintf(sTemp1," Select %d",dMode[display]); - showButton(1,2,sTemp1,sTemp2,3,3); sprintf(sTemp1," Next->"); showButton(2,2,sTemp1,sTemp2,3,3); + sprintf(sTemp1," Select"); + switch (dMode[display]) { + case 0: + sprintf(sTemp2," Off"); + break; + case 1: + sprintf(sTemp2," Log"); + break; + case 2: + sprintf(sTemp2," Main"); + break; + case 3: + sprintf(sTemp2," Braking"); + break; + case 4: + sprintf(sTemp2," DTE"); + break; + case 5: + sprintf(sTemp2," Monitor"); + break; + case 6: + sprintf(sTemp2,"Delta Mon"); + break; + case 7: + sprintf(sTemp2,"Cell Pair"); + break; + case 8: + sprintf(sTemp2," Config"); + break; + case 9: + sprintf(sTemp2,"Playback"); + break; + case 10: + sprintf(sTemp2,"Set Time"); + break; + } + showButton(1,2,sTemp1,sTemp2,3,3); wait_ms(100); // pause a moment to reduce flicker break; case 2: // numpad @@ -541,7 +570,8 @@ tt.locate(x1+btnGap,y1+btnGap+30); printf("%s\n",text2); } - +// below is braking screen normalized to power rather than force +// changed to force since power had too large a dynamic range /*void braking (bool force, bool prdata=false){ unsigned long targetBraking, regenBraking, speed; static unsigned long maxTarget = 20000, maxRegen = 20000, tarDivReg = 1000;