Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341

Dependencies:   SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed

Fork of CANary by Tick Tock

Revision:
154:90ea16ca7475
Parent:
153:e94cfe3c339c
Child:
155:f31006516956
--- a/displayModes.cpp	Sat Oct 12 03:48:30 2013 +0000
+++ b/displayModes.cpp	Wed Oct 16 03:47:48 2013 +0000
@@ -1395,58 +1395,78 @@
                 // col 1 see below
                 showButton(2,tNavRow," Go To"," Index",4,4); // gg - index
                 showButton(3,tNavRow," Next->","",4,4); // gg - move next
-                
+                 if (enableSound) {
+                    sprintf(sTemp1," Mute");
+                } else {
+                    sprintf(sTemp1,"Un-Mute");
+                }               
                 // col 1 in Nav row                              
                 switch (dMode[display]) {
                     case offScreen:
+                        showButton(3,0,sTemp1,"",4,4);
                         sprintf(sTemp2,"  Off");
                         break;
                     case logScreen:
+                        showButton(3,0,sTemp1,"",4,4);
                         sprintf(sTemp2,"  Log");
                         break;
                     case mainScreen:
+                        showButton(3,0,sTemp1,"",4,4);
                         sprintf(sTemp2,"  Main");
                         break;
                     case brakeScreen:
+                        showButton(3,0,sTemp1,"",4,4);
                         sprintf(sTemp2,"Braking");
                         break;
                     case dteScreen:
+                        showButton(3,0,sTemp1,"",4,4);
                         sprintf(sTemp2,"  DTE");
                         break;
                     case effScreen:
+                        showButton(3,0,sTemp1,"",4,4);
                         sprintf(sTemp2,"  Eff");
                         break;
                     case monitorScreen:
+                        showButton(3,0,sTemp1,"",4,4);
                         sprintf(sTemp2," Monitor");
                         break;
                     case changedScreen:
+                        showButton(3,0,sTemp1,"",4,4);
                         sprintf(sTemp2,"DeltaMon");
                         break;
                     case cpScreen:
+                        showButton(3,0,sTemp1,"",4,4);
                         sprintf(sTemp2,"CP Data");
                         break;
                     case configScreen:
                         sprintf(sTemp2," Config");
                         break;          
                     case playbackScreen:
+                        showButton(3,0,sTemp1,"",4,4);
                         sprintf(sTemp2,"Playback");
                         break;
                     case dateScreen:
+                        showButton(3,0,sTemp1,"",4,4);
                         sprintf(sTemp2,"Set Time");
                         break;
                     case cpHistScreen: // gg - hist
+                        showButton(3,0,sTemp1,"",4,4);
                         sprintf(sTemp2,"CP Hist");
                         break;
                     case cpBarScreen: // gg - cpbars
+                        showButton(3,0,sTemp1,"",4,4);
                         sprintf(sTemp2,"CP Bars");
                         break;
                     case tripScreen:
+                        showButton(3,0,sTemp1,"",4,4);
                         sprintf(sTemp2," Trip");
                         break;
                     case healthScreen:
+                        showButton(3,0,sTemp1,"",4,4);
                         sprintf(sTemp2,"Health");
                         break;
                     case testScreen:
+                        showButton(3,0,sTemp1,"",4,4);
                         sprintf(sTemp2," Test");
                         break;
                     case indexScreen: // gg - index