djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change dfu.py to be Python 2/3 compatible 

* Chane dfu.py to use Python 3 syntax to avoid dependency on Python 2.
* Update Makefile to call python instead of python2
* Fix #33
This commit is contained in:
mux 2014-01-03 08:51:02 +02:00
parent aae7847508
commit 1a1ba4d555
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stm/Makefile
View File

@ -147,7 +147,7 @@ OBJ = $(addprefix $(BUILD)/, $(SRC_C:.c=.o) $(SRC_S:.s=.o) $(PY_O) $(SRC_FATFS:.
all: $(BUILD) $(BUILD)/flash.dfu all: $(BUILD) $(BUILD)/flash.dfu
$(BUILD)/flash.dfu: $(BUILD)/flash0.bin $(BUILD)/flash1.bin $(BUILD)/flash.dfu: $(BUILD)/flash0.bin $(BUILD)/flash1.bin
python2 $(DFU) -b 0x08000000:$(BUILD)/flash0.bin -b 0x08020000:$(BUILD)/flash1.bin $@ python $(DFU) -b 0x08000000:$(BUILD)/flash0.bin -b 0x08020000:$(BUILD)/flash1.bin $@
$(BUILD)/flash0.bin: $(BUILD)/flash.elf $(BUILD)/flash0.bin: $(BUILD)/flash.elf
arm-none-eabi-objcopy -O binary -j .isr_vector $^ $@ arm-none-eabi-objcopy -O binary -j .isr_vector $^ $@

38
tools/dfu.py
View File

@ -20,11 +20,11 @@ def compute_crc(data):
return 0xFFFFFFFF & -zlib.crc32(data) -1 return 0xFFFFFFFF & -zlib.crc32(data) -1
def parse(file,dump_images=False): def parse(file,dump_images=False):
print 'File: "%s"' % file print ('File: "%s"' % file)
data = open(file,'rb').read() data = open(file,'rb').read()
crc = compute_crc(data[:-4]) crc = compute_crc(data[:-4])
prefix, data = consume('<5sBIB',data,'signature version size targets') prefix, data = consume('<5sBIB',data,'signature version size targets')
print '%(signature)s v%(version)d, image size: %(size)d, targets: %(targets)d' % prefix print ('%(signature)s v%(version)d, image size: %(size)d, targets: %(targets)d' % prefix)
for t in range(prefix['targets']): for t in range(prefix['targets']):
tprefix, data = consume('<6sBI255s2I',data,'signature altsetting named name size elements') tprefix, data = consume('<6sBI255s2I',data,'signature altsetting named name size elements')
tprefix['num'] = t tprefix['num'] = t
@ -32,40 +32,40 @@ def parse(file,dump_images=False):
tprefix['name'] = cstring(tprefix['name']) tprefix['name'] = cstring(tprefix['name'])
else: else:
tprefix['name'] = '' tprefix['name'] = ''
print '%(signature)s %(num)d, alt setting: %(altsetting)s, name: "%(name)s", size: %(size)d, elements: %(elements)d' % tprefix print ('%(signature)s %(num)d, alt setting: %(altsetting)s, name: "%(name)s", size: %(size)d, elements: %(elements)d' % tprefix)
tsize = tprefix['size'] tsize = tprefix['size']
target, data = data[:tsize], data[tsize:] target, data = data[:tsize], data[tsize:]
for e in range(tprefix['elements']): for e in range(tprefix['elements']):
eprefix, target = consume('<2I',target,'address size') eprefix, target = consume('<2I',target,'address size')
eprefix['num'] = e eprefix['num'] = e
print ' %(num)d, address: 0x%(address)08x, size: %(size)d' % eprefix print (' %(num)d, address: 0x%(address)08x, size: %(size)d' % eprefix)
esize = eprefix['size'] esize = eprefix['size']
image, target = target[:esize], target[esize:] image, target = target[:esize], target[esize:]
if dump_images: if dump_images:
out = '%s.target%d.image%d.bin' % (file,t,e) out = '%s.target%d.image%d.bin' % (file,t,e)
open(out,'wb').write(image) open(out,'wb').write(image)
print ' DUMPED IMAGE TO "%s"' % out print (' DUMPED IMAGE TO "%s"' % out)
if len(target): if len(target):
print "target %d: PARSE ERROR" % t print ("target %d: PARSE ERROR" % t)
suffix = named(struct.unpack('<4H3sBI',data[:16]),'device product vendor dfu ufd len crc') suffix = named(struct.unpack('<4H3sBI',data[:16]),'device product vendor dfu ufd len crc')
print 'usb: %(vendor)04x:%(product)04x, device: 0x%(device)04x, dfu: 0x%(dfu)04x, %(ufd)s, %(len)d, 0x%(crc)08x' % suffix print ('usb: %(vendor)04x:%(product)04x, device: 0x%(device)04x, dfu: 0x%(dfu)04x, %(ufd)s, %(len)d, 0x%(crc)08x' % suffix)
if crc != suffix['crc']: if crc != suffix['crc']:
print "CRC ERROR: computed crc32 is 0x%08x" % crc print ("CRC ERROR: computed crc32 is 0x%08x" % crc)
data = data[16:] data = data[16:]
if data: if data:
print "PARSE ERROR" print ("PARSE ERROR")
def build(file,targets,device=DEFAULT_DEVICE): def build(file,targets,device=DEFAULT_DEVICE):
data = '' data = b''
for t,target in enumerate(targets): for t,target in enumerate(targets):
tdata = '' tdata = b''
for image in target: for image in target:
tdata += struct.pack('<2I',image['address'],len(image['data']))+image['data'] tdata += struct.pack('<2I',image['address'],len(image['data']))+image['data']
tdata = struct.pack('<6sBI255s2I','Target',0,1,'ST...',len(tdata),len(target)) + tdata tdata = struct.pack('<6sBI255s2I',b'Target',0,1, b'ST...',len(tdata),len(target)) + tdata
data += tdata data += tdata
data = struct.pack('<5sBIB','DfuSe',1,len(data)+11,len(targets)) + data data = struct.pack('<5sBIB',b'DfuSe',1,len(data)+11,len(targets)) + data
v,d=map(lambda x: int(x,0) & 0xFFFF, device.split(':',1)) v,d=map(lambda x: int(x,0) & 0xFFFF, device.split(':',1))
data += struct.pack('<4H3sB',0,d,v,0x011a,'UFD',16) data += struct.pack('<4H3sB',0,d,v,0x011a,b'UFD',16)
crc = compute_crc(data) crc = compute_crc(data)
data += struct.pack('<I',crc) data += struct.pack('<I',crc)
open(file,'wb').write(data) open(file,'wb').write(data)
@ -89,15 +89,15 @@ if __name__=="__main__":
try: try:
address,binfile = arg.split(':',1) address,binfile = arg.split(':',1)
except ValueError: except ValueError:
print "Address:file couple '%s' invalid." % arg print ("Address:file couple '%s' invalid." % arg)
sys.exit(1) sys.exit(1)
try: try:
address = int(address,0) & 0xFFFFFFFF address = int(address,0) & 0xFFFFFFFF
except ValueError: except ValueError:
print "Address %s invalid." % address print ("Address %s invalid." % address)
sys.exit(1) sys.exit(1)
if not os.path.isfile(binfile): if not os.path.isfile(binfile):
print "Unreadable file '%s'." % binfile print ("Unreadable file '%s'." % binfile)
sys.exit(1) sys.exit(1)
target.append({ 'address': address, 'data': open(binfile,'rb').read() }) target.append({ 'address': address, 'data': open(binfile,'rb').read() })
outfile = args[0] outfile = args[0]
@ -107,13 +107,13 @@ if __name__=="__main__":
try: try:
v,d=map(lambda x: int(x,0) & 0xFFFF, device.split(':',1)) v,d=map(lambda x: int(x,0) & 0xFFFF, device.split(':',1))
except: except:
print "Invalid device '%s'." % device print ("Invalid device '%s'." % device)
sys.exit(1) sys.exit(1)
build(outfile,[target],device) build(outfile,[target],device)
elif len(args)==1: elif len(args)==1:
infile = args[0] infile = args[0]
if not os.path.isfile(infile): if not os.path.isfile(infile):
print "Unreadable file '%s'." % infile print ("Unreadable file '%s'." % infile)
sys.exit(1) sys.exit(1)
parse(infile, dump_images=options.dump_images) parse(infile, dump_images=options.dump_images)
else: else: