minor updates to spit-testing function

[goodfet] / client / GoodFETMCPCANCommunication.py

diff --git a/client/GoodFETMCPCANCommunication.py b/client/GoodFETMCPCANCommunication.py
index e269a7b..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)
@@ -282,6 +282,7 @@ class GoodFETMCPCANCommunication:
    
     
     def freqtest(self,freq):
+        
         self.client.MCPsetup();
 
         self.client.MCPsetrate(freq);
@@ -330,34 +331,19 @@ class GoodFETMCPCANCommunication:
                 print "Data: " + self.client.packet2str(data);
 
     def test(self):
-        print "\nMCP2515 Self Test:";
         
-        #Switch to config mode and try to rewrite TEC.
-        self.client.MCPreqstatConfiguration();
-        self.client.poke8(0x00,0xde);
-        if self.client.peek8(0x00)!=0xde:
-            print "ERROR: Poke to TEC failed.";
-        else:
-            print "SUCCESS: Register read/write.";
-        
-        #Switch to Loopback mode and try to catch our own packet.
-        self.client.MCPreqstatLoopback();
-    
-        packet1 = [0x00, 
-                   0x08, # LOWER nibble must be 8 or greater to set EXTENDED ID 
-                   0x00, 0x00,
-                   0x08, # UPPER nibble must be 0 to set RTR bit for DATA FRAME
-                         # LOWER nibble is DLC
-                   0x01,0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0xFF]
-        self.client.txpacket(packet1);
-        self.client.txpacket(packet1);
-        print "Waiting on loopback packets.";
+        self.client.MCPreqstatListenOnly();
+        self.client.poke8(0x60,0x66);
+        self.client.MCPsetrate(500);
+        self.client.MCPreqstatNormal();
+        print "Waiting on packets.";
         packet=None;
         while(1):
             packet=self.client.rxpacket();
             if packet!=None:
                 print "Message recieved: %s" % self.client.packet2str(packet);
-                break;
+    
+                    
     
         
     def spit(self,freq, standardid,debug):
@@ -366,13 +352,14 @@ class GoodFETMCPCANCommunication:
         self.client.MCPsetrate(freq);
         self.client.MCPreqstatNormal();
         
-        if(debug==True):
-            print "\n\nATTEMPTING TRANSMISSION!!!"
-            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);
-            print "CANINTF: %02x\n"  %self.client.peek8(0x2C);
+        print "initial state:"
+        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);
+        print "CANINTF: %02x\n"  %self.client.peek8(0x2C);
+        print "\n\nATTEMPTING TRANSMISSION!!!"
+
     
         #### split SID into different regs
         SIDlow = (standardid[0] & 0x03) << 5;  # get SID bits 2:0, rotate them to bits 7:5
@@ -389,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);