Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341
Dependencies: SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed
Fork of CANary by
Diff: displayModes.cpp
- Branch:
- Metric
- Revision:
- 119:0e2b641e98a2
- Parent:
- 118:02010b18efdc
- Child:
- 120:041edeec08f5
--- a/displayModes.cpp Fri Jul 05 15:38:40 2013 +0000 +++ b/displayModes.cpp Fri Jul 05 16:55:04 2013 +0000 @@ -5,8 +5,8 @@ char sTemp2[16]; void mainDisplay (bool force, bool showButtons){ - unsigned short gids, SOC, packV; - static unsigned short lgids=0, lSOC=0, lSOH=0, lpackV=0, maxPS=0; + unsigned short gids, SOC, packV_x2; + static unsigned short lgids=0, lSOC=0, lSOH=0, lpackV_x2=0, maxPS=0; static float lmaxTemp=0; static float lkW=0, laccV=0, lmpkWh=0; static unsigned long lAh=0; @@ -17,7 +17,7 @@ msg = lastMsg[indexLastMsg[0x55b]]; //Get SOC SOC = (msg.data[0]<<2)+(msg.data[1]>>6); msg = lastMsg[indexLastMsg[0x1db]]; //Get pack volts - packV = (msg.data[2]<<2)+(msg.data[3]>>6); + packV_x2 = (msg.data[2]<<2)+(msg.data[3]>>6); tt.background(Navy); @@ -49,10 +49,10 @@ printf("%4.1f%s\n",(float)SOC/10,"% "); lSOC=SOC; } - if(force||packV!=lpackV){ + if(force||packV_x2!=lpackV_x2){ tt.locate(200,200); - printf("%4.1fV \n",(float)packV/2); - lpackV=packV; + printf("%4.1fV \n",(float)packV_x2/2); + lpackV_x2=packV_x2; } if(force||maxTemp!=lmaxTemp){ tt.locate(200,170); @@ -106,10 +106,10 @@ printf("%4.1f%s\n",(float)SOC/10,"% "); lSOC=SOC; } - if(force||packV!=lpackV){ + if(force||packV_x2!=lpackV_x2){ tt.locate(200,200); - printf("%4.1fV \n",(float)packV/2); - lpackV=packV; + printf("%4.1fV \n",(float)packV_x2/2); + lpackV_x2=packV_x2; } if(force||accV!=laccV){ tt.locate(20,200); @@ -239,35 +239,36 @@ if(force||gids!=lgids){ tt.locate(10,10); printf("%4d gids \n",gids); + lgids=gids; } if(force||SOC!=lSOC){ - tt.locate(0,40); - printf("%4.1f%s\n",(float)SOC/10,"% SOC"); + tt.locate(10,40); + printf(" %4.1f%s \n",(float)SOC/10,"% SOC"); lSOC=SOC; } if(force||SOH_x100!=lSOH){ tt.locate(10,70); - printf(" %3.1f%s\n",(float)SOH_x100/100,"% SOH"); + printf(" %4.1f%s \n",(float)SOH_x100/100,"% SOH"); lSOH=SOH_x100; } if(force||Ah_x10000!=lAh){ tt.locate(10,100); - printf("% 4.2fAh \n",(float)Ah_x10000/10000); + printf(" %4.2fAh \n",(float)Ah_x10000/10000); lAh=Ah_x10000; } if(force||maxTemp!=lmaxTemp){ tt.locate(10,130); - printf("%4.1f%s max\n",convertTemperature(maxTemp),temperatureUnit()); + printf(" %4.1f%s max temp \n",convertTemperature(maxTemp),temperatureUnit()); lmaxTemp=maxTemp; } - if(force||unloadedV!=lunlV){ + if(force||unloadedV_x2!=lunlV){ tt.locate(10,160); - printf("%4.1fV (unloaded)\n",unloadedV); - lunlV=unloadedV; + printf(" %4.1fV \n",unloadedV_x2/2); + lunlV=unloadedV_x2; } if(force||Resr!=lresr){ tt.locate(10,190); - printf("%4.1fmOhms ESR\n",Resr); + printf(" %4.1fmOhms ESR \n",Resr*1000); lresr=Resr; } }