projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed a usage line of goodfet.nrf.
[goodfet]
/
client
/
GoodFETMSP430.py
diff --git
a/client/GoodFETMSP430.py
b/client/GoodFETMSP430.py
index
ef9c64d
..
ac9ab74
100644
(file)
--- a/
client/GoodFETMSP430.py
+++ b/
client/GoodFETMSP430.py
@@
-66,7
+66,7
@@
class GoodFETMSP430(GoodFET):
self.writecmd(self.MSP430APP,0x03,6,self.data);
written=ord(self.data[0])+(ord(self.data[1])<<8);
if(written!=val):
self.writecmd(self.MSP430APP,0x03,6,self.data);
written=ord(self.data[0])+(ord(self.data[1])<<8);
if(written!=val):
- print "Failed to write 0x%04x to 0x
$
04x" % (val,adr);
+ 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."""
return written;
def MSP430pokeflash(self,adr,val):
"""Write the contents of flash memory at an address."""
@@
-87,6
+87,11
@@
class GoodFETMSP430(GoodFET):
"""Start debugging."""
self.writecmd(self.MSP430APP,0x20,0,self.data);
self.JTAGID=ord(self.data[0]);
"""Start debugging."""
self.writecmd(self.MSP430APP,0x20,0,self.data);
self.JTAGID=ord(self.data[0]);
+ if(not (self.JTAGID==0x89 or self.JTAGID==0x91)):
+ #Try once more
+ self.writecmd(self.MSP430APP,0x20,0,self.data);
+ 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.\nCheck wiring, as this should be 0x89 or 0x91." % self.JTAGID;
#print "Identified as %02x." % self.JTAGID;
if(not (self.JTAGID==0x89 or self.JTAGID==0x91)):
print "Error, misidentified as %02x.\nCheck wiring, as this should be 0x89 or 0x91." % self.JTAGID;