fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-17 20:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

ekf2: fix rebase compile errors

Browse Source
This commit is contained in:
Paul Riseborough
2016-11-15 23:58:05 +01:00
committed by Lorenz Meier
parent 72ad6627e1
commit 680a8f0b44
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/ekf2/ekf2_params.c
+9 -9
View File
@@ -395,7 +395,7 @@ PARAM_DEFINE_FLOAT(EKF2_EAS_NOISE, 1.4f);
* @unit m/s
* @decimal 1
*/
PARAM_DEFINE_FLOAT(EKF2_BETA_NOISE, 5.0f);
PARAM_DEFINE_FLOAT(EKF2_BETA_NOISE, 5.0f);
/**
* Magnetic declination
*
@@ -830,14 +830,14 @@ PARAM_DEFINE_FLOAT(EKF2_EV_POS_Z, 0.0f);
*/
PARAM_DEFINE_FLOAT(EKF2_ARSP_THR, 0.0f);
/**
* Boolean determining if synthetic sideslip measurements should fused.
*
* A value of 1 indicates that fusion is active
*
* @group EKF2
* @boolean
*/
/**
* Boolean determining if synthetic sideslip measurements should fused.
*
* A value of 1 indicates that fusion is active
*
* @group EKF2
* @boolean
*/
PARAM_DEFINE_INT32(EKF2_FUSE_BETA, 0);
/**