From: chrishoder <chrishoder@12e2690d-a6be-4b82-a7b7-67c4a43b65c8>
Date: Fri, 1 Feb 2013 20:19:20 +0000 (+0000)
Subject: changes to the rtr methods
X-Git-Url: http://git.rot13.org/?p=goodfet;a=commitdiff_plain;h=5c39fc3ff6bfc4c934f98cc5f14481cd429192bb

changes to the rtr methods

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

diff --git a/client/GoodFETMCPCAN.py b/client/GoodFETMCPCAN.py
index c740003..3ac06a9 100644
--- a/client/GoodFETMCPCAN.py
+++ b/client/GoodFETMCPCAN.py
@@ -327,9 +327,13 @@ class GoodFETMCPCAN(GoodFETSPI):
         #generate the data section
         dbmsg = ""
         for i in range(0,length):
-            dbmsg += data[idx]   
+            idx = 5 + i
+            dbmsg += " %03d"%ord(data[idx])   
         
-        msg = "sID: %04d" + eIDmsg + rtrmsg + ("length: %d"%(length)) + dbmsg 
+        msg = "sID: %04d"%sID
+        msg += eIDmsg + rtrmsg
+        msg += "length: %d"%(length)
+        msg +=  dbmsg 
     
         return msg
         
@@ -376,4 +380,4 @@ class GoodFETMCPCAN(GoodFETSPI):
 # TXRTSCTRL = x0D
 
 
-    
\ No newline at end of file
+    
diff --git a/client/GoodFETMCPCANCommunication.py b/client/GoodFETMCPCANCommunication.py
index 650c3d4..ed0082d 100644
--- a/client/GoodFETMCPCANCommunication.py
+++ b/client/GoodFETMCPCANCommunication.py
@@ -390,7 +390,8 @@ class GoodFETMCPCANCommunication:
     
     
     
-    def addFilter(self,standardid,comment, verbose= True):
+    def addFilter(self,standardid, verbose= True):
+        comment = None
         ### ON-CHIP FILTERING
         if(standardid != None):
             if( comment == None):
@@ -444,13 +445,14 @@ class GoodFETMCPCANCommunication:
     
     #at the moment this is set to switch to the next id once  a message is identified
     def rtrSweep(self,freq,lowID,highID, attempts = 2,duration = 1, verbose = True):
+        print "started"
         self.client.serInit()
         self.spitSetup(freq)
         
         for i in range(lowID,highID+1, 1):
             standardid = [i, i, i]
             #set filters
-            self.addFilter(standardid, comment, verbose = True)
+            self.addFilter(standardid, verbose = True)
             #### split SID into different regs
             SIDlow = (standardid[0] & 0x07) << 5;  # get SID bits 2:0, rotate them to bits 7:5
             SIDhigh = (standardid[0] >> 3) & 0xFF; # get SID bits 10:3, rotate them to bits 7:0
@@ -466,14 +468,15 @@ class GoodFETMCPCANCommunication:
                 print self.client.packet2parsedstr(packet1);
                 print self.client.packet2parsedstr(packet2);
                 continue
-            trial= 1;
+            trial= 2;
             # for each trial
             while( trial <= attempts):
+                print "trial: ", trial
                 self.client.MCPrts(TXB0=True);
                 starttime = time.time()
                 # this time we will sniff for the given amount of time to see if there is a
                 # time till the packets come in
-                while( time.time()-starttime < duration):
+                while( (time.time()-starttime) < duration):
                     packet1=self.client.rxpacket();
                     packet2=self.client.rxpacket();
             
@@ -482,6 +485,7 @@ class GoodFETMCPCANCommunication:
                         print self.client.packet2parsedstr(packet1);
                         print self.client.packet2parsedstr(packet2);
                         break
+                trial += 1
         
     def spitSetup(self,freq):
         self.reset();