X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFETMCPCAN.py;fp=client%2FGoodFETMCPCAN.py;h=165d972ce0150bf3b76a3d881899090e2690df5c;hp=b75c034ec380425987369b69a41fe8c69dae09fa;hb=1071b42a0f69b1539ac3d0da160fc8f74da97b90;hpb=343e4e97f563ce3a61396f7a24593c6c0940f361

diff --git a/client/GoodFETMCPCAN.py b/client/GoodFETMCPCAN.py
index b75c034..165d972 100644
--- a/client/GoodFETMCPCAN.py
+++ b/client/GoodFETMCPCAN.py
@@ -32,8 +32,11 @@ class GoodFETMCPCAN(GoodFETSPI):
         # packets.  It can be manually disabled later.
         self.poke8(0x60,0xFF); #TODO Does this have any unpleasant side effects?
         
-        #Set the default rate of 125kHz.
-        self.MCPsetrate(125);
+        #Set the default rate.
+        self.MCPsetrate();
+    
+    #Array of supported rates.
+    MCPrates=[100,125,250,500,1000];
     
     def MCPsetrate(self,rate=125):
         """Sets the data rate in kHz."""
@@ -79,18 +82,21 @@ class GoodFETMCPCAN(GoodFETSPI):
             CNF1=0x04;
             CNF2=0xB8;
             CNF3=0x05;
-        elif rate==500:
-            #500 kHz, 20 TQ
-            CNF1=0x00;
-            CNF2=0xBA;
-            CNF3=0x07;
-            pass;
         elif rate==100:
             #100 kHz, 20 TQ
             CNF1=0x04;
             CNF2=0xBA;
             CNF3=0x07;
-            pass;
+        elif rate==250:
+            #256 kHz, 20 TQ
+            CNF1=0x01;
+            CNF2=0xBA;
+            CNF3=0x07;
+        elif rate==500:
+            #500 kHz, 20 TQ
+            CNF1=0x00;
+            CNF2=0xBA;
+            CNF3=0x07;
         elif rate==1000:
             #1,000 kHz, 10 TQ
             CNF1=0x00;
@@ -98,7 +104,7 @@ class GoodFETMCPCAN(GoodFETSPI):
             CNF3=0x02;
             print "WARNING: Because of chip errata, this probably won't work."
         else:
-            print "Given unsupported rate of %i kHz.";
+            print "Given unsupported rate of %i kHz." % rate;
             print "Defaulting to 125kHz.";
             CNF1=0x04;
             CNF2=0xB8;