From b871d28c6df1ff9ed7c640d5d0147083e91cac5e Mon Sep 17 00:00:00 2001
From: px4dev <px4@purgatory.org>
Date: Sun, 9 Sep 2012 22:09:17 -0700
Subject: Avoid trying to adjust the port timeout once it's open; Windows
 apparently doesn't like this.

---
 Tools/px_uploader.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'Tools')

diff --git a/Tools/px_uploader.py b/Tools/px_uploader.py
index 1a0d7bd45..dfb53980a 100755
--- a/Tools/px_uploader.py
+++ b/Tools/px_uploader.py
@@ -172,10 +172,16 @@ class uploader(object):
 		self.__send(uploader.CHIP_ERASE 
 				+ uploader.EOC)
 		# erase is very slow, give it 10s
-		old_timeout = self.port.timeout
-		self.port.timeout = 10
-		self.__getSync()
-		self.port.timeout = old_timeout
+		deadline = time.time() + 10
+		while time.time() < deadline:
+			try:
+				self.__getSync()
+				return
+			except RuntimeError as ex:
+				# we timed out, that's OK
+				continue
+
+		raise RuntimeError("timed out waiting for erase")
 
 	# send a PROG_MULTI command to write a collection of bytes
 	def __program_multi(self, data):
-- 
cgit v1.2.3