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
/
GoodFET.py
diff --git
a/client/GoodFET.py
b/client/GoodFET.py
index
9b4a1b6
..
579eff0
100755
(executable)
--- a/
client/GoodFET.py
+++ b/
client/GoodFET.py
@@
-17,7
+17,7
@@
def getClient(name="GoodFET"):
elif name=="avr": return GoodFETAVR.GoodFETAVR();
elif name=="spi": return GoodFETSPI.GoodFETSPI();
elif name=="msp430": return GoodFETMSP430.GoodFETMSP430();
elif name=="avr": return GoodFETAVR.GoodFETAVR();
elif name=="spi": return GoodFETSPI.GoodFETSPI();
elif name=="msp430": return GoodFETMSP430.GoodFETMSP430();
- elif name=="nrf": return GoodFET
MSP430
.GoodFETNRF();
+ elif name=="nrf": return GoodFET
NRF
.GoodFETNRF();
print "Unsupported target: %s" % name;
sys.exit(0);
print "Unsupported target: %s" % name;
sys.exit(0);
@@
-89,6
+89,13
@@
class GoodFET:
glob_list = glob.glob("/dev/ttyUSB*");
if len(glob_list) > 0:
port = glob_list[0];
glob_list = glob.glob("/dev/ttyUSB*");
if len(glob_list) > 0:
port = glob_list[0];
+ if os.name=='nt':
+ from scanwin32 import winScan;
+ scan=winScan();
+ for order,comport,desc,hwid in sorted(scan.comports()):
+ if hwid.index('FTDI')==0:
+ port=comport;
+ #print "Using FTDI port %s" % port
self.serialport = serial.Serial(
self.serialport = serial.Serial(
@@
-270,6
+277,9
@@
class GoodFET:
def peekword(self,address):
"""Read a word of memory from the monitor."""
return self.peekbyte(address)+(self.peekbyte(address+1)<<8);
def peekword(self,address):
"""Read a word of memory from the monitor."""
return self.peekbyte(address)+(self.peekbyte(address+1)<<8);
+ def peek(self,address):
+ """Read a word of memory from the monitor."""
+ return self.peekbyte(address)+(self.peekbyte(address+1)<<8);
def pokebyte(self,address,value):
"""Set a byte of memory by the monitor."""
self.data=[address&0xff,address>>8,value];
def pokebyte(self,address,value):
"""Set a byte of memory by the monitor."""
self.data=[address&0xff,address>>8,value];
@@
-394,7
+404,6
@@
class GoodFET:
def dump(self,file,start=0,stop=0xffff):
"""Dump an intel hex file from code memory."""
print "Dump not implemented.";
def dump(self,file,start=0,stop=0xffff):
"""Dump an intel hex file from code memory."""
print "Dump not implemented.";
-
def peek32(self,address, memory="vn"):
return (self.peek16(address,memory)+
(self.peek16(address+2,memory)<<16));
def peek32(self,address, memory="vn"):
return (self.peek16(address,memory)+
(self.peek16(address+2,memory)<<16));
@@
-403,5
+412,8
@@
class GoodFET:
(self.peek8(address+1,memory)<<8));
def peek8(self,address, memory="vn"):
return self.peekbyte(address); #monitor
(self.peek8(address+1,memory)<<8));
def peek8(self,address, memory="vn"):
return self.peekbyte(address); #monitor
+ def peekword(self,address, memory="vn"):
+ return self.peek(address); #monitor
+
def loadsymbols(self):
return;
def loadsymbols(self):
return;