# HG changeset patch # User Lolitech@ACER9810.smarteh.local # Date 1275390493 -7200 # Node ID 881c0b3f020425d5264c2ad66515f43b3c188be5 # Parent 9b77aabf3d36827a0f12d995624aec3a5fff62dc# Parent f8cecd8eb32e6f3c2c86f2b4cffd1fabfcb69caf merge diff -r f8cecd8eb32e -r 881c0b3f0204 connectors/LPC/LPCProto.py --- a/connectors/LPC/LPCProto.py Tue Jun 01 10:03:58 2010 +0200 +++ b/connectors/LPC/LPCProto.py Tue Jun 01 13:08:13 2010 +0200 @@ -85,19 +85,7 @@ # we presuppose endianess of LPC same as PC lengthstr = ctypes.string_at(ctypes.pointer(ctypes.c_int(length)),4) buffer = lengthstr + self.OptData - ################################################################### - # TO BE REMOVED AS SOON AS USB IS FIXED IN CONTROLLER - ################################################################### - length += 4 - cursor = 0 - while cursor < length: - next_cursor = cursor + MAX_PACKET_SIZE - # sent just enough bytes to not crash controller - self.pseudofile.write(buffer[cursor:next_cursor]) - # if sent quantity was 128 - if next_cursor <= length: - self.GetCommandAck() - cursor = next_cursor + return self.pseudofile.write(buffer) def GetData(self): lengthstr = self.pseudofile.read(4) diff -r f8cecd8eb32e -r 881c0b3f0204 targets/toolchain_makefile.py --- a/targets/toolchain_makefile.py Tue Jun 01 10:03:58 2010 +0200 +++ b/targets/toolchain_makefile.py Tue Jun 01 13:08:13 2010 +0200 @@ -51,10 +51,10 @@ self.md5key = hashlib.md5(wholesrcdata).hexdigest() props = self.PluginsRootInstance.GetProjectProperties() - self.md5key += '|'.join([props[key] for key in ['companyName', + self.md5key += '#'.join([props[key] for key in ['companyName', 'projectName', 'productName']]) - self.md5key += '|'+','.join(map(str,time.localtime())) + self.md5key += '#'+','.join(map(str,time.localtime())) # Store new PLC filename based on md5 key f = open(self._GetMD5FileName(), "w") f.write(self.md5key)