dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Uploader script: Fix Python 2 issue and timing corner case on Mac OS, both in a robust fashion

This commit is contained in:
Lorenz Meier 2017-02-17 22:28:14 +01:00
parent 7659402fdb
commit 495e16d510
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Tools/px_uploader.py
View File

@ -1,7 +1,7 @@
#!/usr/bin/env python
############################################################################
#
# Copyright (C) 2012-2015 PX4 Development Team. All rights reserved.
# Copyright (c) 2012-2017 PX4 Development Team. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -198,8 +198,24 @@ class uploader(object):
self.port.close()
def open(self):
if self.port is not None and not self.port.is_open:
self.port.open()
timeout = time.time() + 0.2
# Attempt to open the port while it exists and until timeout occurs
while self.port is not None:
portopen = True
try:
portopen = self.port.is_open
except AttributeError:
portopen = self.port.isOpen()
if not portopen and time.time() < timeout:
try:
self.port.open()
except OSError:
# wait for the port to be ready
time.sleep(0.04)
else:
break
def __send(self, c):
# print("send " + binascii.hexlify(c))
@ -640,11 +656,14 @@ try:
break
# wait for the reboot, without we might run into Serial I/O Error 5
time.sleep(0.5)
time.sleep(0.25)
# always close the port
up.close()
# wait for the close, without we might run into Serial I/O Error 6
time.sleep(0.3)
if not found_bootloader:
# Go to the next port
continue