Diff: main.cpp

Revision:

48:d1ce92104a1f

Parent:

47:9cc7d876dd6d

Child:

49:a3d2c5bb3cfa

--- a/main.cpp	Tue Apr 02 07:23:46 2013 +0000
+++ b/main.cpp	Sat Apr 06 04:18:49 2013 +0000
@@ -45,7 +45,8 @@
 PwmOut dled(p23);
 Beep spkr(p21);
 
-bool logEn = false,logOpen = false;
+bool logEn = false, logOpen = false; 
+bool yesBattLog = false ; // gg - Batt Log
 FILE *cfile;
 FILE *file;
 char fileName[35] = "" ;
@@ -95,6 +96,7 @@
 char data[8];
 signed long motorRPM;
 float MPH = 0;
+unsigned char skin = 0;
 
 int main() {
     int readPointer=0;
@@ -141,7 +143,10 @@
     t = *localtime(&seconds) ;
     strftime(sTemp, 32, "%a %m/%d/%Y %X\n", &t);
     logMsg(sTemp);
-    sprintf(sTemp,"CANary firmware rev47\n");
+    
+    //---- revisions ----
+    sprintf(sTemp,"CANary firmware rev48\n");
+
     logMsg(sTemp);
 
     // Look for new binary on thumbdrive
@@ -182,12 +187,6 @@
 
     // Read config file
     readConfig();
-    i=dMode[1];
-    dMode[1]=logScreen;
-    lastDMode[1]=99;
-    updateDisplay(1);
-    wait_ms(3000); // Pause for a few seconds
-    dMode[1]=i;
 
     touched=false;
     secsNoTouch=2;
@@ -338,13 +337,15 @@
                                 }
                                 break;
                             case 10:
-                            case 40:
+                            case 40: 
                                 if (dMode[whichTouched]==changedScreen) {
                                     for(j=0;j<100;j++) msgChanged[j]=0; // clear changed data
                                     lastDMode[whichTouched]=99;//force refresh
                                 } else if (dMode[whichTouched]==cpScreen) {
                                     pollCP=true;
-                                } else if (dMode[whichTouched]==cpHistScreen) {
+                                } else if (dMode[whichTouched]==cpHistScreen) { // gg - hist
+                                    pollCP=true;
+                                } else if (dMode[whichTouched]==cpBarScreen) { // gg - cpbars
                                     pollCP=true;
                                 } else if (dMode[whichTouched]==config1Screen) {
                                     mbed_reset();
@@ -377,7 +378,7 @@
                                 }
                                 break;
                             case 01:
-                            case 31:
+                            case 31: // row 2 left
                                 if (dMode[whichTouched]==config1Screen) {
                                     logEn = !logEn;
                                     if (!logEn) repeatPoll=false; // disable auto polling, too
@@ -387,7 +388,7 @@
                                 }
                                 break;
                             case 11:
-                            case 41:
+                            case 41: // row 2 center
                                 if (dMode[whichTouched]==config1Screen){
                                     repeatPoll = !repeatPoll&&logEn;
                                     if (repeatPoll) {
@@ -431,8 +432,11 @@
                                 }
                                 break;
                             case 21:
-                            case 51:
-                                if (dMode[whichTouched]==dateScreen){
+                            case 51: // row 2 right button
+                                if (dMode[whichTouched]==config1Screen) { // gg - Batt Log Enable Button
+                                    yesBattLog = !yesBattLog;
+                                    
+                                } else if (dMode[whichTouched]==dateScreen){
                                     upDate(dtMode,false);
                                     lastDMode[whichTouched]=99;
                                 }