From: chrishoder <chrishoder@12e2690d-a6be-4b82-a7b7-67c4a43b65c8>
Date: Tue, 5 Feb 2013 03:36:52 +0000 (+0000)
Subject: added display to the mainDisplay that shows packets streaming
X-Git-Url: http://git.rot13.org/?p=goodfet;a=commitdiff_plain;h=cd34fb40f79423b3aef65291d6b970a06b13d2f4;hp=49f6a874fb0672b60ea3c47b57438f68ba3847c4

added display to the mainDisplay that shows packets streaming

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

diff --git a/client/GoodFETMCPCAN.py b/client/GoodFETMCPCAN.py
index 189ef56..f003e01 100644
--- a/client/GoodFETMCPCAN.py
+++ b/client/GoodFETMCPCAN.py
@@ -297,11 +297,10 @@ class GoodFETMCPCAN(GoodFETSPI):
         dp2 = ord(data[1])
         dp5 = ord(data[4])
         
-        #converts the CAN message to a string
         msg="";
         
         
-        
+
         #get the ide bit. allows us to check to see if we have an extended
         #frame
         ide = (dp2 & 0x0f)>>3
diff --git a/client/GoodFETMCPCANCommunication.py b/client/GoodFETMCPCANCommunication.py
index 9c296fe..a907372 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:
     
@@ -155,8 +156,8 @@ class GoodFETMCPCANCommunication:
                 
             #add the data to list if the pointer was included
             if(data != None):
-                data.append(self.client.packet2parsedstr(packet))
-            
+                #data.append(self.client.packet2parsedstr(packet))
+                data.put(self.client.packet2parsedstr(packet))
             if(debug == True):
                 #check packet status
                 MCPstatusReg = self.client.MCPrxstatus();