X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFETMCPCANCommunication.py;h=ba6d5649e5bda55e17656b711b9546f8bbea2373;hp=ab023068deeedf9e09cf50f32bc5df34df057ee5;hb=501118b273fd6f11836c9c963e7fe0e0af783fc4;hpb=f15cabc15a42fb1b0b57e433dc3a1f300cff2b6c

diff --git a/client/GoodFETMCPCANCommunication.py b/client/GoodFETMCPCANCommunication.py
index ab02306..ba6d564 100644
--- a/client/GoodFETMCPCANCommunication.py
+++ b/client/GoodFETMCPCANCommunication.py
@@ -17,7 +17,7 @@ import array;
 import csv, time, argparse;
 import datetime
 import os
-
+from random import randrange
 from GoodFETMCPCAN import GoodFETMCPCAN;
 from intelhex import IntelHex;
 
@@ -73,11 +73,15 @@ class GoodFETMCPCANCommunication:
     ##########################
          
     def sniff(self,freq,duration,description, verbose=True, comment=None, filename=None, standardid=None, debug=False, faster=False):
-                
+        
+        #reset eveything on the chip
+        self.client.serInit() 
+        self.reset()
+          
         #### ON-CHIP FILTERING
         if(standardid != None):
-            comment = comment+"Filtering for SID ";
-            
+            if( comment == None):
+                comment = ""
             self.client.MCPreqstatConfiguration();  
             self.client.poke8(0x60,0x26); # set RXB0 CTRL register to ONLY accept STANDARD messages with filter match (RXM1=0, RMX0=1, BUKT=1)
             self.client.poke8(0x20,0xFF); #set buffer 0 mask 1 (SID 10:3) to FF
@@ -117,8 +121,8 @@ class GoodFETMCPCANCommunication:
                self.client.poke8(RXFSIDL, SIDlow);
         
                if (verbose == True):
-                print "Filtering for SID %d (0x%02xh) with filter #%d"%(ID, ID, filter);
-            comment = comment + ("%d " %(ID))
+                   print "Filtering for SID %d (0x%02xh) with filter #%d"%(ID, ID, filter);
+               comment = comment + ("f%d" %(ID))
         
         
         self.client.MCPsetrate(freq);
@@ -197,6 +201,13 @@ class GoodFETMCPCANCommunication:
                     row.append(0);  #since we don't check for errors if we're not in debug mode...
                             
                 row.append(comment)
+                #how long the sniff was for
+                row.append(duration)
+                #boolean that tells us if there was filtering. 0 == no filters, 1 == filters
+                if(standardid != None):
+                    row.append(1)
+                else:
+                    row.append(0)
                 #write packet to file
                 for byte in packet:
                     row.append("%02x"%ord(byte));
@@ -223,6 +234,29 @@ class GoodFETMCPCANCommunication:
                         msgIDs.append(j)
         return msgIDs
     
+    def sweepRandom(self, freq, time = 5, number):
+        msgIDs = []
+        ids = []
+        for i in range(0,number,6):
+            idsTemp = []
+            comment = "sweepFilter"
+            for j in range(0,6,1):
+                id = randrange(2047)
+                comment += "_%d" % id
+                idsTemp.append(id)
+                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)
+            if( count != 0):
+                for element in idsTemp:
+                    comment = "sweepFilter: %d" % (element)
+                    description = "Running a sweep filer for all the possible standard IDs. This run filters for: %d " % element
+                    count = self.sniff(freq=freq, duration = time, description = description,comment = comment, standardid = [element, element, element])
+                    if( count != 0):
+                        msgIDs.append(j)
+        return msgIDs, ids
+    
     def sniffTest(self, freq):
         
         rate = freq;
@@ -248,6 +282,7 @@ class GoodFETMCPCANCommunication:
    
     
     def freqtest(self,freq):
+        
         self.client.MCPsetup();
 
         self.client.MCPsetrate(freq);
@@ -296,49 +331,35 @@ 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.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):
+    def spit(self,freq=500, standardid,debug):
         
         comm.reset();
         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