Diff: displayModes.cpp

Revision:

43:e7f6f80590e3

Parent:

42:4533b13b297d

Child:

44:6262a9fd1e56

--- a/displayModes.cpp	Sun Mar 31 20:38:15 2013 +0000
+++ b/displayModes.cpp	Tue Apr 02 06:32:25 2013 +0000
@@ -323,9 +323,9 @@
     }
     sprintf(sTemp2," Auto CP");
     showButton(1,1,sTemp1,sTemp2,3,3);
-    sprintf(sTemp1," Start");
-    sprintf(sTemp2,"Playback");
-    showButton(2,1,sTemp1,sTemp2,3,3);
+    //sprintf(sTemp1," Start");
+    //sprintf(sTemp2,"Playback");
+    //showButton(2,1,sTemp1,sTemp2,3,3);
 }
 
 void pbScreen(bool force, bool showButtons){
@@ -371,12 +371,12 @@
         t = *localtime(&seconds) ;
         
         tt.locate(10,10);
+        tt.foreground(Yellow);
+        tt.background(DarkCyan);
+        tt.set_font((unsigned char*) Arial12x12);
         strftime(sTemp1, 32, "%a %m/%d/%Y %X  \n", &t);
         printf("%s",sTemp1);
         if((sMode==1)&&showButtons){
-            tt.foreground(Yellow);
-            tt.background(DarkCyan);
-            tt.set_font((unsigned char*) Arial12x12);
             sprintf(sTemp2,"");
             switch(dtMode){
                 case 0:
@@ -421,9 +421,9 @@
         tt.foreground(Yellow);
         tt.set_font((unsigned char*) Arial28x28);
         tt.locate(10,200);
-        printf("%3.1f\n",MPH);
+        printf("%3.1f  \n",MPH);
         tt.locate(200,200);
-        printf("%3.1f\n",mpkWh);
+        printf("%3.1f   \n",mpkWh);
         lmpkWh=mpkWh;
         lMPH=MPH;
     }
@@ -465,8 +465,10 @@
             showDateTime(changed,(display==whichTouched));
             break;
         default:
-            tt.background(Black);
-            tt.cls();
+            if (changed){
+                tt.background(Black);
+                tt.cls();
+            }
             break;
     }
     lastDMode[display]=dMode[display];
@@ -480,42 +482,42 @@
                 sprintf(sTemp1,"<-Prev");
                 sprintf(sTemp2,"");
                 showButton(0,2,sTemp1,sTemp2,3,3);
-                sprintf(sTemp1,"   Next->");
+                sprintf(sTemp1,"    Next->");
                 showButton(2,2,sTemp1,sTemp2,3,3);
-                sprintf(sTemp1," Select");
+                sprintf(sTemp1,"  Select");
                 switch (dMode[display]) {
                     case 0:
-                        sprintf(sTemp2,"  Off");
+                        sprintf(sTemp2,"   Off");
                         break;
                     case 1:
-                        sprintf(sTemp2,"  Log");
+                        sprintf(sTemp2,"   Log");
                         break;
                     case 2:
-                        sprintf(sTemp2,"  Main");
+                        sprintf(sTemp2,"   Main");
                         break;
                     case 3:
                         sprintf(sTemp2," Braking");
                         break;
                     case 4:
-                        sprintf(sTemp2,"  DTE");
+                        sprintf(sTemp2,"   DTE");
                         break;
                     case 5:
-                        sprintf(sTemp2," Monitor");
+                        sprintf(sTemp2,"  Monitor");
                         break;
                     case 6:
                         sprintf(sTemp2,"Delta Mon");
                         break;
                     case 7:
-                        sprintf(sTemp2,"Cell Pair");
+                        sprintf(sTemp2," Cell Pair");
                         break;
                     case 8:
-                        sprintf(sTemp2," Config");
+                        sprintf(sTemp2,"  Config");
                         break;
                     case 9:
-                        sprintf(sTemp2,"Playback");
+                        sprintf(sTemp2," Playback");
                         break;
                     case 10:
-                        sprintf(sTemp2,"Set Time");
+                        sprintf(sTemp2," Set Time");
                         break;
                 }
                 showButton(1,2,sTemp1,sTemp2,3,3);