Diff: utility.cpp

Revision:

132:08748a67280a

Parent:

131:0d926c080a65

Child:

134:ad243e4f1a17

--- a/utility.cpp	Wed Jul 24 11:20:08 2013 +0000
+++ b/utility.cpp	Wed Jul 24 12:29:22 2013 +0000
@@ -6,6 +6,7 @@
 void RTC_IRQHandler() {
     timer.reset(); // zero ms at the-seconds-tic
     carCanIdle=(++secsNoCarCanMsg>canTimeout)?true:false;
+    evCanIdle=(++secsNoEvCanMsg>canTimeout)?true:false;
     userIdle=(++secsNoTouch>userTimeout)?true:false;
     LPC_RTC->ILR |= (1<<0); // clear interrupt to prepare for next
     tick=true;
@@ -55,7 +56,6 @@
     signed long imWs_x4;
     unsigned short ts;
 
-    secsNoCarCanMsg=0; // reset deadman switch
     if(debugMode||(skin==ggSkin)){ 
         // code to insert actual number of dropped frames for overrun debug - skiped in normal mode to keep logcan short
         if(logOpen){
@@ -458,6 +458,7 @@
     CANMessage msg1;
     can1.read(msg1);
     
+    secsNoEvCanMsg=0; // reset deadman switch
     if( ZeroSecTick ) { ZeroSecTick = false; logTS(); } // gg - 0-second EV bus
     if(msg1.id>0) {
         logCan(1, msg1); // EVcan Message Received
@@ -469,8 +470,8 @@
     CANMessage msg2;
     can2.read(msg2);
     
-    if( ZeroSecTick ) { ZeroSecTick = false; logTS(); } // gg - 0-second EV bus
-    
+    secsNoCarCanMsg=0; // reset deadman switch
+    if( ZeroSecTick ) { ZeroSecTick = false; logTS(); } // gg - 0-second EV bus    
     if(msg2.id>0) {
         logCan(2, msg2); // CARcan Message Received
         led2 = !led2;