fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-06-26 16:20:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'px4/ekf_params' into navigator_cleanup_ekf_home_init

Browse Source 
Conflicts:
	src/drivers/gps/gps.cpp
This commit is contained in:
Julian Oes
2014-04-27 11:41:34 +02:00
parent 721c90291c 6ab878c021
commit 03d87c2660
5 changed files with 70 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/commander.cpp
+1 -1
View File
@@ -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