X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFETMCPCANCommunication.py;h=f0e6eaff6c7cda062c18446bed58432f16766b25;hp=6e9b76eff1850ab496627639e99abd1b6ca252e6;hb=0c1cae929512565296940bf6322087a73b2cecd0;hpb=c35c6efb0263d915937e7d0d142eaad869fb9a90 diff --git a/client/GoodFETMCPCANCommunication.py b/client/GoodFETMCPCANCommunication.py index 6e9b76e..f0e6eaf 100644 --- a/client/GoodFETMCPCANCommunication.py +++ b/client/GoodFETMCPCANCommunication.py @@ -3,13 +3,11 @@ # # (C) 2012 Travis Goodspeed # +# Edited By: Chris Hoder 2013 +# Ted Summers 2013 +# Grayson Zulauf 2013 # -# Ted's working copy -# 1) getting hot reads on frequency -# 2) allow sniffing in "normal" mode to get ack bits -# --check if that's whats causing error flags in board-to-board transmission -# -# + import sys; import binascii; @@ -24,9 +22,9 @@ import Queue class GoodFETMCPCANCommunication: - def __init__(self, dataLocation): + def __init__(self, dataLocation = "../../contrib/ThayerData/"): self.client=GoodFETMCPCAN(); - """ Communication with the bus""" + """ Communication with the bus""" self.client.serInit() self.client.MCPsetup(); #self.DATA_LOCATION = "../../contrib/ThayerData/" @@ -40,7 +38,7 @@ class GoodFETMCPCANCommunication: def printInfo(self): """ This method will print information about the board to the terminal. - It is good for diagnostics + It is good for diagnostics. """ self.client.MCPreqstatConfiguration(); @@ -528,7 +526,6 @@ class GoodFETMCPCANCommunication: RXFSIDL = 0x19; RXFDB0 = 0x1A; RXFDB1 = 0x1B; - self.client.poke8(RXFSIDH, SIDhigh); self.client.poke8(RXFSIDL, SIDlow); @@ -538,8 +535,86 @@ class GoodFETMCPCANCommunication: if (verbose == True): print "Filtering for SID %d DB0 %d DB1 %d with filter #%d"%(standardid, DB0, DB1, filter); - self.client.MCPreqstatNormal(); - + self.client.MCPreqstatNormal(); + + def multiPacketTest(self): + + self.reset(); + self.client.MCPsetrate(500); + self.client.MCPreqstatNormal(); + + packet0 = [0x00, 0x00, 0x00,0x00, # pad out EID regs + 0x08, # bit 6 must be set to 0 for data frame (1 for RTR) + # lower nibble is DLC + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00] + + packet1 = [0x00, 0x20, 0x00,0x00, # pad out EID regs + 0x08, # bit 6 must be set to 0 for data frame (1 for RTR) + # lower nibble is DLC + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00] + packet2 = [0x00, 0x40, 0x00,0x00, # pad out EID regs + 0x08, # bit 6 must be set to 0 for data frame (1 for RTR) + # lower nibble is DLC + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00] + + comm.multiPacketSpit(packet0=packet0, packet1=packet1, packet2=packet2) + + comm.multiPacketSpit(packet0rts=True, packet1rts=True, packet2rts=True) + comm.multiPacketSpit(packet2rts=True) + comm.multiPacketSpit(packet1rts=True) + comm.multiPacketSpit(packet0rts=True) + + + + def multiPacketSpit(self, packet0 = None, packet1 = None, packet2 = None, packet0rts = False, packet1rts = False, packet2rts = False): + """ + This method writes packets to the chip's TX buffers and/or sends the contents of the buffers onto the bus. + + @type packet0: list of integer + @param packet0: A list of 13 integers of the format [SIDhigh SIDlow 0 0 DLC DB0-7] to be loaded into TXBF0 + + @type packet1: list of integer + @param packet1: A list of 13 integers of the format [SIDhigh SIDlow 0 0 DLC DB0-7] to be loaded into TXBF1 + + @type packet2: list of integer + @param packet2: A list of 13 integers of the format [SIDhigh SIDlow 0 0 DLC DB0-7] to be loaded into TXBF2 + + @type packet0rts: Boolean + @param packet0rts: If true the message in TX buffer 0 will be sent + + @type packet2rts: Boolean + @param packet0rts: If true the message in TX buffer 1 will be sent + + @type packet2rts: Boolean + @param packet0rts: If true the message in TX buffer 2 will be sent + + """ + + if(packet0 != None): + self.client.writetxbuffer(packet0,0) + # print("trying to write TX buffer 0"); + # for db in packet0: + # print" %d" %db + if (packet1 != None): + self.client.writetxbuffer(packet1,1) + # print("trying to write TX buffer 1"); + # for db in packet0: + # print" %d" %db + if (packet2 != None): + self.client.writetxbuffer(packet2,2) + # print("trying to write TX buffer 2"); + # for db in packet0: + # print" %d" %db + + # if(packet0rts): + # print("trying to send TX buffer 0") + #if(packet1rts): + # print("trying to send TX buffer 1") + #if(packet2rts): + # print("trying to send TX buffer 2") + + self.client.MCPrts(TXB0=packet0rts, TXB1=packet1rts, TXB2=packet2rts) + def spitSetup(self,freq): """ @@ -718,6 +793,25 @@ class GoodFETMCPCANCommunication: # row[4] = Data Byte 1 # .... up to Data Byte 8 ( THIS ASSUMES A PACKET OF LENGTH 8!!! def writeData(self,packets,freq): + """ + This method will write a list of packets to the bus at the given frequency. This method assumes a packet + length of 8 for all packets as well as a standard id. + + @type packets: List of Lists + @param packets: The list of packets to be injected into the bus. Each element of packets is a list that is + a packet to be injected onto the bus. These packets are assumed to be in the following format:: + 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 + ... + row[10] = Data Byte 7 + + @type freq: number + @param freq: Frequency of the CAN bus + + """ self.client.serInit() self.spitSetup(freq) for row in packets: @@ -734,6 +828,8 @@ class GoodFETMCPCANCommunication: packet.append(row[i]) print packet self.client.txpacket(packet) + + @@ -757,7 +853,7 @@ if __name__ == "__main__": ''') - parser.add_argument('verb', choices=['info', 'test','peek', 'reset', 'sniff', 'freqtest','snifftest', 'spit', 'packet']); + parser.add_argument('verb', choices=['info', 'test','peek', 'reset', 'sniff', 'freqtest','snifftest', 'spit', 'packet', 'multipacket']); 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=None,help='Output file'); @@ -791,6 +887,8 @@ if __name__ == "__main__": if(args.verb=="packet"): comm.filterForPacket(standardid=standardid[0], DB0=db0, DB1=db1, verbose= True) + if(args.verb=="multipacket"): + comm.multiPacketTest(); ########################## # INFO