added new mcpCAN communication file to allow for easier testing and data storage.

[goodfet] / client / GoodFETMSP430.py

diff --git a/client/GoodFETMSP430.py b/client/GoodFETMSP430.py
index 933e7dc..4d84a44 100644 (file)
--- a/client/GoodFETMSP430.py
+++ b/client/GoodFETMSP430.py
@@ -5,14 +5,17 @@
 #
 # Presently being rewritten.
 
-import sys, time, string, cStringIO, struct, glob, serial, os;
+import sys, time, string, cStringIO, struct, glob, os;
 
 from GoodFET import GoodFET;
 
 class GoodFETMSP430(GoodFET):
+    #Set APP to be MSP430APP or MSP430X2APP, the latter being preferred.
+    
+    #0x16 for class, 0x17 for SBW, 0x11 by default
     APP=0x11;
-    MSP430APP=0x11;    #Changed by inheritors.
-    MSP430X2APP=0x16;  #Changed by inheritors.
+    MSP430APP=0x11;    
+    
     CoreID=0;
     DeviceID=0;
     JTAGID=0;
@@ -39,17 +42,20 @@ class GoodFETMSP430(GoodFET):
         return DeviceID;
     def peek16(self,adr,memory="vn"):
         return self.MSP430peek(adr);
+    def peek(self,adr,memory="vn"):
+        return self.MSP430peek(adr);
     def peek8(self,adr, memory="vn"):
         adr=self.MSP430peek(adr&~1);
         if adr&1==0: return adr&0xFF;
         else: return adr>>8;
+
     def MSP430peek(self,adr):
         """Read a word at an address."""
         self.data=[adr&0xff, (adr&0xff00)>>8,
                    (adr&0xff0000)>>16,(adr&0xff000000)>>24,
                    ];
         self.writecmd(self.MSP430APP,0x02,4,self.data);
-        
+        #print "Got %i bytes peeking 0x%04x." % (len(self.data),adr);
         return ord(self.data[0])+(ord(self.data[1])<<8);
     def MSP430peekblock(self,adr):
         """Grab a few block from an SPI Flash ROM.  Block size is unknown"""
@@ -76,6 +82,12 @@ class GoodFETMSP430(GoodFET):
                    val&0xff, (val&0xff00)>>8];
         self.writecmd(self.MSP430APP,0xE1,6,self.data);
         return ord(self.data[0])+(ord(self.data[1])<<8);
+    def setsecret(self,value):
+        """Set a secret word for later retreival.  Used by glitcher."""
+        self.MSP430pokeflash(0xFFFE,value);
+    def getsecret(self):
+        """Get a secret word.  Used by glitcher."""
+        return self.peek(0xfffe);
     def MSP430pokeflashblock(self,adr,data):
         """Write many words to flash memory at an address."""
         self.data=[adr&0xff, (adr&0xff00)>>8,
@@ -141,6 +153,8 @@ class GoodFETMSP430(GoodFET):
         0xf26f: "MSP430F261x",
         0xf237: "MSP430F23x0",
         0xf201: "MSP430F201x",
+        #Are G's and F's distinct?
+        0x2553: "MSP430G2553",
         
         #MSP430F1xx
         0xf16c: "MSP430F161x",
@@ -158,7 +172,7 @@ class GoodFETMSP430(GoodFET):
         0xF427: "MSP430FE42x", #or FW42x, F415, F417
         0xF439: "MSP430FG43x",
         0xf46f: "MSP430FG46xx", #or F471xx
-        
+        0xF413: "MSP430F413", #or maybe others.
         }
     def MSP430test(self):
         """Test MSP430 JTAG.  Requires that a chip be attached."""
@@ -198,7 +212,8 @@ class GoodFETMSP430(GoodFET):
         
         print "Tests complete, erasing."
         self.MSP430masserase();
-        
+    def erase(self):
+        self.MSP430masserase();
     def MSP430masserase(self):
         """Erase MSP430 flash memory."""
         self.writecmd(self.MSP430APP,0xE3,0,None);