Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341

Dependencies:   SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed

Fork of CANary by Tick Tock

Revision:
140:ab3e94eb0227
Parent:
139:ac227b203ef2
Child:
143:88b5155622a5
--- a/displayModes.cpp	Fri Aug 02 14:11:23 2013 +0000
+++ b/displayModes.cpp	Sun Aug 04 14:57:40 2013 +0000
@@ -422,6 +422,10 @@
     short steerOutBounds = 0 ;
     CANMessage msg;
 
+//        tt.set_font((unsigned char*) Arial12x12_prop);  // select the font
+//        tt.locate(10,40);
+//        printf("%d \n",chirpInt);
+
     //---------------
     msg = lastMsg[indexLastMsg[0x180]]; //Get Throttle position
     throttle = msg.data[5];
@@ -968,10 +972,10 @@
     }
     showButton(3,1,sTemp1," Debug",4,4);    
     
-    if(metric)
-        showButton(0,2,"Imperial","",4,4);
+    if(brakeMon)
+        showButton(0,2,"Disable","BrkMon",4,4);
     else
-       showButton(0,2,"Metric","",4,4);
+        showButton(0,2," Enable"," BrkMon",4,4);
     
     showButton(1,2,"  Set"," Time",4,4);
     if (showHealth) {