X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFETMCPCANCommunication.py;h=0b5bfc3b9f98fa63aac911307750a31d1e17ebd4;hp=75d966204d9a05f94af2d88aa9bcb555b62337b5;hb=0a6754712a364a01d149dc518f44b258a3a37cf8;hpb=0a4e61c633bfe1cb455f1cd1ecd73afca0306a50 diff --git a/client/GoodFETMCPCANCommunication.py b/client/GoodFETMCPCANCommunication.py index 75d9662..0b5bfc3 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,writeToFile=True): #reset eveything on the chip self.client.serInit() @@ -128,19 +129,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 +153,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,10 +173,11 @@ 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()); @@ -188,6 +196,7 @@ class GoodFETMCPCANCommunication: 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: @@ -229,57 +238,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, 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,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): @@ -387,16 +396,71 @@ class GoodFETMCPCANCommunication: print "CANINTF: %02x" %self.client.peek8(0x2C); + + + def addFilter(self,standardid, verbose= True): + comment = None + ### ON-CHIP FILTERING + if(standardid != None): + 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 + self.client.poke8(0x21,0xE0); #set buffer 0 mask 2 bits 7:5 (SID 2:0) to 1s + if(len(standardid)>2): + self.client.poke8(0x70,0x20); # set RXB1 CTRL register to ONLY accept STANDARD messages with filter match (RXM1=0, RMX0=1) + self.client.poke8(0x24,0xFF); #set buffer 1 mask 1 (SID 10:3) to FF + self.client.poke8(0x25,0xE0); #set buffer 1 mask 2 bits 7:5 (SID 2:0) to 1s + + for filter,ID in enumerate(standardid): + + if (filter==0): + RXFSIDH = 0x00; + RXFSIDL = 0x01; + elif (filter==1): + RXFSIDH = 0x04; + RXFSIDL = 0x05; + elif (filter==2): + RXFSIDH = 0x08; + RXFSIDL = 0x09; + elif (filter==3): + RXFSIDH = 0x10; + RXFSIDL = 0x11; + elif (filter==4): + RXFSIDH = 0x14; + RXFSIDL = 0x15; + else: + RXFSIDH = 0x18; + RXFSIDL = 0x19; + + #### split SID into different regs + SIDlow = (ID & 0x07) << 5; # get SID bits 2:0, rotate them to bits 7:5 + SIDhigh = (ID >> 3) & 0xFF; # get SID bits 10:3, rotate them to bits 7:0 + + #write SID to regs + self.client.poke8(RXFSIDH,SIDhigh); + self.client.poke8(RXFSIDL, SIDlow); + + if (verbose == True): + print "Filtering for SID %d (0x%02xh) with filter #%d"%(ID, ID, filter); + + self.client.MCPreqstatNormal(); + + + def spitSetup(self,freq): self.reset(); self.client.MCPsetrate(freq); self.client.MCPreqstatNormal(); - def spit(self,freq, standardid, repeat, duration = None, debug = False, packet = None): + def spitSingle(self,freq, standardid, repeat, duration = None, debug = False, packet = None): self.spitSetup(freq); - + 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 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 @@ -437,21 +501,27 @@ class GoodFETMCPCANCommunication: print "Transmitting packet: " - for byte in packet: - print "%02x " %byte, + #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); + 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" + # MORE DEBUGGING if(debug): checkcount = 0; @@ -478,7 +548,34 @@ 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] + for i in range(4,dlc+4): + packet.append(row[i]) + self.client.txpacket(packet) + + + + if __name__ == "__main__": @@ -627,7 +724,7 @@ if __name__ == "__main__": # transmission (travis thinks this is because we're sniffing in listen-only # and thus not generating an ack bit on the recieving board) if(args.verb=="spit"): - comm.spit(freq=freq, standardid=standardid,duration=duration, repeat=repeat, debug=debug) + comm.spitSingle(freq=freq, standardid=standardid,duration=duration, repeat=repeat, debug=debug)