diff options
| author | px4dev <px4@purgatory.org> | 2012-12-01 00:50:39 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2012-12-01 00:50:39 -0800 |
| commit | ea8872f5456dbba566fb4167ec66b4afa183b3e1 (patch) | |
| tree | 40def937aa4253700cb78c07b0e70b0963537da1 /apps/drivers | |
| parent | efd3b9dea689ef4244a3a2fd9f4217a544b254ee (diff) | |
| parent | ef4a54666d760a18b18800163a24faf5883c1e61 (diff) | |
| download | px4-firmware-ea8872f5456dbba566fb4167ec66b4afa183b3e1.tar.gz px4-firmware-ea8872f5456dbba566fb4167ec66b4afa183b3e1.tar.bz2 px4-firmware-ea8872f5456dbba566fb4167ec66b4afa183b3e1.zip | |
Merge branch 'sbus' of https://github.com/PX4/Firmware into #61-px4io-spektrum-decoder
Diffstat (limited to 'apps/drivers')
| -rw-r--r-- | apps/drivers/px4io/px4io.cpp | 1 | ||||
| -rw-r--r-- | apps/drivers/px4io/uploader.cpp | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/apps/drivers/px4io/px4io.cpp b/apps/drivers/px4io/px4io.cpp index 07a39c881..49ad80943 100644 --- a/apps/drivers/px4io/px4io.cpp +++ b/apps/drivers/px4io/px4io.cpp @@ -338,7 +338,6 @@ PX4IO::task_main() /* this would be bad... */ if (ret < 0) { log("poll error %d", errno); - usleep(1000000); continue; } diff --git a/apps/drivers/px4io/uploader.cpp b/apps/drivers/px4io/uploader.cpp index 5669aeb01..8b354ff60 100644 --- a/apps/drivers/px4io/uploader.cpp +++ b/apps/drivers/px4io/uploader.cpp @@ -189,8 +189,10 @@ PX4IO_Uploader::drain() int ret; do { - ret = recv(c, 10); - //log("discard 0x%02x", c); + ret = recv(c, 250); + if (ret == OK) { + //log("discard 0x%02x", c); + } } while (ret == OK); } |