X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFETMCPCAN.py;h=304b747ef161627c48d68896027380dff68bb6f6;hp=aa06b260adcd152cd4dc4a2078a7110b01d8687e;hb=ed70ab984559f85637b5d3ef88493e5cde92d9d5;hpb=0a4e61c633bfe1cb455f1cd1ecd73afca0306a50

diff --git a/client/GoodFETMCPCAN.py b/client/GoodFETMCPCAN.py
index aa06b26..304b747 100644
--- a/client/GoodFETMCPCAN.py
+++ b/client/GoodFETMCPCAN.py
@@ -290,18 +290,14 @@ class GoodFETMCPCAN(GoodFETSPI):
             toprint=toprint+("%02x "%ord(bar))
         return toprint;
     
+    
+    ## This code could be drastica
     def packet2parsed(self,data):
         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"%ord(bar))
-        
-        packet = {'msg':msg}
-        
+        packet = {}
         #get the ide bit. allows us to check to see if we have an extended
         #frame
         packet['ide'] = (dp2 & 0x0f)>>3
@@ -310,36 +306,40 @@ class GoodFETMCPCAN(GoodFETSPI):
             #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
+            eId = eId<<8 | ord(data[3])
+            rtr = dp5>>6 & 0x01
+            packet['eID'] = " eID: %06d" %(eId)
+            packet['rtr'] = " rtr: %d" % (rtr)
     
         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
+        packet['length'] = dp5 & 0x0f
         
         #generate the data section
-        for i in range(0,length):
-            idx = 5+i
-            dbidx = 'db%d' % i
-            packet[dbidx] = data[idx]   
+        for i in range(0,packet['length']):
+            idx = 5 + i
+            dbidx = 'db%d'%i
+            packet[dbidx] = ord(data[idx])
         return packet
-        
+    
+    def packet2parsedstr(self,data):
+        packet = self.packet2parsed(data)
+        msg = "sID: %04d" %packet['sId']
+        if( packetParsed.get('eID')):
+            msg += " eID: %d" %packetParsed.get('eID')
+        msg += " rtr: %d"%packetParsed['rtr']
+        length = packetParsed['length']
+        msg += " length: %d"%length
+        msg += " data:"
+        for i in range(0,length):
+            dbidx = 'db%d'%i
+            msg +=" %03d"% ord(packetParsed[dbidx])
+        #msg = self.client.packet2parsedstr(packet)
+        print msg
         
         
     def peek8(self,adr):
@@ -384,4 +384,4 @@ class GoodFETMCPCAN(GoodFETSPI):
 # TXRTSCTRL = x0D
 
 
-    
\ No newline at end of file
+