beremiz

Merged with Edouard's modifications

2011-05-16, laurent
6da88269088d
Parents d0e3fc4b9951310455d73131
Children e1ef99c609eb
Merged with Edouard's modifications
2 files changed, 9 insertions(+), 2 deletions(-)
  • +1 -1
    connectors/LPC/LPCBootProto.py
  • +8 -1
    targets/LPC/__init__.py
    • --- a/connectors/LPC/LPCBootProto.py Mon May 16 11:58:06 2011 +0200
    +++ b/connectors/LPC/LPCBootProto.py Mon May 16 12:41:23 2011 +0200
    @@ -47,7 +47,7 @@
    data = self.OptData
    loptdata = len(self.OptData)
    count=0
    - self.PLCprint("%dkB:" % (loptdata/1024))
    + #self.PLCprint("%dkB:" % (loptdata/1024))
    while len(data)>0:
    res = self.pseudofile.write(data[:loptdata/100])
    data = data[res:]
    --- a/targets/LPC/__init__.py Mon May 16 11:58:06 2011 +0200
    +++ b/targets/LPC/__init__.py Mon May 16 12:41:23 2011 +0200
    @@ -36,7 +36,7 @@
    return self.binmd5key
    else:
    try:
    - return open(self._GetMD5FileName(), "r").read()
    + return open(self._GetBinMD5FileName(), "r").read()
    except IOError, e:
    return None
    @@ -52,5 +52,12 @@
    f = open(self._GetBinMD5FileName(), "w")
    f.write(self.binmd5key)
    f.close()
    + try:
    + self.PluginsRootInstance.logger.write(
    + _("Binary is %s bytes long\n")%
    + str(os.path.getsize(
    + os.path.join(self.buildpath, "ArmPLC_rom.bin"))))
    + except Exception, e:
    + pass
    return res