more changes to TX test code

[goodfet] / client / GoodFETMCPCANCommunication.py

diff --git a/client/GoodFETMCPCANCommunication.py b/client/GoodFETMCPCANCommunication.py
index ba6d564..b09fb5e 100644 (file)
--- a/client/GoodFETMCPCANCommunication.py
+++ b/client/GoodFETMCPCANCommunication.py
@@ -234,7 +234,7 @@ class GoodFETMCPCANCommunication:
                         msgIDs.append(j)
         return msgIDs
     
-    def sweepRandom(self, freq, time = 5, number):
+    def sweepRandom(self, freq, number = 5, time = 5,):
         msgIDs = []
         ids = []
         for i in range(0,number,6):
@@ -247,7 +247,7 @@ class GoodFETMCPCANCommunication:
                 ids.append(id)
             print comment
             description = "Running a sweep filer for all the possible standard IDs. This runs the following : " + comment
-            count = self.sniff(freq=freq, duration=time, description=description, comment = comment, filename, standardid = idsTemp)
+            count = self.sniff(freq=freq, duration=time, description=description, comment = comment, standardid = idsTemp)
             if( count != 0):
                 for element in idsTemp:
                     comment = "sweepFilter: %d" % (element)
@@ -332,21 +332,39 @@ class GoodFETMCPCANCommunication:
 
     def test(self):
         
+        comm.reset();
+        print "Just reset..."
+        print "EFLG register:  %02x" % self.client.peek8(0x2d);
+        print "Tx Errors:  %3d" % self.client.peek8(0x1c);
+        print "Rx Errors:  %3d" % self.client.peek8(0x1d);
+        print "CANINTF: %02x"  %self.client.peek8(0x2C);
         self.client.MCPreqstatConfiguration();
         self.client.poke8(0x60,0x66);
         self.client.MCPsetrate(500);
         self.client.MCPreqstatNormal();
+        print "In normal mode now"
+        print "EFLG register:  %02x" % self.client.peek8(0x2d);
+        print "Tx Errors:  %3d" % self.client.peek8(0x1c);
+        print "Rx Errors:  %3d" % self.client.peek8(0x1d);
+        print "CANINTF: %02x"  %self.client.peek8(0x2C);
         print "Waiting on packets.";
+        checkcount = 0;
         packet=None;
         while(1):
             packet=self.client.rxpacket();
             if packet!=None:
                 print "Message recieved: %s" % self.client.packet2str(packet);
-    
-                    
+            else:
+                checkcount=checkcount+1;
+                if (checkcount%30==0):
+                    print "EFLG register:  %02x" % self.client.peek8(0x2d);
+                    print "Tx Errors:  %3d" % self.client.peek8(0x1c);
+                    print "Rx Errors:  %3d" % self.client.peek8(0x1d);
+                    print "CANINTF: %02x"  %self.client.peek8(0x2C);
+
     
         
-    def spit(self,freq=500, standardid,debug):
+    def spit(self,freq, standardid,debug):
         
         comm.reset();
         self.client.MCPsetrate(freq);
@@ -370,20 +388,27 @@ class GoodFETMCPCANCommunication:
                   # lower nibble is DLC                   
                   0x01,0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0xFF]    
         
-        self.client.txpacket(packet);
+        packetE = [SIDhigh, SIDlow | 0x80, 0x00,0x00, # pad out EID regs
+                  0x08, # bit 6 must be set to 0 for data frame (1 for RTR) 
+                  # lower nibble is DLC                   
+                0x01,0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0xFF] 
+   
         
-        TXB0CTRL = self.client.peek8(0x30);
+        self.client.txpacket(packetE);
         
-        print "Tx Errors:  %3d" % self.client.peek8(0x1c);
-        print "Rx Errors:  %3d" % self.client.peek8(0x1d);
-        print "Error Flags:  %02x\n" % self.client.peek8(0x2d);
-        print "TXB0CTRL: %02x" %self.client.peek8(0x30);
-        self.client.MCPbitmodify(0x30,0x08,0x00);
-        print "TXB0CTRL modified to: %02x\n" %self.client.peek8(0x30);
+        checkcount = 0;
+        TXB0CTRL = self.client.peek8(0x30);
         
-        print "CANINTF: %02x"  %self.client.peek8(0x2C);
-        self.client.MCPbitmodify(0x2C,0x80,0x00);
-        print "INT Flags modified to:  %02x\n" % self.client.peek8(0x2c);
+        while(TXB0CTRL | 0x00 != 0x00):
+            checkcount+=1;
+            TXB0CTRL = self.client.peek8(0x30);
+            if (checkcount %30 ==0):
+                print "Tx Errors:  %3d" % self.client.peek8(0x1c);
+                print "Rx Errors:  %3d" % self.client.peek8(0x1d);
+                print "EFLG register:  %02x" % self.client.peek8(0x2d);
+                print "TXB0CTRL: %02x" %TXB0CTRL;
+                print "CANINTF: %02x\n"  %self.client.peek8(0x2C);
+