Tick Tock / Mbed 2 deprecated CANary_merge

Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341

Dependencies:   SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed

Fork of CANary by Tick Tock

Diff: displayModes.cpp

Revision:
172:53548bf8bf85
Parent:
171:355e284f5201
Child:
173:9815b1467039
--- a/displayModes.cpp	Sat Dec 28 14:53:14 2013 +0000
+++ b/displayModes.cpp	Sun Dec 29 12:38:00 2013 +0000
@@ -421,8 +421,8 @@
     }*/
     if(force||gids!=lgids){
         tt.locate(10,10);
-        if(gids>startGids){ // If not start of trip print kWh/gid too
-            printf("%4d gids  %4.3f kW/gid\n",gids,(float)(kWh_trip[0]+CCkWh_trip[0])/(gids-startGids));
+        if((gids+5)<startGids){ // Wh/gid, too, if trip long enough
+            printf("%4d gids (%0.0f)\n",gids,1000*(kWh_trip[0]+CCkWh_trip[0])/(startGids-gids));
         }else{
             printf("%4d gids \n",gids);
         }