X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFETMCPCANCommunication.py;h=eb8ba45aa9d599142aa6ed32d3691923cd11f5de;hp=ab023068deeedf9e09cf50f32bc5df34df057ee5;hb=f31dd7753fb0c29eb00b5c368ab395fca54ef557;hpb=f15cabc15a42fb1b0b57e433dc3a1f300cff2b6c diff --git a/client/GoodFETMCPCANCommunication.py b/client/GoodFETMCPCANCommunication.py index ab02306..eb8ba45 100644 --- a/client/GoodFETMCPCANCommunication.py +++ b/client/GoodFETMCPCANCommunication.py @@ -17,7 +17,7 @@ import array; import csv, time, argparse; import datetime import os - +from random import randrange from GoodFETMCPCAN import GoodFETMCPCAN; from intelhex import IntelHex; @@ -72,12 +72,16 @@ class GoodFETMCPCANCommunication: # SNIFF ########################## - def sniff(self,freq,duration,description, verbose=True, comment=None, filename=None, standardid=None, debug=False, faster=False): - + def sniff(self,freq,duration,description, verbose=True, comment=None, filename=None, standardid=None, debug=False, faster=False, parsed=True): + + #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 @@ -117,8 +121,8 @@ class GoodFETMCPCANCommunication: self.client.poke8(RXFSIDL, SIDlow); if (verbose == True): - print "Filtering for SID %d (0x%02xh) with filter #%d"%(ID, ID, filter); - comment = comment + ("%d " %(ID)) + print "Filtering for SID %d (0x%02xh) with filter #%d"%(ID, ID, filter); + comment += ("f%d" %(ID)) self.client.MCPsetrate(freq); @@ -170,7 +174,24 @@ class GoodFETMCPCANCommunication: row.append("%f"%time.time()); if( verbose==True): - print self.client.packet2str(packet) + #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]) + print msg + # if we want to print just the message as it is read off the chip + else: + print self.client.packet2str(packet) if(debug == True): @@ -197,6 +218,13 @@ 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)); @@ -207,22 +235,52 @@ class GoodFETMCPCANCommunication: return packetcount - def filterStdSweep(self, freq, time = 5): + def filterStdSweep(self, freq, low, high, time = 5): msgIDs = [] - for i in range(0, 2047, 6): + 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_%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: %d" % (j) + 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]) + 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 sniffTest(self, freq): rate = freq; @@ -248,6 +306,7 @@ class GoodFETMCPCANCommunication: def freqtest(self,freq): + self.client.MCPsetup(); self.client.MCPsetrate(freq); @@ -296,74 +355,97 @@ 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, standardid,debug): - + def spitSetup(self,freq): comm.reset(); self.client.MCPsetrate(freq); self.client.MCPreqstatNormal(); - if(debug==True): - print "\n\nATTEMPTING TRANSMISSION!!!" - 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\n" %self.client.peek8(0x2C); + def spit(self,freq, standardid,debug, packet = None): + + #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\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] + #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] - self.client.txpacket(packet); + if(packet == None): + 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] + else: + 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 + packet[0],packet[1],packet[2],packet[3],packet[4],packet[5],packet[6],packet[7],packet[8]] - TXB0CTRL = self.client.peek8(0x30); + self.client.txpacket(packetE); - 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); - self.client.MCPbitmodify(0x30,0x08,0x00); - print "TXB0CTRL modified to: %02x\n" %self.client.peek8(0x30); + checkcount = 0; + TXB0CTRL = self.client.peek8(0x30); - print "CANINTF: %02x" %self.client.peek8(0x2C); - self.client.MCPbitmodify(0x2C,0x80,0x00); - print "INT Flags modified to: %02x\n" % self.client.peek8(0x2c); + 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); + + def setRate(self,freq): + self.client.MCPsetrate(freq);