diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-04-02 22:22:28 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-04-02 22:22:28 +0200 |
| commit | 80e8eeab2931e79e31adb17c93f5794e666c5763 (patch) | |
| tree | 84717adbcffccb1b1d7d2906c12fa7e68fa4c0d5 | |
| parent | 3cb3fa224baffcbb5ea228287f3d5b4f226b813b (diff) | |
| parent | 9dbd2695d3b476e8ed0a2001b027329e8600bd29 (diff) | |
| download | px4-firmware-80e8eeab2931e79e31adb17c93f5794e666c5763.tar.gz px4-firmware-80e8eeab2931e79e31adb17c93f5794e666c5763.tar.bz2 px4-firmware-80e8eeab2931e79e31adb17c93f5794e666c5763.zip | |
Merge branch 'master' of github.com:PX4/Firmware into new_state_machine
| -rw-r--r-- | apps/examples/kalman_demo/params.c | 3 | ||||
| -rw-r--r-- | apps/sensors/sensor_params.c | 2 |
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 5987a76fc..2f93a6be0 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); |