X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFETMCPCANCommunication.py;h=169e02a02985dbd9e71bc905530debdc623028ca;hp=b2d579f9d98737db974f0e7e17531b0965bb571c;hb=a1eecd9300fc8c342e5908e81d2468e47698a31b;hpb=d0d70e13ca14f2cf23d812f92ed59bd1f678b323

diff --git a/client/GoodFETMCPCANCommunication.py b/client/GoodFETMCPCANCommunication.py
index b2d579f..169e02a 100644
--- a/client/GoodFETMCPCANCommunication.py
+++ b/client/GoodFETMCPCANCommunication.py
@@ -442,7 +442,7 @@ class GoodFETMCPCANCommunication:
     # id for a given amount duration. This will be repeated the number of attempts time
     
     #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):
+    def rtrSweep(self,freq,lowID,highID, attempts = 1,duration = 1, verbose = True):
         #set up file
         now = datetime.datetime.now()
         datestr = now.strftime("%Y%m%d")
@@ -451,11 +451,12 @@ class GoodFETMCPCANCommunication:
         outfile = open(filename,'a');
         dataWriter = csv.writer(outfile,delimiter=',');
         dataWriter.writerow(['# Time     Error        Bytes 1-13']);
-        dataWriter.writerow(['#' + "rtr sweep from " + lowID + " to" + highID])
+        dataWriter.writerow(['#' + "rtr sweep from %d to %d"%(lowID,highID)])
         print "started"
-        self.client.serInit()
-        self.spitSetup(freq)
+        #self.client.serInit()
+        #self.spitSetup(freq)
         for i in range(lowID,highID+1, 1):
+            self.client.serInit()
             self.spitSetup(freq)
             standardid = [i, i, i, i]
             #set filters
@@ -510,7 +511,6 @@ class GoodFETMCPCANCommunication:
                 while( (time.time()-starttime) < duration):
                     packet=self.client.rxpacket();
                     row = []
-                    row = []
                     row.append("%f"%time.time()) #timestamp
                     row.append(0) #error flag (not checking)
                     row.append("rtrRequest_%d"%i) #comment