aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-07-04 15:45:32 +0200
committerLorenz Meier <lm@inf.ethz.ch>2013-07-04 15:45:32 +0200
commitb01673d1d8717b645747b7630382d666c6377c49 (patch)
tree4278daafbb4c5a162fa9da68c09ee55590087596 /src
parentf42b3ecd962a355081d36a62924e8ae9ecc05639 (diff)
downloadpx4-firmware-b01673d1d8717b645747b7630382d666c6377c49.tar.gz
px4-firmware-b01673d1d8717b645747b7630382d666c6377c49.tar.bz2
px4-firmware-b01673d1d8717b645747b7630382d666c6377c49.zip
Fixes to estimator and HIL startup script
Diffstat (limited to 'src')
-rw-r--r--src/modules/att_pos_estimator_ekf/KalmanNav.cpp2
-rw-r--r--src/modules/att_pos_estimator_ekf/params.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/att_pos_estimator_ekf/KalmanNav.cpp b/src/modules/att_pos_estimator_ekf/KalmanNav.cpp
index 197c2e36c..97d7fdd75 100644
--- a/src/modules/att_pos_estimator_ekf/KalmanNav.cpp
+++ b/src/modules/att_pos_estimator_ekf/KalmanNav.cpp
@@ -262,7 +262,7 @@ void KalmanNav::update()
lat, lon, alt);
}
- // prediciton step
+ // prediction step
// using sensors timestamp so we can account for packet lag
float dt = (_sensors.timestamp - _predictTimeStamp) / 1.0e6f;
//printf("dt: %15.10f\n", double(dt));
diff --git a/src/modules/att_pos_estimator_ekf/params.c b/src/modules/att_pos_estimator_ekf/params.c
index 4d21b342b..4af5edead 100644
--- a/src/modules/att_pos_estimator_ekf/params.c
+++ b/src/modules/att_pos_estimator_ekf/params.c
@@ -36,10 +36,10 @@
/*PARAM_DEFINE_FLOAT(NAME,0.0f);*/
PARAM_DEFINE_FLOAT(KF_V_GYRO, 0.008f);
PARAM_DEFINE_FLOAT(KF_V_ACCEL, 1.0f);
-PARAM_DEFINE_FLOAT(KF_R_MAG, 1.0f);
-PARAM_DEFINE_FLOAT(KF_R_GPS_VEL, 1.0f);
-PARAM_DEFINE_FLOAT(KF_R_GPS_POS, 5.0f);
-PARAM_DEFINE_FLOAT(KF_R_GPS_ALT, 5.0f);
+PARAM_DEFINE_FLOAT(KF_R_MAG, 0.8f);
+PARAM_DEFINE_FLOAT(KF_R_GPS_VEL, 0.5f);
+PARAM_DEFINE_FLOAT(KF_R_GPS_POS, 2.0f);
+PARAM_DEFINE_FLOAT(KF_R_GPS_ALT, 3.0f);
PARAM_DEFINE_FLOAT(KF_R_PRESS_ALT, 0.1f);
PARAM_DEFINE_FLOAT(KF_R_ACCEL, 1.0f);
PARAM_DEFINE_FLOAT(KF_FAULT_POS, 10.0f);