projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The Win32 gfbsl.exe now properly identifies serial ports automatically.
[goodfet]
/
client
/
GoodFETMSP430.py
diff --git
a/client/GoodFETMSP430.py
b/client/GoodFETMSP430.py
index
bb20bfe
..
4d54fd9
100644
(file)
--- a/
client/GoodFETMSP430.py
+++ b/
client/GoodFETMSP430.py
@@
-30,7
+30,7
@@
class GoodFETMSP430(GoodFET):
CoreID=ord(self.data[0])+(ord(self.data[1])<<8);
return CoreID;
def MSP430deviceid(self):
CoreID=ord(self.data[0])+(ord(self.data[1])<<8);
return CoreID;
def MSP430deviceid(self):
- """Get the
Cor
e ID."""
+ """Get the
Devic
e ID."""
self.writecmd(self.MSP430APP,0xF1);
DeviceID=(
ord(self.data[0])+(ord(self.data[1])<<8)+
self.writecmd(self.MSP430APP,0xF1);
DeviceID=(
ord(self.data[0])+(ord(self.data[1])<<8)+
@@
-64,7
+64,10
@@
class GoodFETMSP430(GoodFET):
(adr&0xff0000)>>16,(adr&0xff000000)>>24,
val&0xff, (val&0xff00)>>8];
self.writecmd(self.MSP430APP,0x03,6,self.data);
(adr&0xff0000)>>16,(adr&0xff000000)>>24,
val&0xff, (val&0xff00)>>8];
self.writecmd(self.MSP430APP,0x03,6,self.data);
- return ord(self.data[0])+(ord(self.data[1])<<8);
+ written=ord(self.data[0])+(ord(self.data[1])<<8);
+ if(written!=val):
+ print "Failed to write 0x%04x to 0x$04x" % (val,adr);
+ return written;
def MSP430pokeflash(self,adr,val):
"""Write the contents of flash memory at an address."""
self.data=[adr&0xff, (adr&0xff00)>>8,
def MSP430pokeflash(self,adr,val):
"""Write the contents of flash memory at an address."""
self.data=[adr&0xff, (adr&0xff00)>>8,
@@
-86,7
+89,7
@@
class GoodFETMSP430(GoodFET):
self.JTAGID=ord(self.data[0]);
#print "Identified as %02x." % self.JTAGID;
if(not (self.JTAGID==0x89 or self.JTAGID==0x91)):
self.JTAGID=ord(self.data[0]);
#print "Identified as %02x." % self.JTAGID;
if(not (self.JTAGID==0x89 or self.JTAGID==0x91)):
- print "Error, misidentified as %02x." % self.JTAGID;
+ print "Error, misidentified as %02x.
\nCheck wiring, as this should be 0x89 or 0x91.
" % self.JTAGID;
self.MSP430haltcpu();
def MSP430haltcpu(self):
"""Halt the CPU."""
self.MSP430haltcpu();
def MSP430haltcpu(self):
"""Halt the CPU."""
@@
-193,6
+196,10
@@
class GoodFETMSP430(GoodFET):
def MSP430masserase(self):
"""Erase MSP430 flash memory."""
self.writecmd(self.MSP430APP,0xE3,0,None);
def MSP430masserase(self):
"""Erase MSP430 flash memory."""
self.writecmd(self.MSP430APP,0xE3,0,None);
+ def MSP430infoerase(self):
+ """Erase MSP430 info flash."""
+ self.writecmd(self.MSP430APP,0xE8,0,None);
+
def MSP430setPC(self, pc):
"""Set the program counter."""
self.writecmd(self.MSP430APP,0xC2,2,[pc&0xFF,(pc>>8)&0xFF]);
def MSP430setPC(self, pc):
"""Set the program counter."""
self.writecmd(self.MSP430APP,0xC2,2,[pc&0xFF,(pc>>8)&0xFF]);