X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFETMCPCANCommunication.py;h=b09fb5e84b8c30de55a20426c5b438addba416c3;hp=8fbec7e0e6a37882292dfce8bc69cdf4a073508b;hb=f3f96e7ef9e9fd6fe27360651e3c2142ac1eae8c;hpb=395f21739bcc43cf11e168268ddbc41026d77bff diff --git a/client/GoodFETMCPCANCommunication.py b/client/GoodFETMCPCANCommunication.py index 8fbec7e..b09fb5e 100644 --- a/client/GoodFETMCPCANCommunication.py +++ b/client/GoodFETMCPCANCommunication.py @@ -15,7 +15,9 @@ import sys; import binascii; import array; import csv, time, argparse; - +import datetime +import os +from random import randrange from GoodFETMCPCAN import GoodFETMCPCAN; from intelhex import IntelHex; @@ -25,7 +27,9 @@ class GoodFETMCPCANCommunication: self.client=GoodFETMCPCAN(); self.client.serInit() self.client.MCPsetup(); + self.DATALOCATION = "../../contrib/ThayerData/" + def printInfo(self): @@ -63,16 +67,21 @@ class GoodFETMCPCANCommunication: def reset(self): self.client.MCPsetup(); + ########################## # SNIFF ########################## - def sniff(self,freq,duration,filename,description, verbose=True, comment=None, standardid=None): + def sniff(self,freq,duration,description, verbose=True, comment=None, filename=None, standardid=None, debug=False, faster=False): + #reset eveything on the chip + self.client.serInit() + self.reset() + #### ON-CHIP FILTERING if(standardid != None): - comment = comment+"Filtering for SID "; - + 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 @@ -113,11 +122,20 @@ class GoodFETMCPCANCommunication: if (verbose == True): print "Filtering for SID %d (0x%02xh) with filter #%d"%(ID, ID, filter); - comment = comment + "%d " %(ID); + comment = comment + ("f%d" %(ID)) 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): + #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']); @@ -129,7 +147,11 @@ class GoodFETMCPCANCommunication: starttime = time.time(); while((time.time()-starttime < duration)): - packet=self.client.rxpacket(); + + if(faster): + packet=self.client.fastrxpacket(); + else: + packet=self.client.rxpacket(); if(debug == True): #check packet status @@ -179,13 +201,62 @@ class GoodFETMCPCANCommunication: row.append(0); #since we don't check for errors if we're not in debug mode... row.append(comment) + #how long the sniff was for + row.append(duration) + #boolean that tells us if there was filtering. 0 == no filters, 1 == filters + if(standardid != None): + row.append(1) + else: + row.append(0) + #write packet to file for byte in packet: row.append("%02x"%ord(byte)); dataWriter.writerow(row); outfile.close() print "Listened for %d seconds, captured %d packets." %(duration,packetcount); - + return packetcount + + + def filterStdSweep(self, freq, time = 5): + msgIDs = [] + for i in range(0, 2047, 6): + print "sniffing id: %d, %d, %d, %d, %d, %d" % (i,i+1,i+2,i+3,i+4,i+5) + 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: %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]) + if( count != 0): + msgIDs.append(j) + return msgIDs + + def sweepRandom(self, freq, number = 5, time = 5,): + msgIDs = [] + ids = [] + 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) + 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): rate = freq; @@ -211,6 +282,7 @@ class GoodFETMCPCANCommunication: def freqtest(self,freq): + self.client.MCPsetup(); self.client.MCPsetrate(freq); @@ -259,72 +331,89 @@ class GoodFETMCPCANCommunication: print "Data: " + self.client.packet2str(data); def test(self): - print "\nMCP2515 Self Test:"; - #Switch to config mode and try to rewrite TEC. + comm.reset(); + print "Just reset..." + print "EFLG register: %02x" % self.client.peek8(0x2d); + print "Tx Errors: %3d" % self.client.peek8(0x1c); + print "Rx Errors: %3d" % self.client.peek8(0x1d); + print "CANINTF: %02x" %self.client.peek8(0x2C); self.client.MCPreqstatConfiguration(); - self.client.poke8(0x00,0xde); - if self.client.peek8(0x00)!=0xde: - print "ERROR: Poke to TEC failed."; - else: - print "SUCCESS: Register read/write."; - - #Switch to Loopback mode and try to catch our own packet. - self.client.MCPreqstatLoopback(); - - packet1 = [0x00, - 0x08, # LOWER nibble must be 8 or greater to set EXTENDED ID - 0x00, 0x00, - 0x08, # UPPER nibble must be 0 to set RTR bit for DATA FRAME - # LOWER nibble is DLC - 0x01,0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0xFF] - self.client.txpacket(packet1); - self.client.txpacket(packet1); - print "Waiting on loopback packets."; + self.client.poke8(0x60,0x66); + self.client.MCPsetrate(500); + self.client.MCPreqstatNormal(); + print "In normal mode now" + print "EFLG register: %02x" % self.client.peek8(0x2d); + print "Tx Errors: %3d" % self.client.peek8(0x1c); + print "Rx Errors: %3d" % self.client.peek8(0x1d); + print "CANINTF: %02x" %self.client.peek8(0x2C); + print "Waiting on packets."; + checkcount = 0; packet=None; while(1): packet=self.client.rxpacket(); if packet!=None: print "Message recieved: %s" % self.client.packet2str(packet); - break; + else: + checkcount=checkcount+1; + if (checkcount%30==0): + print "EFLG register: %02x" % self.client.peek8(0x2d); + print "Tx Errors: %3d" % self.client.peek8(0x1c); + print "Rx Errors: %3d" % self.client.peek8(0x1d); + print "CANINTF: %02x" %self.client.peek8(0x2C); + - def spit(self,freq): + def spit(self,freq, standardid,debug): + + comm.reset(); self.client.MCPsetrate(freq); self.client.MCPreqstatNormal(); + print "initial state:" print "Tx Errors: %3d" % self.client.peek8(0x1c); print "Rx Errors: %3d" % self.client.peek8(0x1d); print "Error Flags: %02x\n" % self.client.peek8(0x2d); print "TXB0CTRL: %02x" %self.client.peek8(0x30); - print "CANINTF: %02x" %self.client.peek8(0x2C); + print "CANINTF: %02x\n" %self.client.peek8(0x2C); + print "\n\nATTEMPTING TRANSMISSION!!!" + + #### split SID into different regs + SIDlow = (standardid[0] & 0x03) << 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 + + packet = [SIDhigh, SIDlow, 0x00,0x00, # pad out EID regs + 0x08, # bit 6 must be set to 0 for data frame (1 for RTR) + # lower nibble is DLC + 0x01,0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0xFF] + + packetE = [SIDhigh, SIDlow | 0x80, 0x00,0x00, # pad out EID regs + 0x08, # bit 6 must be set to 0 for data frame (1 for RTR) + # lower nibble is DLC + 0x01,0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0xFF] + - packet = [0x00, - 0x08, # LOWER nibble must be 8 or greater to set EXTENDED ID - 0x00, 0x00, - 0x08, # UPPER nibble must be 0 to set RTR bit for DATA FRAME - # LOWER nibble is DLC - 0x01,0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0xFF] + self.client.txpacket(packetE); - self.client.txpacket(packet); - - if(self.client.peek8(0x2C)&0x80)==0x80: - print "Error flag raised on transmission. Clearing this flag and proceeding.\n" - print "INT Flags: %02x" % self.client.peek8(0x2c); - self.client.MCPbitmodify(0x2C,0x80,0x00); - print "INT Flags modified to: %02x\n" % self.client.peek8(0x2c); - print "TXB0CTRL: %02x" %self.client.peek8(0x30); - self.client.MCPbitmodify(0x30,0x08,0x00); - print "TXB0CTRL modified to: %02x\n" %self.client.peek8(0x30); - - print "message sending attempted."; - print "Tx Errors: %02x" % self.client.peek8(0x1c); - print "Rx Errors: %02x" % self.client.peek8(0x1d); - print "Error Flags: %02x" % self.client.peek8(0x2d); + checkcount = 0; + TXB0CTRL = self.client.peek8(0x30); + + while(TXB0CTRL | 0x00 != 0x00): + checkcount+=1; + TXB0CTRL = self.client.peek8(0x30); + if (checkcount %30 ==0): + print "Tx Errors: %3d" % self.client.peek8(0x1c); + print "Rx Errors: %3d" % self.client.peek8(0x1d); + print "EFLG register: %02x" % self.client.peek8(0x2d); + print "TXB0CTRL: %02x" %TXB0CTRL; + print "CANINTF: %02x\n" %self.client.peek8(0x2C); + + + if __name__ == "__main__": parser = argparse.ArgumentParser(formatter_class=argparse.RawDescriptionHelpFormatter,description='''\ @@ -346,12 +435,13 @@ if __name__ == "__main__": parser.add_argument('verb', choices=['info', 'test','peek', 'reset', 'sniff', 'freqtest','snifftest', 'spit']); parser.add_argument('-f', '--freq', type=int, default=500, help='The desired frequency (kHz)', choices=[100, 125, 250, 500, 1000]); parser.add_argument('-t','--time', type=int, default=15, help='The duration to run the command (s)'); - parser.add_argument('-o', '--output', default="../../contrib/ted/sniff_out.csv",help='Output file'); + parser.add_argument('-o', '--output', default=None,help='Output file'); parser.add_argument("-d", "--description", help='Description of experiment (included in the output file)', default=""); parser.add_argument('-v',"--verbose",action='store_false',help='-v will stop packet output to terminal', default=True); parser.add_argument('-c','--comment', help='Comment attached to ech packet uploaded',default=None); parser.add_argument('-b', '--debug', action='store_true', help='-b will turn on debug mode, printing packet status', default=False); parser.add_argument('-a', '--standardid', type=int, action='append', help='Standard ID to accept with filter 0 [1, 2, 3, 4, 5]', default=None); + parser.add_argument('-x', '--faster', action='store_true', help='-x will use "fast packet recieve," which may duplicate packets and/or cause other weird behavior', default=False); args = parser.parse_args(); @@ -363,6 +453,7 @@ if __name__ == "__main__": comments = args.comment debug = args.debug standardid = args.standardid + faster=args.faster comm = GoodFETMCPCANCommunication(); @@ -394,7 +485,7 @@ if __name__ == "__main__": # if(args.verb=="sniff"): - comm.sniff(freq=freq,duration=duration,filename=filename,description=description,verbose=verbose,comment=comments, standardid=standardid) + comm.sniff(freq=freq,duration=duration,description=description,verbose=verbose,comment=comments,filename=filename, standardid=standardid, debug=debug, faster=faster) ########################## # SNIFF TEST @@ -407,6 +498,7 @@ if __name__ == "__main__": if(args.verb=="snifftest"): comm.sniffTest(freq=freq) + ########################## # FREQ TEST ########################## @@ -420,6 +512,8 @@ if __name__ == "__main__": if(args.verb=="freqtest"): comm.freqtest(freq=freq) + + ########################## # iSniff ########################## @@ -465,7 +559,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) + comm.spit(freq=freq, standardid=standardid, debug=debug)