diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-11-02 21:41:55 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-11-02 21:41:55 +0100 |
| commit | 166580b8f7415de90f3e5c0171a75b9827158d12 (patch) | |
| tree | 90290d744b683acca9b68358bf9d66204bb57b26 | |
| parent | d610564fd007112ed3e66d80fe63014424727f8b (diff) | |
| download | px4-firmware-166580b8f7415de90f3e5c0171a75b9827158d12.tar.gz px4-firmware-166580b8f7415de90f3e5c0171a75b9827158d12.tar.bz2 px4-firmware-166580b8f7415de90f3e5c0171a75b9827158d12.zip | |
Time out on serial instead of just hanging there
| -rwxr-xr-x | Tools/px_uploader.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tools/px_uploader.py b/Tools/px_uploader.py index b46db00b5..0bf2b82dd 100755 --- a/Tools/px_uploader.py +++ b/Tools/px_uploader.py @@ -178,9 +178,9 @@ class uploader(object): MAVLINK_REBOOT_ID1 = bytearray(b'\xfe\x21\x72\xff\x00\x4c\x00\x00\x80\x3f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf6\x00\x01\x00\x00\x48\xf0') MAVLINK_REBOOT_ID0 = bytearray(b'\xfe\x21\x45\xff\x00\x4c\x00\x00\x80\x3f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf6\x00\x00\x00\x00\xd7\xac') - def __init__(self, portname, baudrate, interCharTimeout=0.001, timeout=0.5): + def __init__(self, portname, baudrate): # open the port, keep the default timeout short so we can poll quickly - self.port = serial.Serial(portname, baudrate) + self.port = serial.Serial(portname, baudrate, timeout=0.5) self.otp = b'' self.sn = b'' |