X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFETMCPCANCommunication.py;h=7d13ae7b114130a0702f2f1ba700436f8fa0507e;hp=d5be0817fa03e1475bd176cfa63a81a33e81451f;hb=a52be3a0ebbb67f3b4f35f3d53431d7c1488c9b4;hpb=c5d15c5a465754685b000e61e7de7961a1894491 diff --git a/client/GoodFETMCPCANCommunication.py b/client/GoodFETMCPCANCommunication.py index d5be081..7d13ae7 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: @@ -28,6 +29,7 @@ class GoodFETMCPCANCommunication: self.client.serInit() self.client.MCPsetup(); self.DATALOCATION = "../../contrib/ThayerData/" + self.INJECTDATALOCATION = self.DATALOCATION+"InjectedData/" @@ -72,7 +74,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,writeToFile=True): #reset eveything on the chip self.client.serInit() @@ -128,19 +130,19 @@ class GoodFETMCPCANCommunication: self.client.MCPsetrate(freq); # This will handle the files so that we do not loose them. each day we will create a new csv file - if( filename==None): + if( filename==None and writeToFile == True): #get folder information (based on today's date) now = datetime.datetime.now() datestr = now.strftime("%Y%m%d") path = self.DATALOCATION+datestr+".csv" filename = path - - outfile = open(filename,'a'); - dataWriter = csv.writer(outfile,delimiter=','); - dataWriter.writerow(['# Time Error Bytes 1-13']); - dataWriter.writerow(['#' + description]) - + if( writeToFile == True): + outfile = open(filename,'a'); + dataWriter = csv.writer(outfile,delimiter=','); + dataWriter.writerow(['# Time Error Bytes 1-13']); + dataWriter.writerow(['#' + description]) + self.client.MCPreqstatNormal(); print "Listening..."; packetcount = 0; @@ -152,7 +154,13 @@ class GoodFETMCPCANCommunication: packet=self.client.fastrxpacket(); else: packet=self.client.rxpacket(); - + + #add the data to list if the pointer was included + if(data != None and packet != None): + #data.append(self.client.packet2parsedstr(packet)) + packetParsed = self.client.packet2parsed(packet) + packetParsed["time"] =time.time() + data.put(packetParsed) if(debug == True): #check packet status MCPstatusReg = self.client.MCPrxstatus(); @@ -166,29 +174,30 @@ class GoodFETMCPCANCommunication: print "Message in RXB0; message type is %02x (0x00 is standard data, 0x08 is standard remote)." %messagetype elif(messagestat == 0x00): print "No messages in buffers." - - if packet!=None: - + #check to see if there was a packet + if( packet != None): packetcount+=1; + if (packet!=None and writeToFile == True): + row = []; row.append("%f"%time.time()); 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: @@ -230,57 +239,57 @@ class GoodFETMCPCANCommunication: for byte in packet: row.append("%02x"%ord(byte)); dataWriter.writerow(row); - - outfile.close() + if(writeToFile == True): + outfile.close() print "Listened for %d seconds, captured %d packets." %(duration,packetcount); return packetcount - def filterStdSweep(self, freq, low, high, time = 5): - msgIDs = [] - self.client.serInit() - self.client.MCPsetup() - for i in range(low, high+1, 6): - print "sniffing id: %d, %d, %d, %d, %d, %d" % (i,i+1,i+2,i+3,i+4,i+5) - comment= "sweepFilter: " - #comment = "sweepFilter_%d_%d_%d_%d_%d_%d" % (i,i+1,i+2,i+3,i+4,i+5) - description = "Running a sweep filer for all the possible standard IDs. This run filters for: %d, %d, %d, %d, %d, %d" % (i,i+1,i+2,i+3,i+4,i+5) - count = self.sniff(freq=freq, duration = time, description = description,comment = comment, standardid = [i, i+1, i+2, i+3, i+4, i+5]) - if( count != 0): - for j in range(i,i+5): - comment = "sweepFilter: " - #comment = "sweepFilter: %d" % (j) - description = "Running a sweep filer for all the possible standard IDs. This run filters for: %d " % j - count = self.sniff(freq=freq, duration = time, description = description,comment = comment, standardid = [j, j, j, j]) - if( count != 0): - msgIDs.append(j) - return msgIDs - - def sweepRandom(self, freq, number = 5, time = 200): - msgIDs = [] - ids = [] - self.client.serInit() - self.client.MCPsetup() - for i in range(0,number+1,6): - idsTemp = [] - comment = "sweepFilter: " - for j in range(0,6,1): - id = randrange(2047) - #comment += "_%d" % id - idsTemp.append(id) - ids.append(id) - print comment - description = "Running a sweep filer for all the possible standard IDs. This runs the following : " + comment - count = self.sniff(freq=freq, duration=time, description=description, comment = comment, standardid = idsTemp) - if( count != 0): - for element in idsTemp: - #comment = "sweepFilter: %d" % (element) - comment="sweepFilter: " - description = "Running a sweep filer for all the possible standard IDs. This run filters for: %d " % element - count = self.sniff(freq=freq, duration = time, description = description,comment = comment, standardid = [element, element, element]) - if( count != 0): - msgIDs.append(j) - return msgIDs, ids +# def filterStdSweep(self, freq, low, high, time = 5): +# msgIDs = [] +# self.client.serInit() +# self.client.MCPsetup() +# for i in range(low, high+1, 6): +# print "sniffing id: %d, %d, %d, %d, %d, %d" % (i,i+1,i+2,i+3,i+4,i+5) +# comment= "sweepFilter: " +# #comment = "sweepFilter_%d_%d_%d_%d_%d_%d" % (i,i+1,i+2,i+3,i+4,i+5) +# description = "Running a sweep filer for all the possible standard IDs. This run filters for: %d, %d, %d, %d, %d, %d" % (i,i+1,i+2,i+3,i+4,i+5) +# count = self.sniff(freq=freq, duration = time, description = description,comment = comment, standardid = [i, i+1, i+2, i+3, i+4, i+5]) +# if( count != 0): +# for j in range(i,i+5): +# comment = "sweepFilter: " +# #comment = "sweepFilter: %d" % (j) +# description = "Running a sweep filer for all the possible standard IDs. This run filters for: %d " % j +# count = self.sniff(freq=freq, duration = time, description = description,comment = comment, standardid = [j, j, j, j]) +# if( count != 0): +# msgIDs.append(j) +# return msgIDs + +# def sweepRandom(self, freq, number = 5, time = 200): +# msgIDs = [] +# ids = [] +# self.client.serInit() +# self.client.MCPsetup() +# for i in range(0,number+1,6): +# idsTemp = [] +# comment = "sweepFilter: " +# for j in range(0,6,1): +# id = randrange(2047) +# #comment += "_%d" % id +# idsTemp.append(id) +# ids.append(id) +# print comment +# description = "Running a sweep filer for all the possible standard IDs. This runs the following : " + comment +# count = self.sniff(freq=freq, duration=time, description=description, comment = comment, standardid = idsTemp) +# if( count != 0): +# for element in idsTemp: +# #comment = "sweepFilter: %d" % (element) +# comment="sweepFilter: " +# description = "Running a sweep filer for all the possible standard IDs. This run filters for: %d " % element +# count = self.sniff(freq=freq, duration = time, description = description,comment = comment, standardid = [element, element, element]) +# if( count != 0): +# msgIDs.append(j) +# return msgIDs, ids def sniffTest(self, freq): @@ -435,57 +444,10 @@ class GoodFETMCPCANCommunication: if (verbose == True): print "Filtering for SID %d (0x%02xh) with filter #%d"%(ID, ID, filter); + 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): - 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, verbose = True) - #### 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] - 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 - 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 - 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): - 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 - trial += 1 - print "sweep complete" + def spitSetup(self,freq): self.reset(); @@ -497,7 +459,7 @@ class GoodFETMCPCANCommunication: self.spitSetup(freq); spit(self,freq, standardid, repeat, duration = None, debug = False, packet = None) - def spit(self,freq, standardid, repeat, duration = None, debug = False, packet = None): + def spit(self,freq, standardid, repeat,writes, period = None, debug = False, packet = None): #### split SID into different regs @@ -540,19 +502,24 @@ class GoodFETMCPCANCommunication: print "Transmitting packet: " - print self.client.packet2str(packet) + #print self.client.packet2str(packet) self.client.txpacket(packet); if repeat: print "\nNow looping on transmit. " - if duration!= None: - starttime = time.time(); - while((time.time()-starttime < duration)): + if period != None: + for i in range(0,writes): self.client.MCPrts(TXB0=True); - print "MSG printed" + #tic = time.time() + time.sleep(period/1000) # pause for period ms before sending again + #print time.time()-tic + #starttime = time.time(); + #while((time.time()-starttime < duration)): + # self.client.MCPrts(TXB0=True); + # print "MSG printed" else: - while(1): + for i in range(0,writes): self.client.MCPrts(TXB0=True); print "messages injected" @@ -582,7 +549,36 @@ class GoodFETMCPCANCommunication: self.client.MCPsetrate(freq); - + # This will write the data provided in the packets which is expected to be a list of lists + # of the following form: + # for a given row = packets[i] + # row[0] time delay relative to the last packet. if 0 or empty there will be no delay + # row[1] = Standard ID (integer) + # row[2] = Data Length (0-8) (if it is zero we assume an Remote Transmit Request) + # row[3] = Data Byte 0 + # row[4] = Data Byte 1 + # .... up to Data Byte 8 ( THIS ASSUMES A PACKET OF LENGTH 8!!! + def writeData(self,packets,freq): + self.client.serInit() + self.spitSetup(freq) + for row in packets: + if( row[0] != 0 and row[0] != ""): + time.sleep(row[0]) + sID = row[1] + #### split SID into different regs + SIDlow = (sID & 0x07) << 5; # get SID bits 2:0, rotate them to bits 7:5 + SIDhigh = (sID >> 3) & 0xFF; # get SID bits 10:3, rotate them to bits 7:0 + packet = [SIDhigh,SIDlow,0x00,0x00,0x08] + #dlc = row[2] + dlc = 8 + for i in range(3,dlc+3): + packet.append(row[i]) + print packet + self.client.txpacket(packet) + + + + if __name__ == "__main__":