minor updates to spit-testing function

[goodfet] / client / GoodFETMCPCANCommunication.py

diff --git a/client/GoodFETMCPCANCommunication.py b/client/GoodFETMCPCANCommunication.py
index ba6d564..8f84444 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,7 +332,7 @@ class GoodFETMCPCANCommunication:
 
     def test(self):
         
-        self.client.MCPreqstatConfiguration();
+        self.client.MCPreqstatListenOnly();
         self.client.poke8(0x60,0x66);
         self.client.MCPsetrate(500);
         self.client.MCPreqstatNormal();
@@ -346,7 +346,7 @@ class GoodFETMCPCANCommunication:
                     
     
         
-    def spit(self,freq=500, standardid,debug):
+    def spit(self,freq, standardid,debug):
         
         comm.reset();
         self.client.MCPsetrate(freq);
@@ -376,14 +376,9 @@ class GoodFETMCPCANCommunication:
         
         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 "EFLG register:  %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);
-        
         print "CANINTF: %02x"  %self.client.peek8(0x2C);
-        self.client.MCPbitmodify(0x2C,0x80,0x00);
-        print "INT Flags modified to:  %02x\n" % self.client.peek8(0x2c);