X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFETMCPCANCommunication.py;h=4cbe13396802c3e48fbb560220431d2ac6384986;hp=ed0082dd578fef787df82d666bb78ff1cff126c9;hb=9e8ae94f53616cb9ef75279e21cda0bbcd9f232d;hpb=5c39fc3ff6bfc4c934f98cc5f14481cd429192bb diff --git a/client/GoodFETMCPCANCommunication.py b/client/GoodFETMCPCANCommunication.py index ed0082d..4cbe133 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: @@ -72,7 +73,7 @@ class GoodFETMCPCANCommunication: # SNIFF ########################## - def sniff(self,freq,duration,description, verbose=True, comment=None, filename=None, standardid=None, debug=False, faster=False, parsed=True): + def sniff(self,freq,duration,description, verbose=True, comment=None, filename=None, standardid=None, debug=False, faster=False, parsed=True, data = None): #reset eveything on the chip self.client.serInit() @@ -152,7 +153,11 @@ class GoodFETMCPCANCommunication: packet=self.client.fastrxpacket(); else: packet=self.client.rxpacket(); - + + #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)) if(debug == True): #check packet status MCPstatusReg = self.client.MCPrxstatus(); @@ -176,19 +181,19 @@ class GoodFETMCPCANCommunication: if( verbose==True): #if we want to print a parsed message if( parsed == True): -# packetParsed = self.client.packet2parsed(packet) -# sId = packetParsed.get('sID') -# msg = "sID: %04d" %sId -# if( packetParsed.get('eID')): -# msg += " eID: %d" %packetParsed.get('eID') -# msg += " rtr: %d"%packetParsed['rtr'] -# length = packetParsed['length'] -# msg += " length: %d"%length -# msg += " data:" -# for i in range(0,length): -# dbidx = 'db%d'%i -# msg +=" %03d"% ord(packetParsed[dbidx]) - msg = self.client.packet2parsedstr(packet) + packetParsed = self.client.packet2parsed(packet) + sId = packetParsed.get('sID') + msg = "sID: %04d" %sId + if( packetParsed.get('eID')): + msg += " eID: %d" %packetParsed.get('eID') + msg += " rtr: %d"%packetParsed['rtr'] + length = packetParsed['length'] + msg += " length: %d"%length + msg += " data:" + for i in range(0,length): + dbidx = 'db%d'%i + msg +=" %03d"% ord(packetParsed[dbidx]) + #msg = self.client.packet2parsedstr(packet) print msg # if we want to print just the message as it is read off the chip else: @@ -394,8 +399,6 @@ class GoodFETMCPCANCommunication: comment = None ### ON-CHIP FILTERING if(standardid != None): - if( comment == None): - comment = "" self.client.MCPreqstatConfiguration(); self.client.poke8(0x60,0x26); # set RXB0 CTRL register to ONLY accept STANDARD messages with filter match (RXM1=0, RMX0=1, BUKT=1) self.client.poke8(0x20,0xFF); #set buffer 0 mask 1 (SID 10:3) to FF @@ -436,38 +439,74 @@ class GoodFETMCPCANCommunication: if (verbose == True): print "Filtering for SID %d (0x%02xh) with filter #%d"%(ID, ID, filter); - comment += ("f%d" %(ID)) - + + self.client.MCPreqstatNormal(); # this will sweep through the given ids to request a packet and then sniff on that # 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") + path = self.DATALOCATION+datestr+"_rtr.csv" + filename = path + outfile = open(filename,'a'); + dataWriter = csv.writer(outfile,delimiter=','); + dataWriter.writerow(['# Time Error Bytes 1-13']); + 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): - standardid = [i, i, i] + self.client.serInit() + self.spitSetup(freq) + standardid = [i, i, i, i] #set filters self.addFilter(standardid, verbose = True) - #### split SID into different regs + + #### split SID into different areas 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 #create RTR packet - packet = [SIDhigh, SIDlow, 0x00,0x00,0x40] + packet = [SIDhigh, SIDlow, 0x00,0x00,0x40] + dataWriter.writerow(["#requested id %d"%i]) + #self.client.poke8(0x2C,0x00); #clear the CANINTF register; we care about bits 0 and 1 (RXnIF flags) which indicate a message is being held + #clear buffer + packet1 = self.client.rxpacket(); + packet2 = self.client.rxpacket(); + #send in rtr request self.client.txpacket(packet) ## listen for 2 packets. one should be the rtr we requested the other should be ## a new packet response - packet1=self.client.rxpacket(); - packet2=self.client.rxpacket(); - if( packet1 != None and packet2 != None): - print "packets recieved :\n " - print self.client.packet2parsedstr(packet1); - print self.client.packet2parsedstr(packet2); - continue + starttime = time.time() + while ((time.time() - starttime) < duration): + packet = self.client.rxpacket() + if( packet == None): + continue + row = [] + row.append("%f"%time.time()) #timestamp + row.append(0) #error flag (not checkign) + row.append("rtrRequest_%d"%i) #comment + row.append(duration) #sniff time + row.append(1) # filtering boolean + for byte in packet: + row.append("%02x"%ord(byte)); + dataWriter.writerow(row) + print self.client.packet2parsedstr(packet) +# packet1=self.client.rxpacket(); +# packet2=self.client.rxpacket(); +# if( packet1 != None and packet2 != None): +# print "packets recieved :\n " +# print self.client.packet2parsedstr(packet1); +# print self.client.packet2parsedstr(packet2); +# continue +# elif( packet1 != None): +# print self.client.packet2parsedstr(packet1) +# elif( packet2 != None): +# print self.client.packet2parsedstr(packet2) trial= 2; # for each trial while( trial <= attempts): @@ -477,15 +516,33 @@ class GoodFETMCPCANCommunication: # 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): - packet1=self.client.rxpacket(); - packet2=self.client.rxpacket(); - - if( packet1 != None and packet2 != None): - print "packets recieved :\n " - print self.client.packet2parsedstr(packet1); - print self.client.packet2parsedstr(packet2); - break + packet=self.client.rxpacket(); + row = [] + row.append("%f"%time.time()) #timestamp + row.append(0) #error flag (not checking) + row.append("rtrRequest_%d"%i) #comment + row.append(duration) #sniff time + row.append(1) # filtering boolean + for byte in packet: + row.append("%02x"%ord(byte)); + dataWriter.writerow(row) + print self.client.packet2parsedstr(packet) +# packet2=self.client.rxpacket(); +# +# if( packet1 != None and packet2 != None): +# print "packets recieved :\n " +# print self.client.packet2parsedstr(packet1); +# print self.client.packet2parsedstr(packet2); +# #break +# elif( packet1 != None): +# print "just packet1" +# print self.client.packet2parsedstr(packet1) +# elif( packet2 != None): +# print "just packet2" +# print self.client.packet2parsedstr(packet2) trial += 1 + print "sweep complete" + outfile.close() def spitSetup(self,freq): self.reset();