projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
played around with different inputs to change the temperature display
[goodfet]
/
client
/
GoodFET.py
diff --git
a/client/GoodFET.py
b/client/GoodFET.py
index
74f6e5d
..
11ca616
100755
(executable)
--- a/
client/GoodFET.py
+++ b/
client/GoodFET.py
@@
-140,6
+140,7
@@
class GoodFET:
"""Open the serial port"""
# Make timeout None to wait forever, 0 for non-blocking mode.
import serial;
"""Open the serial port"""
# Make timeout None to wait forever, 0 for non-blocking mode.
import serial;
+ fixserial=False;
if os.name=='nt' and sys.version.find('64 bit')!=-1:
print "WARNING: PySerial requires a 32-bit Python build in Windows.";
if os.name=='nt' and sys.version.find('64 bit')!=-1:
print "WARNING: PySerial requires a 32-bit Python build in Windows.";
@@
-194,16
+195,17
@@
class GoodFET:
#print "'%s'!=\n'%s'" % (self.data,"http://goodfet.sf.net/");
if attemptlimit is not None and attempts >= attemptlimit:
return
#print "'%s'!=\n'%s'" % (self.data,"http://goodfet.sf.net/");
if attemptlimit is not None and attempts >= attemptlimit:
return
- elif attempts>2:
- print "Resyncing. See the GoodFET FAQ about missing info flash.";
+ elif attempts==2 and os.environ.get("board")!='telosb':
+ print "See the GoodFET FAQ about missing info flash.";
+ self.serialport.setTimeout(0.2);
#self.serialport.flushInput()
#self.serialport.flushOutput()
#TelosB reset, prefer software to I2C SPST Switch.
#self.serialport.flushInput()
#self.serialport.flushOutput()
#TelosB reset, prefer software to I2C SPST Switch.
- if (os.environ.get("
platform")=='telosb' or os.environ.get("
board")=='telosb'):
+ if (os.environ.get("board")=='telosb'):
#print "TelosB Reset";
self.telosBReset();
#print "TelosB Reset";
self.telosBReset();
- elif (os.environ.get("board")=='z
olertiaz1' or os.environ.get("board")=='z
1'):
+ elif (os.environ.get("board")=='z1'):
self.bslResetZ1(invokeBSL=0);
elif (os.environ.get("board")=='apimote1') or (os.environ.get("board")=='apimote'):
#Explicitly set RTS and DTR to halt board.
self.bslResetZ1(invokeBSL=0);
elif (os.environ.get("board")=='apimote1') or (os.environ.get("board")=='apimote'):
#Explicitly set RTS and DTR to halt board.
@@
-245,8
+247,8
@@
class GoodFET:
if self.verbose:
print "Comm error on %i try, resyncing out of %s." % (foo,
clocking);
if self.verbose:
print "Comm error on %i try, resyncing out of %s." % (foo,
clocking);
-
connected=0;
-
break;
+ connected=0;
+ break;
if self.verbose: print "Connected after %02i attempts." % attempts;
self.mon_connected();
self.serialport.setTimeout(12);
if self.verbose: print "Connected after %02i attempts." % attempts;
self.mon_connected();
self.serialport.setTimeout(12);
@@
-573,6
+575,9
@@
class GoodFET:
self.writecmd(0,0x03,3,self.data);
return ord(self.data[0]);
def poke16(self,address,value):
self.writecmd(0,0x03,3,self.data);
return ord(self.data[0]);
def poke16(self,address,value):
+ """Set a word of memory by the monitor."""
+ self.MONpoke16(address,value);
+ def MONpoke16(self,address,value):
"""Set a word of memory by the monitor."""
self.pokebyte(address,value&0xFF);
self.pokebyte(address,(value>>8)&0xFF);
"""Set a word of memory by the monitor."""
self.pokebyte(address,value&0xFF);
self.pokebyte(address,(value>>8)&0xFF);
@@
-666,7
+671,8
@@
class GoodFET:
data="The quick brown fox jumped over the lazy dog.";
self.writecmd(self.MONITORAPP,0x81,len(data),data);
if self.data!=data:
data="The quick brown fox jumped over the lazy dog.";
self.writecmd(self.MONITORAPP,0x81,len(data),data);
if self.data!=data:
- print "Comm error recognized by monitorecho(), got:\n%s" % self.data;
+ if self.verbose:
+ print "Comm error recognized by monitorecho(), got:\n%s" % self.data;
return 0;
return 1;
return 0;
return 1;