aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-08-31 21:02:23 +0200
committerLorenz Meier <lm@inf.ethz.ch>2014-08-31 21:02:23 +0200
commitf5f0892b7a674659fbde2f8463429996f6ebaee5 (patch)
tree684d16833a981e2e298a76c9f1ab31fae5019dbe /src
parent7109d3b32e4e10c64288de104b6a59c9e41b4e3f (diff)
parenta46e1aa60efcaf8b52db02f783fc4c0a9dc05878 (diff)
downloadpx4-firmware-f5f0892b7a674659fbde2f8463429996f6ebaee5.tar.gz
px4-firmware-f5f0892b7a674659fbde2f8463429996f6ebaee5.tar.bz2
px4-firmware-f5f0892b7a674659fbde2f8463429996f6ebaee5.zip
Merge branch 'sf0x_paranoid' of github.com:PX4/Firmware into swissfang
Diffstat (limited to 'src')
-rw-r--r--src/drivers/sf0x/sf0x.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/sf0x/sf0x.cpp b/src/drivers/sf0x/sf0x.cpp
index cf0419075..b690938e7 100644
--- a/src/drivers/sf0x/sf0x.cpp
+++ b/src/drivers/sf0x/sf0x.cpp
@@ -707,12 +707,12 @@ SF0X::cycle()
int collect_ret = collect();
if (collect_ret == -EAGAIN) {
- /* reschedule to grab the missing bits, time to transmit 10 bytes @9600 bps */
+ /* reschedule to grab the missing bits, time to transmit 8 bytes @ 9600 bps */
work_queue(HPWORK,
&_work,
(worker_t)&SF0X::cycle_trampoline,
this,
- USEC2TICK(1100));
+ USEC2TICK(1042 * 8));
return;
}