From e3f4860666e23c2c32f0407e37d8f6805967de76 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 12 Jan 2018 19:17:58 +1100 Subject: [PATCH] waf: cope with serial exceptions in px_uploader.py this allows the loader to continue on a USB removal/reinsert --- Tools/ardupilotwaf/px_uploader.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Tools/ardupilotwaf/px_uploader.py b/Tools/ardupilotwaf/px_uploader.py index e3debfcd11..c0e773afab 100755 --- a/Tools/ardupilotwaf/px_uploader.py +++ b/Tools/ardupilotwaf/px_uploader.py @@ -563,7 +563,10 @@ class uploader(object): if self.baudrate_flightstack_idx >= len(self.baudrate_flightstack): return False - self.port.baudrate = self.baudrate_flightstack[self.baudrate_flightstack_idx] + try: + self.port.baudrate = self.baudrate_flightstack[self.baudrate_flightstack_idx] + except Exception: + return False return True