X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFETMCPCANCommunication.py;h=676d018c9bc751818fff12e99d785f48bda88bba;hp=f91958eecedfa95af8022d347448bf5ce7e1f22e;hb=d08bfd3c7cdc687fd68ba9025702c262665e52d3;hpb=8e28954868efbb609df0c37369b8d1ec9425d4f1 diff --git a/client/GoodFETMCPCANCommunication.py b/client/GoodFETMCPCANCommunication.py index f91958e..676d018c9 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,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(); @@ -188,6 +195,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: @@ -239,7 +247,7 @@ class GoodFETMCPCANCommunication: msgIDs = [] self.client.serInit() self.client.MCPsetup() - for i in range(low, high, 6): + 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) @@ -260,7 +268,7 @@ class GoodFETMCPCANCommunication: ids = [] self.client.serInit() self.client.MCPsetup() - for i in range(0,number,6): + for i in range(0,number+1,6): idsTemp = [] comment = "sweepFilter: " for j in range(0,6,1): @@ -387,6 +395,156 @@ 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(); + + + # 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 = 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) + for i in range(lowID,highID+1, 1): + self.client.serInit() + self.spitSetup(freq) + standardid = [i, 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] + 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 + 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): + 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): + 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(); @@ -398,7 +556,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 @@ -441,22 +599,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); - 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" + # MORE DEBUGGING if(debug): checkcount = 0;