changes to get the threading working for sniff in mainDisplay. removed bugs

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

diff --git a/client/GoodFETMCPCAN.py b/client/GoodFETMCPCAN.py
index 06047ff..dcb3da3 100644 (file)
--- a/client/GoodFETMCPCAN.py
+++ b/client/GoodFETMCPCAN.py
@@ -320,7 +320,7 @@ class GoodFETMCPCAN(GoodFETSPI):
         packet['length'] = dp5 & 0x0f
         
         #generate the data section
         packet['length'] = dp5 & 0x0f
         
         #generate the data section

-        for i in range(0,length):
+        for i in range(0,packet['length']):

             idx = 5 + i
             dbidx = 'db%d'%i
             packet[dbidx] = data[idx] 
             idx = 5 + i
             dbidx = 'db%d'%i
             packet[dbidx] = data[idx] 

diff --git a/client/GoodFETMCPCANCommunication.py b/client/GoodFETMCPCANCommunication.py
index 4cbe133..3350aa8 100644 (file)
--- a/client/GoodFETMCPCANCommunication.py
+++ b/client/GoodFETMCPCANCommunication.py
@@ -157,7 +157,7 @@ class GoodFETMCPCANCommunication:
             #add the data to list if the pointer was included
             if(data != None):
                 #data.append(self.client.packet2parsedstr(packet))
             #add the data to list if the pointer was included
             if(data != None):
                 #data.append(self.client.packet2parsedstr(packet))

-                data.put(self.client.packet2parsedstr(packet))
+                data.put(self.client.packet2parsed(packet))

             if(debug == True):
                 #check packet status
                 MCPstatusReg = self.client.MCPrxstatus();
             if(debug == True):
                 #check packet status
                 MCPstatusReg = self.client.MCPrxstatus();