aboutsummaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-03-09 13:22:32 +0100
committerLorenz Meier <lm@inf.ethz.ch>2013-03-09 13:22:32 +0100
commit5baea153e7d76c213c69a03a47cb12a0f8cf6370 (patch)
tree55bf8e29fdb0550e229def1fb49d753674c65f39 /apps
parent74bcf29c698ee9b6f8a7859d59c28f4a69a54e02 (diff)
parente7df439ea1f99f26969b6b741a239c722599f194 (diff)
downloadpx4-firmware-5baea153e7d76c213c69a03a47cb12a0f8cf6370.tar.gz
px4-firmware-5baea153e7d76c213c69a03a47cb12a0f8cf6370.tar.bz2
px4-firmware-5baea153e7d76c213c69a03a47cb12a0f8cf6370.zip
Merge branch 'master' of github.com:PX4/Firmware into px4io-i2c
Diffstat (limited to 'apps')
-rw-r--r--apps/drivers/gps/gps.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/drivers/gps/gps.cpp b/apps/drivers/gps/gps.cpp
index 6d7cfcc68..135010653 100644
--- a/apps/drivers/gps/gps.cpp
+++ b/apps/drivers/gps/gps.cpp
@@ -67,7 +67,7 @@
#include "mtk.h"
-#define TIMEOUT_5HZ 400
+#define TIMEOUT_5HZ 500
#define RATE_MEASUREMENT_PERIOD 5000000
/* oddly, ERROR is not defined for c++ */