X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=inline;f=client%2FGoodFETMCPCANCommunication.py;h=b09fb5e84b8c30de55a20426c5b438addba416c3;hb=f3f96e7ef9e9fd6fe27360651e3c2142ac1eae8c;hp=7d8c205d31b6d3d6288fa11e87fb6137cf024027;hpb=e96e56891d1e010ab336a0af9b00f0272a8a8196;p=goodfet diff --git a/client/GoodFETMCPCANCommunication.py b/client/GoodFETMCPCANCommunication.py index 7d8c205..b09fb5e 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; @@ -234,6 +234,29 @@ class GoodFETMCPCANCommunication: 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; @@ -259,6 +282,7 @@ class GoodFETMCPCANCommunication: def freqtest(self,freq): + self.client.MCPsetup(); self.client.MCPsetrate(freq); @@ -307,34 +331,37 @@ 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): @@ -343,13 +370,14 @@ class GoodFETMCPCANCommunication: 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); + 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 @@ -360,20 +388,27 @@ class GoodFETMCPCANCommunication: # lower nibble is DLC 0x01,0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0xFF] - self.client.txpacket(packet); + 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] + - 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); +