mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-12-21 19:29:18 +00:00
fix mixture of spaces and tabs for z1-bsl-nopic
This commit is contained in:
Oleg Hahm
parent
116ade0e63
commit
fbeea78749
@ -293,9 +293,9 @@ class LowLevel:
|
||||
#used for some hardware
|
||||
self.invertRST = 0
|
||||
self.invertTEST = 0
|
||||
self.swapRSTTEST = 0
|
||||
self.telosLatch = 0
|
||||
self.telosI2C = 0
|
||||
self.swapRSTTEST = 0
|
||||
self.telosLatch = 0
|
||||
self.telosI2C = 0
|
||||
|
||||
self.z1 = 0
|
||||
|
||||
@ -581,22 +581,22 @@ class LowLevel:
|
||||
self.serialport.setDTR(not level)
|
||||
|
||||
def telosI2CStart(self):
|
||||
self.telosSetSDA(1)
|
||||
self.telosSetSCL(1)
|
||||
self.telosSetSDA(0)
|
||||
self.telosSetSDA(1)
|
||||
self.telosSetSCL(1)
|
||||
self.telosSetSDA(0)
|
||||
|
||||
def telosI2CStop(self):
|
||||
self.telosSetSDA(0)
|
||||
self.telosSetSCL(1)
|
||||
self.telosSetSDA(1)
|
||||
self.telosSetSDA(0)
|
||||
self.telosSetSCL(1)
|
||||
self.telosSetSDA(1)
|
||||
|
||||
def telosI2CWriteBit(self, bit):
|
||||
self.telosSetSCL(0)
|
||||
self.telosSetSDA(bit)
|
||||
self.telosSetSCL(0)
|
||||
self.telosSetSDA(bit)
|
||||
time.sleep(2e-6)
|
||||
self.telosSetSCL(1)
|
||||
self.telosSetSCL(1)
|
||||
time.sleep(1e-6)
|
||||
self.telosSetSCL(0)
|
||||
self.telosSetSCL(0)
|
||||
|
||||
def telosI2CWriteByte(self, byte):
|
||||
self.telosI2CWriteBit( byte & 0x80 );
|
||||
@ -610,34 +610,34 @@ class LowLevel:
|
||||
self.telosI2CWriteBit( 0 ); # "acknowledge"
|
||||
|
||||
def telosI2CWriteCmd(self, addr, cmdbyte):
|
||||
self.telosI2CStart()
|
||||
self.telosI2CStart()
|
||||
self.telosI2CWriteByte( 0x90 | (addr << 1) )
|
||||
self.telosI2CWriteByte( cmdbyte )
|
||||
self.telosI2CStop()
|
||||
self.telosI2CWriteByte( cmdbyte )
|
||||
self.telosI2CStop()
|
||||
|
||||
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
|
||||
# tck !s1: 1 0 1 0 0 1
|
||||
# tck !s1: 1 0 1 0 0 1
|
||||
# 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
|
||||
# tck !s1: 0 1 0 1 1 0
|
||||
# tck !s1: 0 1 0 1 1 0
|
||||
# s0|s1: 3 1 3 1 0 2
|
||||
if invokeBSL:
|
||||
self.telosI2CWriteCmd(0,1)
|
||||
self.telosI2CWriteCmd(0,3)
|
||||
self.telosI2CWriteCmd(0,1)
|
||||
self.telosI2CWriteCmd(0,3)
|
||||
self.telosI2CWriteCmd(0,2)
|
||||
self.telosI2CWriteCmd(0,0)
|
||||
else:
|
||||
self.telosI2CWriteCmd(0,3)
|
||||
self.telosI2CWriteCmd(0,2)
|
||||
self.telosI2CWriteCmd(0,0)
|
||||
if invokeBSL:
|
||||
self.telosI2CWriteCmd(0,1)
|
||||
self.telosI2CWriteCmd(0,3)
|
||||
self.telosI2CWriteCmd(0,1)
|
||||
self.telosI2CWriteCmd(0,3)
|
||||
self.telosI2CWriteCmd(0,2)
|
||||
self.telosI2CWriteCmd(0,0)
|
||||
else:
|
||||
self.telosI2CWriteCmd(0,3)
|
||||
self.telosI2CWriteCmd(0,2)
|
||||
self.telosI2CWriteCmd(0,0)
|
||||
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):
|
||||
"""Applies BSL entry sequence on RST/NMI and TEST/VPP pins
|
||||
@ -651,9 +651,9 @@ class LowLevel:
|
||||
|
||||
#print 'goint to reset!'
|
||||
|
||||
if self.telosI2C:
|
||||
self.telosBReset(invokeBSL)
|
||||
return
|
||||
if self.telosI2C:
|
||||
self.telosBReset(invokeBSL)
|
||||
return
|
||||
|
||||
if self.z1:
|
||||
if DEBUG > 1: sys.stderr.write("* entering bsl with z1\n")
|
||||
@ -665,10 +665,10 @@ class LowLevel:
|
||||
self.SetTESTpin(1) #power suply
|
||||
time.sleep(0.250) #charge capacitor on boot loader hardware
|
||||
|
||||
if self.telosLatch:
|
||||
self.SetTESTpin(0)
|
||||
self.SetRSTpin(0)
|
||||
self.SetTESTpin(1)
|
||||
if self.telosLatch:
|
||||
self.SetTESTpin(0)
|
||||
self.SetRSTpin(0)
|
||||
self.SetTESTpin(1)
|
||||
|
||||
self.SetRSTpin(0) #RST pin: GND
|
||||
if invokeBSL:
|
||||
@ -1599,11 +1599,11 @@ def main(itest=1):
|
||||
"upload=", "download=", "size=", "hex", "bin",
|
||||
"intelhex", "titext", "notimeout", "bsl=", "speed=",
|
||||
"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",
|
||||
"dumpivt", "dumpinfo", "fromweb",
|
||||
"goodfet30", "goodfet20", "goodfet10", "z1", "mainerase"
|
||||
]
|
||||
"goodfet30", "goodfet20", "goodfet10", "z1", "mainerase"
|
||||
]
|
||||
)
|
||||
except getopt.GetoptError:
|
||||
# print help information and exit:
|
||||
@ -1755,15 +1755,15 @@ def main(itest=1):
|
||||
bsl.invertTEST = 1
|
||||
bsl.swapRSTTEST = 1
|
||||
bsl.telosLatch = 1
|
||||
elif o in ("--goodfet10", ):
|
||||
bsl.invertRST = 1
|
||||
bsl.invertTEST = 1
|
||||
elif o in ("--goodfet20", ):
|
||||
bsl.invertRST = 1
|
||||
bsl.invertTEST = 1
|
||||
elif o in ("--goodfet30", ):
|
||||
bsl.invertRST = 1
|
||||
bsl.invertTEST = 0
|
||||
elif o in ("--goodfet10", ):
|
||||
bsl.invertRST = 1
|
||||
bsl.invertTEST = 1
|
||||
elif o in ("--goodfet20", ):
|
||||
bsl.invertRST = 1
|
||||
bsl.invertTEST = 1
|
||||
elif o in ("--goodfet30", ):
|
||||
bsl.invertRST = 1
|
||||
bsl.invertTEST = 0
|
||||
elif o in ("--telosb", ):
|
||||
bsl.swapRSTTEST = 1
|
||||
bsl.telosI2C = 1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user