diff --git a/Tools/px_uploader.py b/Tools/px_uploader.py index 866a89de8b..7574aece36 100755 --- a/Tools/px_uploader.py +++ b/Tools/px_uploader.py @@ -167,7 +167,7 @@ class uploader(object): MAX_DES_LENGTH = 20 REBOOT = b'\x30' - + INFO_BL_REV = b'\x01' # bootloader protocol revision BL_REV_MIN = 2 # minimum supported bootloader protocol BL_REV_MAX = 5 # maximum supported bootloader protocol @@ -177,7 +177,7 @@ class uploader(object): PROG_MULTI_MAX = 252 # protocol max is 255, must be multiple of 4 READ_MULTI_MAX = 252 # protocol max is 255 - + NSH_INIT = bytearray(b'\x0d\x0d\x0d') NSH_REBOOT_BL = b"reboot -b\n" NSH_REBOOT = b"reboot\n" @@ -330,12 +330,12 @@ class uploader(object): # send a PROG_MULTI command to write a collection of bytes def __program_multi(self, data): - + if runningPython3 == True: length = len(data).to_bytes(1, byteorder='big') else: length = chr(len(data)) - + self.__send(uploader.PROG_MULTI) self.__send(length) self.__send(data) @@ -344,12 +344,12 @@ class uploader(object): # verify multiple bytes in flash def __verify_multi(self, data): - + if runningPython3 == True: length = len(data).to_bytes(1, byteorder='big') else: length = chr(len(data)) - + self.__send(uploader.READ_MULTI) self.__send(length) self.__send(uploader.EOC) @@ -412,7 +412,7 @@ class uploader(object): def __verify_v3(self, label, fw): print("\n", end='') self.__drawProgressBar(label, 1, 100) - expect_crc = fw.crc(self.fw_maxsize) + expect_crc = fw.crc(self.fw_maxsize) self.__send(uploader.GET_CRC + uploader.EOC) report_crc = self.__recv_int() @@ -495,7 +495,7 @@ class uploader(object): except Exception: # ignore bad character encodings pass - + self.__erase("Erase ") self.__program("Program", fw) @@ -510,7 +510,7 @@ class uploader(object): print("\nRebooting.\n") self.__reboot() self.port.close() - + def send_reboot(self): try: # try MAVLINK command first