jtagarm: a few cleanup things...

[goodfet] / client / GoodFETMCPCANCommunication.py

diff --git a/client/GoodFETMCPCANCommunication.py b/client/GoodFETMCPCANCommunication.py
index 4cbe133..9c60cb0 100644 (file)
--- a/client/GoodFETMCPCANCommunication.py
+++ b/client/GoodFETMCPCANCommunication.py
@@ -155,9 +155,11 @@ class GoodFETMCPCANCommunication:
                 packet=self.client.rxpacket();
                 
             #add the data to list if the pointer was included
-            if(data != None):
+            if(data != None and packet != None):
                 #data.append(self.client.packet2parsedstr(packet))
-                data.put(self.client.packet2parsedstr(packet))
+                packetParsed = self.client.packet2parsed(packet)
+                packetParsed["time"] =time.time()
+                data.put(packetParsed)
             if(debug == True):
                 #check packet status
                 MCPstatusReg = self.client.MCPrxstatus();
@@ -597,7 +599,7 @@ class GoodFETMCPCANCommunication:
         
                 
         print "Transmitting packet: "
-        print self.client.packet2str(packet)
+        #print self.client.packet2str(packet)
                 
         self.client.txpacket(packet);