Updates to GoodFETMCPCANCommunication.py. Pared down SPI transmission in sniff, speed...
authorchrishoder <chrishoder@12e2690d-a6be-4b82-a7b7-67c4a43b65c8>
Tue, 22 Jan 2013 02:16:30 +0000 (02:16 +0000)
committerchrishoder <chrishoder@12e2690d-a6be-4b82-a7b7-67c4a43b65c8>
Tue, 22 Jan 2013 02:16:30 +0000 (02:16 +0000)
git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@1397 12e2690d-a6be-4b82-a7b7-67c4a43b65c8

client/GoodFETMCPCAN.py
client/GoodFETMCPCANCommunication.py

index 7182d37..3b4a63a 100644 (file)
@@ -3,7 +3,14 @@
 # 
 # (C) 2012 Travis Goodspeed <travis at radiantmachines.com>
 #
-# This code is being rewritten and refactored.  You've been warned!
+# WORKING COPY
+# Currently being updated by Siege Technology's ENGS89 team
+# Primary contact: Theodore Sumers <ted.sumers at gmail.com>
+# ADDED FUNCTIONALITY:
+#   10.4/41.6/83.3 kHz sniffing
+#   setbitrate
+#   debugs on TX and RX packet
+#   int-based state change reqs for preserving state
 #
 
 # The MCP2515 is a CAN Bus to SPI adapter from Microchip Technology,
@@ -19,11 +26,11 @@ class GoodFETMCPCAN(GoodFETSPI):
     adapter on the Goodthopter10 hardware."""
     MCPMODES=["Normal","Sleep","Loopback","Listen-only","Configuration",
               "UNKNOWN","UNKNOWN","PowerUp"];
+    
     def MCPsetup(self):
         """Sets up the ports."""
         self.SPIsetup();
         self.MCPreset(); #Reset the chip.
-        
         # We're going to set some registers, so we must be in config
         # mode.
         self.MCPreqstatConfiguration();
@@ -32,55 +39,46 @@ class GoodFETMCPCAN(GoodFETSPI):
         # packets.  It can be manually disabled later.
         #self.poke8(0x60,0xFF); #TODO Does this have any unpleasant side effects?
         self.poke8(0x60,0x66); #Wanted FF, but some bits are reserved.
-        
-        #Set the default rate.
-        self.MCPsetrate();
-    
+
     #Array of supported rates.
-    MCPrates=[83.3, 100, 125,
-              250, 500, 1000];
+    MCPrates=[10.4, 41.6, 83.3, 100, 125, 250, 500, 1000];
+    
+    def MCPreset(self):
+        """Reset the MCP2515 chip."""
+        self.SPItrans([0xC0]);
+    
+      
+    ################    SETTING BAUD RATE   ################
+    
     
     def MCPsetrate(self,rate=125):
         """Sets the data rate in kHz."""
         # Now we need to set the timing registers.  See chapter 5 of
         # the MCP2515 datasheet to get some clue as to how this
-        # arithmetic of this works, as my comments here will likely be
-        # rambling, incoherent, and unchanged after I get the infernal
-        # thing working.
-        
-        # First, we must chose a Time Quanta (QT) which is used to
-        # define the durations of these segments.  Section 5.3
-        # suggests setting BRP<5:0> to 0x04 to get a TQ=500ns, as a 20
-        # MHz crystal gives a clock period of 50ns.  This way, for 125
-        # kHz communication, the bit time must be 16 TQ.
-        
-        # A bit consists of four parts:
-        # 1: SyncSeg             1 TQ
-        # 2: PropSeg             2 TQ
-        # 3: PhaseSeg1 (PS1)     7 TQ
-        # 4: PhaseSeg2 (PS2)     6 TQ
-        
-        # CNF1 with a prescaler of 4 and a SJW of 1 TQ.  SJW of 4
-        # might be more stable.
-        #self.poke8(0x2a,0x04);
-        
-        # CNF2 with a BLTMODE of 1, SAM of 0, PS1 of 7TQ, and PRSEG of 2TQ
-        #self.poke8(0x29,
-        #           0x80   |  # BTLMODE=1
-        #           (6<<3) |  # 6+1=7TQ for PHSEG1
-        #           (1)       # 1+1=2TQ for PRSEG
-        #           );
-        
-        #CNF3 with a PS2 length of 6TQ.
-        #self.poke8(0x28,
-        #           5      #5+1=6TQ
-        #           );
-        
+        # arithmetic of this works.
+
         
+        #STORE the prior status
+        oldstatus=self.MCPcanstatint();
         print "Setting rate of %i kHz." % rate;
+        #print "Current state is %s." % self.MCPcanstatstr();
+        self.MCPreqstatConfiguration();
+        # print "Switched to %s state." % self.MCPcanstatstr();
+        
         
-        #These are the new examples.
-        if rate==125:
+        if rate>41 and rate<42:
+            # NOT CHECKED: based on kvaser website.
+            # Sets baud rate for 41.6 kbps
+            CNF1=0x8e;
+            CNF2=0xa3;
+            CNF3=0x05;
+        elif rate>10 and rate<11:
+            # NOT CHECKED: based on kvaser website.
+            # Sets baud rate for 10.4 kbps
+            CNF1=0xbb;
+            CNF2=0xa3;
+            CNF3=0x05;  
+        elif rate==125:
             #125 kHz, 16 TQ, not quite as worked out above.
             CNF1=0x04;
             CNF2=0xB8;
@@ -121,13 +119,41 @@ class GoodFETMCPCAN(GoodFETSPI):
         self.poke8(0x2a,CNF1);
         self.poke8(0x29,CNF2);
         self.poke8(0x28,CNF3);
-        
-    def MCPreset(self):
-        """Reset the MCP2515 chip."""
-        self.SPItrans([0xC0]);
+
+        # and now return to whatever state we were in before
+        self.MCPreqstat(oldstatus);
+        #print "Reverted to %s." % self.MCPcanstatstr();
+
+    
+    #################   STATE MANAGEMENT   ##################
+
     def MCPcanstat(self):
         """Get the CAN Status."""
         return self.peek8(0x0E);
+    def MCPcanstatstr(self):
+        """Read the present status as a string."""
+        opmod=self.MCPcanstatint();
+        return self.MCPMODES[opmod];
+    def MCPcanstatint(self):
+        """Read present status as an int."""
+        return self.MCPcanstat()>>5;
+
+            
+    def MCPreqstat(self, state):
+        """Set the CAN state."""
+        if state==0:
+            self.MCPreqstatNormal();
+        elif state==1:
+            self.MCPreqstatSleep();
+        elif state==2:
+            self.MCPreqstatLoopback();
+        elif state==3:
+            self.MCPreqstatListenOnly();
+        elif state==4:
+            self.MCPreqstatConfiguration();
+        else:
+            print "Invalid state entered; defaulting to Listen-Only"
+            self.MCPreqstatListenOnly();
     def MCPreqstatNormal(self):
         """Set the CAN state."""
         state=0x0;
@@ -149,11 +175,8 @@ class GoodFETMCPCAN(GoodFETSPI):
         state=0x4;
         self.MCPbitmodify(0x0F,0xE0,(state<<5));
     
-    def MCPcanstatstr(self):
-        """Read the present status as a string."""
-        status=self.MCPcanstat();
-        opmod=(status&0xE0)>>5;
-        return self.MCPMODES[opmod];
+    ####################     RX MANAGEMENT     #####################
+    
     def MCPrxstatus(self):
         """Reads the RX Status by the SPI verb of the same name."""
         data=self.SPItrans([0xB0,0x00]);
@@ -161,38 +184,25 @@ class GoodFETMCPCAN(GoodFETSPI):
 
     def MCPreadstatus(self):
         """Reads the Read Status by the SPI verb of the same name."""
-        #See page 67 of the datasheet for the flag names.
+        #See page 69 of the datasheet for the flag names.
         data=self.SPItrans([0xA0,0x00]);
         return ord(data[1]);
-
-    def MCPrts(self,TXB0=False,TXB1=False,TXB2=False):
-        """Requests to send one of the transmit buffers."""
-        flags=0;
-        if TXB0: flags=flags|1;
-        if TXB1: flags=flags|2;
-        if TXB2: flags=flags|4;
-        
-        if flags==0:
-            print "Warning: Requesting to send no buffer.";
-        
-        self.SPItrans([0x80|flags]);
+            
     def readrxbuffer(self,packbuf=0):
         """Reads the RX buffer.  Might have old data."""
         data=self.SPItrans([0x90|(packbuf<<2),
-                       0x00,0x00, #SID
-                       0x00,0x00, #EID
-                       0x00,      #DLC
-                       0x00, 0x00, 0x00, 0x00,
-                       0x00, 0x00, 0x00, 0x00
-                       ]);
-        return data[1:len(data)];
-    def writetxbuffer(self,packet,packbuf=0):
-        """Writes the transmit buffer."""
-        self.SPItrans([0x40|(packbuf<<1)]+packet);
+                            0x00,0x00, #SID
+                            0x00,0x00, #EID
+                            0x00,      #DLC
+                            0x00, 0x00, 0x00, 0x00,
+                            0x00, 0x00, 0x00, 0x00
+                            ]);
         
+        return data[1:len(data)];
+    
     def rxpacket(self):
         """Reads the next incoming packet from either buffer.
-        Returns None immediately if no packet is waiting."""
+            Returns None immediately if no packet is waiting."""
         status=self.MCPrxstatus()&0xC0;
         if status&0x40:
             #Buffer 0 has higher priority.
@@ -202,12 +212,49 @@ class GoodFETMCPCAN(GoodFETSPI):
             return self.readrxbuffer(1);
         else:
             return None;
+
+    #################      TX MANAGEMENT    ##################
+            
+    def MCPrts(self,TXB0=False,TXB1=False,TXB2=False):
+        """Requests to send one of the transmit buffers."""
+        flags=0;
+        if TXB0: flags=flags|1;
+        if TXB1: flags=flags|2;
+        if TXB2: flags=flags|4;
+        
+        if flags==0:
+            print "Warning: Requesting to send no buffer.";
+        if self.MCPcanstat()>>5!=0:
+            print "Warning: currently in %s mode. NOT in normal mode! May not transmit." %self.MCPcanstatstr();
+        self.SPItrans([0x80|flags]);
+    
+    def writetxbuffer(self,packet,packbuf=0):
+        """Writes the transmit buffer."""
+        
+        self.SPItrans([0x40|(packbuf<<1)]+packet);
+        #READ BACK BUFFER 0 to check what we're about to send out
+        data=self.SPItrans([0x03, 0x31,                        
+                            0x00,0x00, #SID
+                            0x00,0x00, #EID
+                            0x00,      #DLC
+                            0x00, 0x00, 0x00, 0x00,
+                            0x00, 0x00, 0x00, 0x00
+                            ]);
+        print "about to transmit:" + self.packet2str(data[2:len(data)]);
+        
     def txpacket(self,packet):
         """Transmits a packet through one of the outbound buffers.
         As usual, the packet should begin with SIDH.
         For now, only TXB0 is supported."""
+
         self.writetxbuffer(packet,0);
+
+        #self.SPItrans([0x81]);
         self.MCPrts(TXB0=True);
+
+                
+    ###############   UTILITY FUNCTIONS  #################
+            
     def packet2str(self,packet):
         """Converts a packet from the internal format to a string."""
         toprint="";
@@ -218,10 +265,6 @@ class GoodFETMCPCAN(GoodFETSPI):
         """Read a byte from the given address.  Untested."""
         data=self.SPItrans([0x03,adr&0xFF,00]);
         return ord(data[2]);
-    def MCPbitmodify(self,adr,mask,data):
-        """Writes a byte with a mask.  Doesn't work for many registers."""
-        data=self.SPItrans([0x05,adr&0xFF,mask&0xFF,data&0xFF]);
-        return ord(data[2]);
     def poke8(self,adr,val):
         """Poke a value into RAM.  Untested"""
         self.SPItrans([0x02,adr&0xFF,val&0xFF]);
@@ -230,3 +273,34 @@ class GoodFETMCPCAN(GoodFETSPI):
             print "Failed to poke %02x to %02x.  Got %02x." % (adr,val,newval);
             print "Are you not in idle mode?";
         return val;
+    def MCPbitmodify(self,adr,mask,data):
+        """Writes a byte with a mask.  Doesn't work for many registers."""
+        data=self.SPItrans([0x05,adr&0xFF,mask&0xFF,data&0xFF]);
+        return ord(data[2]);
+
+############### DEBUG UTILITIES: STATUS MESSAGES ##############
+
+#    def MCPrxstatusmessage(self):
+#        """Returns string indicating status of RX buffers"""
+#        status = self.MCPrxstatus();
+#
+#        if status < 64:
+#            print "No RX message";
+#        elif status < 128:
+#            print "Message in RXB0";
+#        elif status < 192:
+#            print "Message in RXB1";
+#        else:
+#            print "Messages in both buffers";
+
+
+
+# TXB0TRL = 0x30
+# RXB0CTRL = 0x60
+# CNF3/2/1 = 0x28, 29, 2a
+# CANINTE = 0x2b
+# CANINTF = 0x2c
+# TXRTSCTRL = x0D
+
+
+    
\ No newline at end of file
index e59a91b..67616be 100644 (file)
@@ -15,7 +15,6 @@ import sys;
 import binascii;
 import array;
 import csv, time, argparse;
-import datetime
 
 from GoodFETMCPCAN import GoodFETMCPCAN;
 from intelhex import IntelHex;
@@ -26,24 +25,18 @@ class GoodFETMCPCANCommunication:
        self.client=GoodFETMCPCAN();
        self.client.serInit()
        self.client.MCPsetup();
+       
     
-       # create a filename with today's date
-       now = datetime.datetime.now()
-       self.filename = "../../contrib/ThayerData/"
-       self.filename += now.strftime("%Y%m%d")
-    
-    ##########################
-    #   INFO
-    ##########################
-    #
-    # Prints MCP state info
-    #
     def printInfo(self):
+        
+        self.client.MCPreqstatConfiguration();
+        
         print "MCP2515 Info:\n\n";
         
         print "Mode: %s" % self.client.MCPcanstatstr();
         print "Read Status: %02x" % self.client.MCPreadstatus();
         print "Rx Status:   %02x" % self.client.MCPrxstatus();
+        print "Error Flags:  %02x" % self.client.peek8(0x2D);
         print "Tx Errors:  %3d" % self.client.peek8(0x1c);
         print "Rx Errors:  %3d\n" % self.client.peek8(0x1d);
         
@@ -53,6 +46,14 @@ class GoodFETMCPCANCommunication:
         print "CNF3: %02x\n" %self.client.peek8(0x28);
         print "RXB0 CTRL: %02x" %self.client.peek8(0x60);
         print "RXB1 CTRL: %02x" %self.client.peek8(0x70);
+        
+        print "RX Info:";
+        print "RXB0: %02x" %self.client.peek8(0x60);
+        print "RXB1: %02x" %self.client.peek8(0x70);
+        print "RXB0 masks: %02x, %02x, %02x, %02x" %(self.client.peek8(0x20), self.client.peek8(0x21), self.client.peek8(0x22), self.client.peek8(0x23));
+        print "RXB1 masks: %02x, %02x, %02x, %02x" %(self.client.peek8(0x24), self.client.peek8(0x25), self.client.peek8(0x26), self.client.peek8(0x27));
+
+        
         print "RX Buffers:"
         packet0=self.client.readrxbuffer(0);
         packet1=self.client.readrxbuffer(1);
@@ -61,50 +62,129 @@ class GoodFETMCPCANCommunication:
            
     def reset(self):
         self.client.MCPsetup();
+    
+    ##########################
+    #   SNIFF
+    ##########################
          
-    def sniff(self,freq,duration,description, verbose=True, comment=None, filename=None,):
-        if(filename==None):
-            filename=self.filename
+    def sniff(self,freq,duration,filename,description, verbose=True, comment=None, standardid=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 & 0x03) << 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.MCPsetrate(freq);
+        
         outfile = open(filename,'a');
         dataWriter = csv.writer(outfile,delimiter=',');
         dataWriter.writerow(['# Time     Error        Bytes 1-13']);
         dataWriter.writerow(['#' + description])
-            
-        self.client.MCPreqstatListenOnly();
+        
+        self.client.MCPreqstatNormal();
         print "Listening...";
         packetcount = 0;
         starttime = time.time();
-    
+        
         while((time.time()-starttime < duration)):
             packet=self.client.rxpacket();
+            
+            if(debug == True):
+                #check packet status
+                MCPstatusReg = self.client.MCPrxstatus();
+                messagestat=MCPstatusReg&0xC0;
+                messagetype=MCPstatusReg&0x18;
+                if(messagestat == 0xC0):
+                    print "Message in both buffers; message type is %02x (0x00 is standard data, 0x08 is standard remote)." %messagetype
+                elif(messagestat == 0x80):
+                    print "Message in RXB1; message type is %02x (0x00 is standard data, 0x08 is standard remote)." %messagetype
+                elif(messagestat == 0x40):
+                    print "Message in RXB0; message type is %02x (0x00 is standard data, 0x08 is standard remote)." %messagetype
+                elif(messagestat == 0x00):
+                    print "No messages in buffers."
+            
             if packet!=None:
-                if( verbose==True):
-                    print self.client.packet2str(packet)   
+                
                 packetcount+=1;
                 row = [];
                 row.append("%f"%time.time());
-                if (self.client.peek8(0x2C) & 0x80):
-                    self.client.MCPbitmodify(0x2C,0x80,0x00);
-                    print "ERROR: Malformed packet recieved: " + self.client.packet2str(packet);
-                    row.append(1);
+                
+                if( verbose==True):
+                    print self.client.packet2str(packet)
+                
+                if(debug == True):
+                    
+                    #check overflow
+                    MCPeflgReg=self.client.peek8(0x2D);
+                    print"EFLG register equals: %x" %MCPeflgReg;
+                    if((MCPeflgReg & 0xC0)==0xC0):
+                        print "WARNING: BOTH overflow flags set. Missed a packet. Clearing and proceeding."
+                    elif(MCPeflgReg & 0x80):
+                        print "WARNING: RXB1 overflow flag set. A packet has been missed. Clearing and proceeding."
+                    elif(MCPeflgReg & 0x40):
+                        print "WARNING: RXB0 overflow flag set. A packet has been missed. Clearing and proceeding."
+                    self.client.MCPbitmodify(0x2D,0xC0,0x00);
+                    print"EFLG register set to: %x" % self.client.peek(0x2D);
+                
+                    #check for errors
+                    if (self.client.peek8(0x2C) & 0x80):
+                        self.client.MCPbitmodify(0x2C,0x80,0x00);
+                        print "ERROR: Malformed packet recieved: " + self.client.packet2str(packet);
+                        row.append(1);
+                    else:
+                        row.append(0);
                 else:
-                    row.append(0);
-
-                #write comment
+                    row.append(0);  #since we don't check for errors if we're not in debug mode...
+                            
                 row.append(comment)
                 for byte in packet:
                     row.append("%02x"%ord(byte));
                 dataWriter.writerow(row);
         
         outfile.close()
-        print "Listened for %x seconds, captured %x packets." %(duration,packetcount);
-        
-        
-        
+        print "Listened for %d seconds, captured %d packets." %(duration,packetcount);
+     
     def sniffTest(self, freq):
-        self.client.MCPsetup();
-    
+        
         rate = freq;
         
         print "Calling MCPsetrate for %i." %rate;
@@ -263,10 +343,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=None, elp='Output file');
+    parser.add_argument('-o', '--output', default="../../contrib/ted/sniff_out.csv",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);
+
     
     args = parser.parse_args();
     freq = args.freq
@@ -275,6 +358,8 @@ if __name__ == "__main__":
     description = args.description
     verbose = args.verbose
     comments = args.comment
+    debug = args.debug
+    standardid = args.standardid
 
     comm = GoodFETMCPCANCommunication();
     
@@ -306,9 +391,7 @@ if __name__ == "__main__":
     #
     
     if(args.verb=="sniff"):
-        comm.sniff(freq=freq,duration=duration,description=description,verbose=verbose,comment=comments,filename=filename)
-        
-    
+        comm.sniff(freq=freq,duration=duration,filename=filename,description=description,verbose=verbose,comment=comments, standardid=standardid)    
                     
     ##########################
     #   SNIFF TEST
@@ -356,7 +439,6 @@ if __name__ == "__main__":
     if(args.verb=="test"):
         comm.test()
         
-        
     if(args.verb=="peek"):
         start=0x0000;
         if(len(sys.argv)>2):
@@ -381,6 +463,8 @@ if __name__ == "__main__":
     #   and thus not generating an ack bit on the recieving board)
     if(args.verb=="spit"):
         comm.spit(freq=freq)
+
+