fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-28 05:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Hotfix: Make firmware generator and uploader python scripts Python 2 AND Python 3 compatible.

Browse Source
This commit is contained in:
Lorenz Meier
2013-03-18 15:11:02 +01:00
parent a03a2f9231
commit 3ea44e4a29
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/px_mkfw.py
+1 -1
View File
@@ -107,4 +107,4 @@ if args.image != None:
desc['image_size'] = len(bytes) desc['image_size'] = len(bytes)
desc['image'] = base64.b64encode(zlib.compress(bytes,9)) desc['image'] = base64.b64encode(zlib.compress(bytes,9))
print json.dumps(desc, indent=4) print(json.dumps(desc, indent=4))
Tools/px_uploader.py
+8 -8
View File
@@ -262,8 +262,8 @@ class uploader(object):
self.port.flush() self.port.flush()
programmed = self.__recv(len(data)) programmed = self.__recv(len(data))
if programmed != data: if programmed != data:
print("got " + binascii.hexlify(programmed)) print(("got " + binascii.hexlify(programmed)))
print("expect " + binascii.hexlify(data)) print(("expect " + binascii.hexlify(data)))
return False return False
self.__getSync() self.__getSync()
return True return True
@@ -307,8 +307,8 @@ class uploader(object):
report_crc = self.__recv_int() report_crc = self.__recv_int()
self.__getSync() self.__getSync()
if report_crc != expect_crc: if report_crc != expect_crc:
print("Expected 0x%x" % expect_crc) print(("Expected 0x%x" % expect_crc))
print("Got 0x%x" % report_crc) print(("Got 0x%x" % report_crc))
raise RuntimeError("Program CRC failed") raise RuntimeError("Program CRC failed")
# get basic data about the board # get basic data about the board
@@ -319,7 +319,7 @@ class uploader(object):
# get the bootloader protocol ID first # get the bootloader protocol ID first
self.bl_rev = self.__getInfo(uploader.INFO_BL_REV) self.bl_rev = self.__getInfo(uploader.INFO_BL_REV)
if (self.bl_rev < uploader.BL_REV_MIN) or (self.bl_rev > uploader.BL_REV_MAX): if (self.bl_rev < uploader.BL_REV_MIN) or (self.bl_rev > uploader.BL_REV_MAX):
print("Unsupported bootloader protocol %d" % uploader.INFO_BL_REV) print(("Unsupported bootloader protocol %d" % uploader.INFO_BL_REV))
raise RuntimeError("Bootloader protocol mismatch") raise RuntimeError("Bootloader protocol mismatch")
self.board_type = self.__getInfo(uploader.INFO_BOARD_ID) self.board_type = self.__getInfo(uploader.INFO_BOARD_ID)
@@ -360,7 +360,7 @@ args = parser.parse_args()
# Load the firmware file # Load the firmware file
fw = firmware(args.firmware) fw = firmware(args.firmware)
print("Loaded firmware for %x,%x, waiting for the bootloader..." % (fw.property('board_id'), fw.property('board_revision'))) print(("Loaded firmware for %x,%x, waiting for the bootloader..." % (fw.property('board_id'), fw.property('board_revision'))))
# Spin waiting for a device to show up # Spin waiting for a device to show up
while True: while True:
@@ -393,7 +393,7 @@ while True:
try: try:
# identify the bootloader # identify the bootloader
up.identify() up.identify()
print("Found board %x,%x bootloader rev %x on %s" % (up.board_type, up.board_rev, up.bl_rev, port)) print(("Found board %x,%x bootloader rev %x on %s" % (up.board_type, up.board_rev, up.bl_rev, port)))
except: except:
# most probably a timeout talking to the port, no bootloader # most probably a timeout talking to the port, no bootloader
@@ -406,7 +406,7 @@ while True:
except RuntimeError as ex: except RuntimeError as ex:
# print the error # print the error
print("ERROR: %s" % ex.args) print(("ERROR: %s" % ex.args))
finally: finally:
# always close the port # always close the port