aboutsummaryrefslogtreecommitdiff
path: root/Tools
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2012-10-02 09:23:47 +0200
committerLorenz Meier <lm@inf.ethz.ch>2012-10-02 09:23:47 +0200
commit9de6a815434e15ee7add1ee138ac69a87733287b (patch)
tree453a91ee15bac1352003b796eb4188eb59191129 /Tools
parentd3e7b5e0bf121f5eecc57e292414edf0400ab527 (diff)
downloadpx4-firmware-9de6a815434e15ee7add1ee138ac69a87733287b.tar.gz
px4-firmware-9de6a815434e15ee7add1ee138ac69a87733287b.tar.bz2
px4-firmware-9de6a815434e15ee7add1ee138ac69a87733287b.zip
Updated EKF filter, fixed uploader (reverted to master)
Diffstat (limited to 'Tools')
-rwxr-xr-xTools/px_uploader.py17
1 files changed, 14 insertions, 3 deletions
diff --git a/Tools/px_uploader.py b/Tools/px_uploader.py
index 2b5a6edde..7ebd37e75 100755
--- a/Tools/px_uploader.py
+++ b/Tools/px_uploader.py
@@ -263,8 +263,8 @@ class uploader(object):
print("program...")
self.__program(fw)
- #print("verify...")
- #self.__verify(fw)
+ print("verify...")
+ self.__verify(fw)
print("done, rebooting.")
self.__reboot()
@@ -290,7 +290,18 @@ while True:
# create an uploader attached to the port
try:
- up = uploader("\\\\.\\COM2", args.baud)
+ if "linux" in _platform:
+ # Linux, don't open Mac OS and Win ports
+ if not "COM" in port and not "tty.usb" in port:
+ up = uploader(port, args.baud)
+ elif "darwin" in _platform:
+ # OS X, don't open Windows and Linux ports
+ if not "COM" in port and not "ACM" in port:
+ up = uploader(port, args.baud)
+ elif "win" in _platform:
+ # Windows, don't open POSIX ports
+ if not "/" in port:
+ up = uploader(port, args.baud)
except:
# open failed, rate-limit our attempts
time.sleep(0.05)