Diff: utility.cpp

Revision:

36:dbd39c315258

Parent:

35:5acbd8a64a89

Child:

37:fea2c1d52c5f

--- a/utility.cpp	Thu Mar 21 12:05:22 2013 +0000
+++ b/utility.cpp	Sat Mar 23 04:43:45 2013 +0000
@@ -44,6 +44,7 @@
     static unsigned char ii = 0, lasti = 0; // indexindex
     unsigned char changed,i;
     static unsigned char bdi;
+    secsNoMsg=0; // reset deadman switch
     if(logOpen){
         if(canRXmsg.id>0) {
             writeBuffer[writePointer][0]=mType;
@@ -160,13 +161,19 @@
     can1.monitor(true); // set to snoop mode
 }
 
-void tickerISR() {  //This is the ticker ISR for auto-polling
+void autoPollISR() {  //This is the ticker ISR for auto-polling
     pollCP=true;    //Set a flag to do in main loop instead of here
 }                   //since ticker blocks other interrupts
 
+void playbackISR() { //Used for autoplayback
+    step=true;
+}
+
+void doNothing(){ //CAN deattach work-around
+}
+
 void recieve1() {
     CANMessage msg1;
-    secsNoMsg=0; // reset deadman switch
     can1.read(msg1);
     logCan(1, msg1); //EVcan
     led1 = !led1;
@@ -174,7 +181,6 @@
 
 void recieve2() {
     CANMessage msg2;
-    secsNoMsg=0; // reset deadman switch
     can2.read(msg2);
     logCan(2, msg2); //CARcan
     led2 = !led2;