projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed monitor peek.
[goodfet]
/
client
/
GoodFETMSP430.py
diff --git
a/client/GoodFETMSP430.py
b/client/GoodFETMSP430.py
index
4551433
..
671bccd
100644
(file)
--- a/
client/GoodFETMSP430.py
+++ b/
client/GoodFETMSP430.py
@@
-10,12
+10,13
@@
import sys, time, string, cStringIO, struct, glob, serial, os;
from GoodFET import GoodFET;
class GoodFETMSP430(GoodFET):
from GoodFET import GoodFET;
class GoodFETMSP430(GoodFET):
+ APP=0x11;
MSP430APP=0x11; #Changed by inheritors.
CoreID=0;
DeviceID=0;
JTAGID=0;
MSP430ident=0;
MSP430APP=0x11; #Changed by inheritors.
CoreID=0;
DeviceID=0;
JTAGID=0;
MSP430ident=0;
- def
MSP430
setup(self):
+ def setup(self):
"""Move the FET into the MSP430 JTAG application."""
self.writecmd(self.MSP430APP,0x10,0,None);
"""Move the FET into the MSP430 JTAG application."""
self.writecmd(self.MSP430APP,0x10,0,None);
@@
-29,12
+30,18
@@
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)+
(ord(self.data[2])<<16)+(ord(self.data[3])<<24));
return DeviceID;
self.writecmd(self.MSP430APP,0xF1);
DeviceID=(
ord(self.data[0])+(ord(self.data[1])<<8)+
(ord(self.data[2])<<16)+(ord(self.data[3])<<24));
return DeviceID;
+ def peek16(self,adr,memory="vn"):
+ return self.MSP430peek(adr);
+ def peek8(self,address, 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,
def MSP430peek(self,adr):
"""Read a word at an address."""
self.data=[adr&0xff, (adr&0xff00)>>8,
@@
-73,14
+80,14
@@
class GoodFETMSP430(GoodFET):
#print "%2x %2x %2x %2x ..." % (data[0], data[1], data[2], data[3]);
self.writecmd(self.MSP430APP,0xE1,len(self.data),self.data);
return ord(self.data[0])+(ord(self.data[1])<<8);
#print "%2x %2x %2x %2x ..." % (data[0], data[1], data[2], data[3]);
self.writecmd(self.MSP430APP,0xE1,len(self.data),self.data);
return ord(self.data[0])+(ord(self.data[1])<<8);
- def
MSP430
start(self):
+ def start(self):
"""Start debugging."""
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)):
"""Start debugging."""
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." % 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.writecmd(self.MSP430APP,0xA0,0,self.data);
def MSP430haltcpu(self):
"""Halt the CPU."""
self.writecmd(self.MSP430APP,0xA0,0,self.data);