Revision 86:d1c9e8ac1c4b, committed 2013-04-17

Comitter:

TickTock

Date:

Wed Apr 17 20:41:14 2013 +0000

Parent:

85:5c27e88b3fbe

Child:

87:46ac3f2519d6

Commit message:

Fixed introduced ts bug

Changed in this revision

--- a/main.cpp	Wed Apr 17 12:45:13 2013 +0000
+++ b/main.cpp	Wed Apr 17 20:41:14 2013 +0000
@@ -51,7 +51,7 @@
 // gg - revStr is used in 2 places
 // gg - and is easy to edit here
 // gg - added ZeroSecTick and revStr
-char revStr[7] = "85";
+char revStr[7] = "86";
 
 bool logEn = false, logOpen = false; 
 bool yesBattLog = false ; // gg - Batt Log
@@ -284,10 +284,11 @@
                         for (j = 0; j<13; j++){
                             fprintf(file,"%c",writeBuffer[readPointer][j]);
                         }
-                        if(++readPointer >= maxBufLen)
+                        if(++readPointer >= maxBufLen){
                             readPointer=0;
+                            led4 = !led4;
+                        }
                     }
-                    led4 = !led4;
                 }
             } // if > 1/16 full, canbus has stopped, or logging stopped
             if (!logEn) {
@@ -463,7 +464,7 @@
                                             playback.attach(&playbackISR,playbackInt);
                                         }
                                     }
-                                }else{
+                                } else {
                                     lastDMode[whichTouched]=99;//repaint to clear highlight
                                 }
 
@@ -489,7 +490,7 @@
                                 } else if (dMode[whichTouched] == indexScreen) { // gg - index
                                     dMode[whichTouched] = dteScreen ; // GoTo DTE Screen
                                     sMode=0;
-                                }else{
+                                } else {
                                     lastDMode[whichTouched]=99;//repaint to clear highlight
                                 }
 
@@ -675,14 +676,14 @@
                 dled = 0; // turn off display if car off and logging disabled and no user activity
             }else if(!headlights){
                 dled = ledHi;
-            }else{
+            } else {
                 dled = ledLo;
             }
             
             //compute historic efficiency
             if(numSsamples>0){ // Avoid div0
                 mph[0]=((float) motorRPM)/numSsamples/215; // Empirically derived - may change car to car
-            }else{
+            } else {
                 mph[0]=0;
             }
             if(mph[0]>99){
@@ -695,7 +696,7 @@
                 if (mpkWh[0]<0) {
                     mpkWh[0]=99;// negative means inf.
                 }
-            }else{
+            } else {
                 kW[0]=0;
                 mpkWh[0]=0;
             }
@@ -742,7 +743,7 @@
                     if(!feof(file)){
                         fscanf(file,"%5c%8c",&header,&data);
                         logCan(header[0],CANMessage(0x7ff&((header[4]<<8)+header[3]), data, 8)); // Playback
-                    }else{
+                    } else {
                         fclose(file); // restart
                         file = fopen("/usb/playback.alc", "rb");                                          
                         lastDMode[whichTouched]=99;//force refresh

--- a/utility.cpp	Wed Apr 17 12:45:13 2013 +0000
+++ b/utility.cpp	Wed Apr 17 20:41:14 2013 +0000
@@ -52,11 +52,10 @@
     signed short packV;
     signed short packA;
     signed long imWs_x4;
-    unsigned short ts=0; //moved getTimeStamp call to inside debug loop for speed
+    unsigned short ts=getTimeStamp();
 
     secsNoMsg=0; // reset deadman switch
     if(debugMode){ // code to insert actual number of dropped frames for overrun debug - skiped in normal mode to keep logcan short
-        ts = getTimeStamp();
         if(logOpen){
             if(canRXmsg.id>0) {
                 // check to see if buffer is already full (read - write) = 1