test fork
Dependencies: SPI_TFTx2 SPI_TFTx2_ILI9341 TFT_fonts TOUCH_TFTx2 mbed
Fork of CANary_9341 by
Diff: displayModes.cpp
- Branch:
- Metric
- Revision:
- 126:e0d039096891
- Parent:
- 125:f58b7ab2abee
- Parent:
- 79:68f0dd8d1f19
- Child:
- 127:27c739fd6d71
--- a/displayModes.cpp Sun Jul 21 11:08:38 2013 +0000 +++ b/displayModes.cpp Sun Jul 21 11:23:57 2013 +0000 @@ -986,7 +986,11 @@ msg = lastMsg[indexLastMsg[0x5bc]]; //Get gids gids = (msg.data[0]<<2)+(msg.data[1]>>6); if(gids==0){ +<<<<<<< local gids=281; // Display new, fully charged capacity until real data obtained +======= + gids=281; // Display new, fuily charged capacity until real data obtained +>>>>>>> other } tt.background(Navy); @@ -994,6 +998,26 @@ if(force){ tt.set_font((unsigned char*) Arial12x12); tt.cls(); +<<<<<<< local +======= + toVal=33; + } else { + toVal=18;// no need to constantly update the long tc values + } + if(force||lgids!=gids){ + tt.set_font((unsigned char*) Arial12x12); + for(i=0;i<10;i++){ + y=200-i*20; + tt.locate(10,y-8); + if (showMiles){ + printf("%3.0f\n",i*((float)(gids-5)*.075)); + }else{ + printf("%d.0\n",i); + } + tt.line(40,y,254,y,DarkGrey); + } + +>>>>>>> other x=50+0*6; tt.locate(x-10,226); printf("sec\n");