Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341

Dependencies:   SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed

Fork of CANary by Tick Tock

Revision:
166:ec3951ba9701
Parent:
165:4daa921730dd
Child:
167:58d4edf403d4
--- a/displayModes.cpp	Tue Dec 03 02:56:50 2013 +0000
+++ b/displayModes.cpp	Tue Dec 03 13:54:07 2013 +0000
@@ -30,7 +30,7 @@
     if(force) tt.cls();
     if(skin==ttSkin){
         if(force||gids!=lgids){
-            tt.locate(16,4);
+            tt.locate(10,4);
             tt.foreground(White);
             printf("%dgids \n",gids);
             useable_kWh = (float)(gids-5)*0.075;
@@ -46,9 +46,9 @@
             }
         }
         if(force||SOC_x10!=lSOC){
-            tt.locate(16,34);//216,10
+            tt.locate(10,34);//216,10
             tt.foreground(LightGrey);
-            printf("%4.1f%s\n",(float)SOC_x10/10,"%");
+            printf("%2.1f%s\n",(float)SOC_x10/10,"%");
             lSOC=SOC_x10;
         }
         total_kW=kW[0]+CCkW;
@@ -80,7 +80,7 @@
             // worse-case DTE
             dte=convertDistance(minTripEff*useable_kWh); //LM - add metric conversion
             tt.foreground(Green);
-            tt.locate(16,84);            
+            tt.locate(10,84);            
             if(dte>=9.5){
                 printf("%2.0f \n",dte);
             }else{
@@ -157,7 +157,7 @@
         }
         if(force||aTemp!=laTemp){
             tt.foreground(Cyan);
-            tt.locate(16,146);
+            tt.locate(10,146);
             printf("%2.0f%s\n",convertF(aTemp),temperatureUnit());
             laTemp=aTemp;
         }
@@ -172,7 +172,7 @@
             lmaxTemp=maxTemp;
         }
         if(force||accV!=laccV){
-            tt.locate(16,176);
+            tt.locate(10,176);
             tt.foreground(Yellow);
             printf("%3.1fV  \n",accV);
             laccV=accV;