deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1094 from OlegHahm/fix_z1-bsl-nopic

Browse source 
Fix z1-bsl-nopic
This commit is contained in:
Antonio Lignan 2015-06-02 00:41:52 +02:00
parent aba0b8ab40 fbeea78749
commit c03536f04e
1 changed files with 52 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
tools/z1/z1-bsl-nopic
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python2
# Serial Bootstrap Loader software for the MSP430 embedded proccessor. # Serial Bootstrap Loader software for the MSP430 embedded proccessor.
# #
# (C) 2001-2003 Chris Liechti <cliechti@gmx.net> # (C) 2001-2003 Chris Liechti <cliechti@gmx.net>
@ -293,9 +293,9 @@ class LowLevel:
#used for some hardware #used for some hardware
self.invertRST = 0 self.invertRST = 0
self.invertTEST = 0 self.invertTEST = 0
self.swapRSTTEST = 0 self.swapRSTTEST = 0
self.telosLatch = 0 self.telosLatch = 0
self.telosI2C = 0 self.telosI2C = 0
self.z1 = 0 self.z1 = 0
@ -581,22 +581,22 @@ class LowLevel:
self.serialport.setDTR(not level) self.serialport.setDTR(not level)
def telosI2CStart(self): def telosI2CStart(self):
self.telosSetSDA(1) self.telosSetSDA(1)
self.telosSetSCL(1) self.telosSetSCL(1)
self.telosSetSDA(0) self.telosSetSDA(0)
def telosI2CStop(self): def telosI2CStop(self):
self.telosSetSDA(0) self.telosSetSDA(0)
self.telosSetSCL(1) self.telosSetSCL(1)
self.telosSetSDA(1) self.telosSetSDA(1)
def telosI2CWriteBit(self, bit): def telosI2CWriteBit(self, bit):
self.telosSetSCL(0) self.telosSetSCL(0)
self.telosSetSDA(bit) self.telosSetSDA(bit)
time.sleep(2e-6) time.sleep(2e-6)
self.telosSetSCL(1) self.telosSetSCL(1)
time.sleep(1e-6) time.sleep(1e-6)
self.telosSetSCL(0) self.telosSetSCL(0)
def telosI2CWriteByte(self, byte): def telosI2CWriteByte(self, byte):
self.telosI2CWriteBit( byte & 0x80 ); self.telosI2CWriteBit( byte & 0x80 );
@ -610,34 +610,34 @@ class LowLevel:
self.telosI2CWriteBit( 0 ); # "acknowledge" self.telosI2CWriteBit( 0 ); # "acknowledge"
def telosI2CWriteCmd(self, addr, cmdbyte): def telosI2CWriteCmd(self, addr, cmdbyte):
self.telosI2CStart() self.telosI2CStart()
self.telosI2CWriteByte( 0x90 | (addr << 1) ) self.telosI2CWriteByte( 0x90 | (addr << 1) )
self.telosI2CWriteByte( cmdbyte ) self.telosI2CWriteByte( cmdbyte )
self.telosI2CStop() self.telosI2CStop()
def telosBReset(self,invokeBSL=0): def telosBReset(self,invokeBSL=0):
# "BSL entry sequence at dedicated JTAG pins" # "BSL entry sequence at dedicated JTAG pins"
# rst !s0: 0 0 0 0 1 1 # rst !s0: 0 0 0 0 1 1
# tck !s1: 1 0 1 0 0 1 # tck !s1: 1 0 1 0 0 1
# s0|s1: 1 3 1 3 2 0 # s0|s1: 1 3 1 3 2 0
# "BSL entry sequence at shared JTAG pins" # "BSL entry sequence at shared JTAG pins"
# rst !s0: 0 0 0 0 1 1 # rst !s0: 0 0 0 0 1 1
# tck !s1: 0 1 0 1 1 0 # tck !s1: 0 1 0 1 1 0
# s0|s1: 3 1 3 1 0 2 # s0|s1: 3 1 3 1 0 2
if invokeBSL: if invokeBSL:
self.telosI2CWriteCmd(0,1) self.telosI2CWriteCmd(0,1)
self.telosI2CWriteCmd(0,3) self.telosI2CWriteCmd(0,3)
self.telosI2CWriteCmd(0,1) self.telosI2CWriteCmd(0,1)
self.telosI2CWriteCmd(0,3) self.telosI2CWriteCmd(0,3)
self.telosI2CWriteCmd(0,2) self.telosI2CWriteCmd(0,2)
self.telosI2CWriteCmd(0,0) self.telosI2CWriteCmd(0,0)
else: else:
self.telosI2CWriteCmd(0,3) self.telosI2CWriteCmd(0,3)
self.telosI2CWriteCmd(0,2) self.telosI2CWriteCmd(0,2)
self.telosI2CWriteCmd(0,0) self.telosI2CWriteCmd(0,0)
time.sleep(0.250) #give MSP430's oscillator time to stabilize time.sleep(0.250) #give MSP430's oscillator time to stabilize
self.serialport.flushInput() #clear buffers self.serialport.flushInput() #clear buffers
def bslReset(self, invokeBSL=0): def bslReset(self, invokeBSL=0):
"""Applies BSL entry sequence on RST/NMI and TEST/VPP pins """Applies BSL entry sequence on RST/NMI and TEST/VPP pins
@ -651,9 +651,9 @@ class LowLevel:
#print 'goint to reset!' #print 'goint to reset!'
if self.telosI2C: if self.telosI2C:
self.telosBReset(invokeBSL) self.telosBReset(invokeBSL)
return return
if self.z1: if self.z1:
if DEBUG > 1: sys.stderr.write("* entering bsl with z1\n") if DEBUG > 1: sys.stderr.write("* entering bsl with z1\n")
@ -665,10 +665,10 @@ class LowLevel:
self.SetTESTpin(1) #power suply self.SetTESTpin(1) #power suply
time.sleep(0.250) #charge capacitor on boot loader hardware time.sleep(0.250) #charge capacitor on boot loader hardware
if self.telosLatch: if self.telosLatch:
self.SetTESTpin(0) self.SetTESTpin(0)
self.SetRSTpin(0) self.SetRSTpin(0)
self.SetTESTpin(1) self.SetTESTpin(1)
self.SetRSTpin(0) #RST pin: GND self.SetRSTpin(0) #RST pin: GND
if invokeBSL: if invokeBSL:
@ -1599,11 +1599,11 @@ def main(itest=1):
"upload=", "download=", "size=", "hex", "bin", "upload=", "download=", "size=", "hex", "bin",
"intelhex", "titext", "notimeout", "bsl=", "speed=", "intelhex", "titext", "notimeout", "bsl=", "speed=",
"bslversion", "f1x", "f2x", "f4x", "invert-reset", "invert-test", "bslversion", "f1x", "f2x", "f4x", "invert-reset", "invert-test",
"swap-reset-test", "telos-latch", "telos-i2c", "telos", "telosb", "swap-reset-test", "telos-latch", "telos-i2c", "telos", "telosb",
"tmote","no-BSL-download", "force-BSL-download", "slow", "tmote","no-BSL-download", "force-BSL-download", "slow",
"dumpivt", "dumpinfo", "fromweb", "dumpivt", "dumpinfo", "fromweb",
"goodfet30", "goodfet20", "goodfet10", "z1", "mainerase" "goodfet30", "goodfet20", "goodfet10", "z1", "mainerase"
] ]
) )
except getopt.GetoptError: except getopt.GetoptError:
# print help information and exit: # print help information and exit:
@ -1755,15 +1755,15 @@ def main(itest=1):
bsl.invertTEST = 1 bsl.invertTEST = 1
bsl.swapRSTTEST = 1 bsl.swapRSTTEST = 1
bsl.telosLatch = 1 bsl.telosLatch = 1
elif o in ("--goodfet10", ): elif o in ("--goodfet10", ):
bsl.invertRST = 1 bsl.invertRST = 1
bsl.invertTEST = 1 bsl.invertTEST = 1
elif o in ("--goodfet20", ): elif o in ("--goodfet20", ):
bsl.invertRST = 1 bsl.invertRST = 1
bsl.invertTEST = 1 bsl.invertTEST = 1
elif o in ("--goodfet30", ): elif o in ("--goodfet30", ):
bsl.invertRST = 1 bsl.invertRST = 1
bsl.invertTEST = 0 bsl.invertTEST = 0
elif o in ("--telosb", ): elif o in ("--telosb", ):
bsl.swapRSTTEST = 1 bsl.swapRSTTEST = 1
bsl.telosI2C = 1 bsl.telosI2C = 1