Skip to content

C
Conv TTL Blocking
Commit b3901f52 authored by Theodor-Adrian Stana's avatar Theodor-Adrian Stana
Browse files
Options

updated multiboot script with new vbcp cmd

parent 35f18779
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 52 deletions
conv-ttl-blo-gw @ a8a7895b
Subproject commit 3c5f741a866087421609c6900e5489df4925fe4b Subproject commit a8a7895b66140533af2e580c9898c4f58dab747f
test/multiboot/multiboot.py
View file @ b3901f52
...@@ -55,7 +55,6 @@ def spi_transfer(cs, dat): ...@@ -55,7 +55,6 @@ def spi_transfer(cs, dat):
ctb.write(0x90, wval) ctb.write(0x90, wval)
while (retval & (1 << 9) == 0): while (retval & (1 << 9) == 0):
retval = ctb.read(0x90) retval = ctb.read(0x90)
print retval
return retval & 0xFF return retval & 0xFF
# ctb.write(0x90, [(((cs << 10) | 0x100) | d) for d in dat]) # ctb.write(0x90, [(((cs << 10) | 0x100) | d) for d in dat])
# while (retval & (1 << 9) == 0): # while (retval & (1 << 9) == 0):
...@@ -68,7 +67,7 @@ def flash_write(addr, dat): ...@@ -68,7 +67,7 @@ def flash_write(addr, dat):
spi_transfer(0,0) spi_transfer(0,0)
spi_transfer(1,[0x02,(addr & 0xFF0000) >> 16]) spi_transfer(1,[0x02,(addr & 0xFF0000) >> 16])
spi_transfer(1,[(addr & 0xFF00) >> 8, (addr & 0xFF)]) spi_transfer(1,[(addr & 0xFF00) >> 8, (addr & 0xFF)])
for i in xrange(len(dat)/2): for i in xrange(0, len(dat), 2):
spi_transfer(1,[dat[i],dat[i+1]]) spi_transfer(1,[dat[i],dat[i+1]])
spi_transfer(0,0) spi_transfer(0,0)
# spi_transfer(0,0) # spi_transfer(0,0)
...@@ -148,6 +147,7 @@ if __name__ == "__main__": ...@@ -148,6 +147,7 @@ if __name__ == "__main__":
except: except:
print "Unexpected error: ", sys.exc_info()[0] print "Unexpected error: ", sys.exc_info()[0]
ts = time.time()
# Open VBCP connection # Open VBCP connection
ctb.open_conn() ctb.open_conn()
...@@ -188,49 +188,49 @@ if __name__ == "__main__": ...@@ -188,49 +188,49 @@ if __name__ == "__main__":
# te2 = time.time() # te2 = time.time()
# print "erase time: %2.6f" % (te2-te1) # print "erase time: %2.6f" % (te2-te1)
# print "WRITE" print "WRITE"
# f = open("conv.txt",'r')
# addr = 0 f = open("conv.txt",'r')
# tdat = [] addr = 0
# twr = [] tdat = []
# twa = [] twr = []
# te = [] twa = []
# for fdata in f: te = []
# print addr
# data = [] for fdata in f:
# if not (addr % 0x10000): print addr
# print 'erase' data = []
# te1 = time.time() if not (addr % 0x10000):
# flash_serase(addr) print 'erase'
# while (flash_rsr() & 0x01): te1 = time.time()
# pass flash_serase(addr)
# te2 = time.time() while (flash_rsr() & 0x01):
# te.append(te2-te1) pass
# try: te2 = time.time()
# t1 = time.time() te.append(te2-te1)
# for i in xrange(256): try:
# data.append(int(fdata[0:2],16)) t1 = time.time()
# fdata = fdata[2:] for i in xrange(256):
# t2 = time.time() data.append(int(fdata[0:2],16))
# except ValueError: fdata = fdata[2:]
# print "reached end" t2 = time.time()
# break except ValueError:
# finally: print "reached end"
# t3 = time.time() break
# flash_write(addr, data) finally:
# t4 = time.time() t3 = time.time()
# while (flash_rsr() & 0x01): flash_write(addr, data)
# pass t4 = time.time()
# t5 = time.time() while (flash_rsr() & 0x01):
# addr += 256 pass
# if (addr == 256**2): t5 = time.time()
# break; addr += 256
# tdat.append(t2-t1) tdat.append(t2-t1)
# twr.append(t4-t3) twr.append(t4-t3)
# twa.append(t5-t4) twa.append(t5-t4)
#
# #print data #print data
# #print len(data) #print len(data)
# Close file handle # Close file handle
f.close() f.close()
...@@ -238,11 +238,14 @@ if __name__ == "__main__": ...@@ -238,11 +238,14 @@ if __name__ == "__main__":
print "DONE!" print "DONE!"
print "read1 time: %2.6f" % float(tr1-tr0) print "read1 time: %2.6f" % float(tr1-tr0)
print "read2 time: %2.6f" % float(tr3-tr2) print "read2 time: %2.6f" % float(tr3-tr2)
print "data time: %2.6f" % float(sum(tdat)/len(tdat)) print "data time: %2.6f" % float(sum(tdat)/len(tdat))
print "erase time: %2.6f" % float(sum(te)/len(te))
print "write time: %2.6f" % float(sum(twr)/len(twr)) #(t4-t3) print "write time: %2.6f" % float(sum(twr)/len(twr)) #(t4-t3)
print "wait time: %2.6f" % float(sum(twa)/len(twa)) #(t5-t4) print "wait time: %2.6f" % float(sum(twa)/len(twa)) #(t5-t4)
# Close VBCP connection and print final values # Close VBCP connection and print final values
ctb.close_conn() ctb.close_conn()
tf = time.time()
print "run time: %2.6f" % float(tf-ts)
test/pulsetest/pulsetest.py
View file @ b3901f52
...@@ -230,7 +230,8 @@ if __name__ == "__main__": ...@@ -230,7 +230,8 @@ if __name__ == "__main__":
pass pass
# Disable all channels # Disable all channels
ctb.write(CHENREG, 0x00) while (ctb.read(CHENREG) != 0x00):
ctb.write(CHENREG, 0x00)
f.write("%s: ending test\n" % time.strftime("%Y-%m-%d-%Hh%Mm%Ss", time.localtime())) f.write("%s: ending test\n" % time.strftime("%Y-%m-%d-%Hh%Mm%Ss", time.localtime()))
......
test/vbcp/vbcp.py
View file @ b3901f52
...@@ -78,9 +78,9 @@ class VBCP: ...@@ -78,9 +78,9 @@ class VBCP:
self.write_cnt += 1 self.write_cnt += 1
reg = addr/4 + 1 reg = addr/4 + 1
sl = (0x40 | ((~self.slot) & 0x1f)) << 1 sl = (0x40 | ((~self.slot) & 0x1f)) << 1
print '%02x' % sl #print '%02x' % sl
cmd = "iic4wr %x %x %x %s\r\n" % (sl, (addr & 0xff00) >> 8, addr & 0xff, ' '.join(format(b,'x') for b in val)) cmd = "iic4wr %x %x %x %s\r\n" % (sl, (addr & 0xff00) >> 8, addr & 0xff, ' '.join(format(b,'x') for b in val))
print cmd #print cmd
#cmd = "writereg %d %d %x\r\n" % (self.slot, reg, val) #cmd = "writereg %d %d %x\r\n" % (self.slot, reg, val)
self.handle.send(cmd) self.handle.send(cmd)
_strip_resp(self.handle.recv(30)) _strip_resp(self.handle.recv(30))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment