X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=client%2FGoodFETMCPCANCommunication.py;h=40983c2b643e0f9cf297550070543eb30e12ae03;hb=8e9568074076cd86c2058d41065bba4e7f9bb2e0;hp=107b6eafc141b25226c1bdab7bd77892c269215b;hpb=fd4b3edc5c7a68234c6278875b0057e8b1f4d049;p=goodfet

diff --git a/client/GoodFETMCPCANCommunication.py b/client/GoodFETMCPCANCommunication.py
index 107b6ea..40983c2 100644
--- a/client/GoodFETMCPCANCommunication.py
+++ b/client/GoodFETMCPCANCommunication.py
@@ -20,6 +20,7 @@ import os
 from random import randrange
 from GoodFETMCPCAN import GoodFETMCPCAN;
 from intelhex import IntelHex;
+import Queue
 
 class GoodFETMCPCANCommunication:
     
@@ -154,9 +155,9 @@ class GoodFETMCPCANCommunication:
                 packet=self.client.rxpacket();
                 
             #add the data to list if the pointer was included
-            if(data != None):
-                data.append(packet)
-            
+            if(data != None and packet != None):
+                #data.append(self.client.packet2parsedstr(packet))
+                data.put(self.client.packet2parsed(packet))
             if(debug == True):
                 #check packet status
                 MCPstatusReg = self.client.MCPrxstatus();
@@ -180,19 +181,19 @@ class GoodFETMCPCANCommunication:
                 if( verbose==True):
                     #if we want to print a parsed message
                     if( parsed == True):
-#                        packetParsed = self.client.packet2parsed(packet)
-#                        sId = packetParsed.get('sID')
-#                        msg = "sID: %04d" %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)
+                        packetParsed = self.client.packet2parsed(packet)
+                        sId = packetParsed.get('sID')
+                        msg = "sID: %04d" %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
                     # if we want to print just the message as it is read off the chip
                     else: