Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341
Dependencies: SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed
Fork of CANary by
Diff: displayModes.cpp
- Revision:
- 143:88b5155622a5
- Parent:
- 140:ab3e94eb0227
- Child:
- 144:b0c9d30dd346
--- a/displayModes.cpp Sun Aug 04 20:59:27 2013 +0000 +++ b/displayModes.cpp Mon Aug 05 03:34:06 2013 +0000 @@ -145,7 +145,7 @@ if(force||accV!=laccV){ tt.locate(20,176); tt.foreground(Yellow); - printf("%3.1fV \n",accV); + printf("%3.1f(%3.1f) \n",accV,accV2); laccV=accV; } if(force||tireP!=ltireP){ @@ -380,10 +380,10 @@ printf(" %4.1f%s \n",(float)SOC_x10/10,"% SOC"); lSOC=SOC_x10; } - if(force||SOH_x100!=lSOH){ + if(force||SOH2_x100!=lSOH){ tt.locate(10,70); - printf(" %4.1f%s,%4.1f%s \n",(float)SOH_x2/2,"%",(float)SOH_x100/100,"% SOH"); - lSOH=SOH_x100; + printf(" %4.1f%s,%4.1f%s \n",(float)SOH_x2/2,"%",(float)SOH2_x100/100,"% SOH"); + lSOH=SOH2_x100; } if(force||Ah_x10000!=lAh){ tt.locate(10,100);