diff options
| author | Julian Oes <julian@oes.ch> | 2014-04-27 11:41:34 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-04-27 11:41:34 +0200 |
| commit | 03d87c2660202ca0980157cd2b4e8cd2312caf57 (patch) | |
| tree | 2ef2a6785da63742f457f71ef7a8a94cd0f79e28 /src/modules/commander | |
| parent | 721c90291c12405b4f4a6cf5ddc9ca8cec9f0077 (diff) | |
| parent | 6ab878c0218f26e5fa71053b75d7075b594b937e (diff) | |
| download | px4-firmware-03d87c2660202ca0980157cd2b4e8cd2312caf57.tar.gz px4-firmware-03d87c2660202ca0980157cd2b4e8cd2312caf57.tar.bz2 px4-firmware-03d87c2660202ca0980157cd2b4e8cd2312caf57.zip | |
Merge remote-tracking branch 'px4/ekf_params' into navigator_cleanup_ekf_home_init
Conflicts:
src/drivers/gps/gps.cpp
Diffstat (limited to 'src/modules/commander')
| -rw-r--r-- | src/modules/commander/commander.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp index 13336736d..1531a1ab0 100644 --- a/src/modules/commander/commander.cpp +++ b/src/modules/commander/commander.cpp @@ -117,7 +117,7 @@ extern struct system_load_s system_load; #define STICK_ON_OFF_HYSTERESIS_TIME_MS 1000 #define STICK_ON_OFF_COUNTER_LIMIT (STICK_ON_OFF_HYSTERESIS_TIME_MS*COMMANDER_MONITORING_LOOPSPERMSEC) -#define POSITION_TIMEOUT 30000 /**< consider the local or global position estimate invalid after 30ms */ +#define POSITION_TIMEOUT 50000 /**< consider the local or global position estimate invalid after 50ms */ #define RC_TIMEOUT 500000 #define DIFFPRESS_TIMEOUT 2000000 |