aboutsummaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-04-06 13:02:45 +0200
committerLorenz Meier <lm@inf.ethz.ch>2013-04-06 13:02:45 +0200
commit5eeb7f0d779989e7e8267b4e4a0c326d0e15c4a7 (patch)
treeb57d5dbbc262d6c6eb7ee3186955a7c592e02af0 /apps
parent6fb2496c49d2e6e380207df4acdfa9f79f2c0c5e (diff)
parent9dbd2695d3b476e8ed0a2001b027329e8600bd29 (diff)
downloadpx4-firmware-5eeb7f0d779989e7e8267b4e4a0c326d0e15c4a7.tar.gz
px4-firmware-5eeb7f0d779989e7e8267b4e4a0c326d0e15c4a7.tar.bz2
px4-firmware-5eeb7f0d779989e7e8267b4e4a0c326d0e15c4a7.zip
Merge branch 'master' of github.com:PX4/Firmware into hil
Diffstat (limited to 'apps')
-rw-r--r--apps/examples/kalman_demo/params.c3
-rw-r--r--apps/sensors/sensor_params.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/apps/examples/kalman_demo/params.c b/apps/examples/kalman_demo/params.c
index 91e80a5ea..50642f067 100644
--- a/apps/examples/kalman_demo/params.c
+++ b/apps/examples/kalman_demo/params.c
@@ -1,7 +1,7 @@
#include <systemlib/param/param.h>
/*PARAM_DEFINE_FLOAT(NAME,0.0f);*/
-PARAM_DEFINE_FLOAT(KF_V_GYRO, 1.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);
@@ -14,4 +14,3 @@ PARAM_DEFINE_FLOAT(KF_FAULT_ATT, 10.0f);
PARAM_DEFINE_FLOAT(KF_ENV_G, 9.765f);
PARAM_DEFINE_FLOAT(KF_ENV_MAG_DIP, 60.0f);
PARAM_DEFINE_FLOAT(KF_ENV_MAG_DEC, 0.0f);
-
diff --git a/apps/sensors/sensor_params.c b/apps/sensors/sensor_params.c
index a1ef9d136..c850e3a1e 100644
--- a/apps/sensors/sensor_params.c
+++ b/apps/sensors/sensor_params.c
@@ -88,7 +88,7 @@ PARAM_DEFINE_FLOAT(RC4_MIN, 1000);
PARAM_DEFINE_FLOAT(RC4_TRIM, 1500);
PARAM_DEFINE_FLOAT(RC4_MAX, 2000);
PARAM_DEFINE_FLOAT(RC4_REV, 1.0f);
-PARAM_DEFINE_FLOAT(RC4_DZ, 0.0f);
+PARAM_DEFINE_FLOAT(RC4_DZ, 30.0f);
PARAM_DEFINE_FLOAT(RC5_MIN, 1000);
PARAM_DEFINE_FLOAT(RC5_TRIM, 1500);