added parsing abilities to sniff as well as improvements to the simpleGUI

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@1424 12e2690d-a6be-4b82-a7b7-67c4a43b65c8

diff --git a/client/GoodFETMCPCAN.py b/client/GoodFETMCPCAN.py
index 4c805ed..01c895a 100644 (file)
--- a/client/GoodFETMCPCAN.py
+++ b/client/GoodFETMCPCAN.py
@@ -264,6 +264,59 @@ class GoodFETMCPCAN(GoodFETSPI):
         for bar in packet:
             toprint=toprint+("%02x "%ord(bar))
         return toprint;
+    
+    def packet2parsed(self,packet):
+        dp1 = ord(data[0])
+        dp2 = ord(data[1])
+        dp5 = ord(data[4])
+        
+        #converts the CAN message to a string
+        msg="";
+        for bar in data:
+            msg=msg+("%02x"%bar)
+        
+        packet = {'msg':msg}
+        
+        #get the ide bit. allows us to check to see if we have an extended
+        #frame
+        packet['ide'] = (dp2 & 0x0f)>>3
+        #we have an extended frame
+        if( packet['ide'] != 0):
+            #get lower nibble, last 2 bits
+            eId = dp2 & 0x03
+            eId = eId<<8 | ord(data[2])
+            packet['eID'] = eId<<8 | ord(data[3])
+            packet['rtr'] = dp5>>6 & 0x01
+    
+        else:
+            packet['rtr'] = dp2>>4 & 0x01
+        
+        #error check, 2nd msb of the lower nibble of byte 2 should be 0
+        if( (dp2 & 0x04) == 4 ):
+            packet['error'] = 1
+        #error check an always 0 bit
+        if( (dp5 & 0xf0) == 240):
+            packet['error'] = 1
+        
+        # Create the standard ID. from the message
+        packet['sID'] = dp1<<3 | dp2>>5
+        
+ 
+        length = dp5 & 0x0f
+        packet['length'] = length
+        
+        if( length > 8):
+            packet['error'] = 1
+        
+        #generate the data section
+        for i in range(0,length):
+            idx = 5+i
+            dbidx = 'db%d' % i
+            packet[dbidx] = data[idx]   
+        return packet
+        
+        
+        
     def peek8(self,adr):
         """Read a byte from the given address.  Untested."""
         data=self.SPItrans([0x03,adr&0xFF,00]);

diff --git a/client/GoodFETMCPCANCommunication.py b/client/GoodFETMCPCANCommunication.py
index b09fb5e..decd092 100644 (file)
--- a/client/GoodFETMCPCANCommunication.py
+++ b/client/GoodFETMCPCANCommunication.py
@@ -72,7 +72,7 @@ class GoodFETMCPCANCommunication:
     #   SNIFF
     ##########################
          
-    def sniff(self,freq,duration,description, verbose=True, comment=None, filename=None, standardid=None, debug=False, faster=False):
+    def sniff(self,freq,duration,description, verbose=True, comment=None, filename=None, standardid=None, debug=False, faster=False, parsed=True):
         
         #reset eveything on the chip
         self.client.serInit() 
@@ -174,7 +174,23 @@ class GoodFETMCPCANCommunication:
                 row.append("%f"%time.time());
                 
                 if( verbose==True):
-                    print self.client.packet2str(packet)
+                    #if we want to print a parsed message
+                    if( parsed == True):
+                        sId = packet['sID']
+                        msg = "sID: %d" %sID
+                        if( packet.get('eID')):
+                            msg += " eID: %d" %packet.get('eID')
+                        msg += " rtr: %d"%packet['rtr']
+                        length = packet['length']
+                        msg += " length: %d"%length
+                        msg += "data:"
+                        for i in range(0,length):
+                            dbidx = 'db%d'%i
+                            msg +=" %d"% packet[dbidx]
+                        print msg
+                    # if we want to print just the message as it is read off the chip
+                    else:
+                        print self.client.packet2str(packet)
                 
                 if(debug == True):