diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-10-13 12:25:46 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-10-13 12:25:46 +0200 |
| commit | c8f471c5605866dc5ea02aca339b508df7ff3546 (patch) | |
| tree | 4eed5851ee3e782d1a506c2fd781d2138adede1b /src | |
| parent | e770f84858491591cd07554989fbc0708b9e0cd3 (diff) | |
| parent | 4a4834c3de4b12d9b31afef0e27ee0e364972d91 (diff) | |
| download | px4-firmware-c8f471c5605866dc5ea02aca339b508df7ff3546.tar.gz px4-firmware-c8f471c5605866dc5ea02aca339b508df7ff3546.tar.bz2 px4-firmware-c8f471c5605866dc5ea02aca339b508df7ff3546.zip | |
Merge branch 'master' into px4io_fix
Diffstat (limited to 'src')
| -rw-r--r-- | src/drivers/px4io/px4io_uploader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/drivers/px4io/px4io_uploader.cpp b/src/drivers/px4io/px4io_uploader.cpp index fe8561a0b..d01dedb0d 100644 --- a/src/drivers/px4io/px4io_uploader.cpp +++ b/src/drivers/px4io/px4io_uploader.cpp @@ -237,7 +237,7 @@ PX4IO_Uploader::recv(uint8_t &c, unsigned timeout) fds[0].fd = _io_fd; fds[0].events = POLLIN; - /* wait 100 ms for a character */ + /* wait <timout> ms for a character */ int ret = ::poll(&fds[0], 1, timeout); if (ret < 1) { |