diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-15 13:14:25 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-15 13:14:25 +0200 |
commit | ba51ab2545bded39b389b7b8c2d862e10fc15b42 (patch) | |
tree | f8a1c735951fc048448fe01e1576c038df0aacfb /ROMFS | |
parent | 97e6090700510ba5845f50f73c3d47c79368a447 (diff) | |
parent | ec409a1337a0f9c73cbe54776b254464e3dcd1d3 (diff) | |
download | px4-firmware-ba51ab2545bded39b389b7b8c2d862e10fc15b42.tar.gz px4-firmware-ba51ab2545bded39b389b7b8c2d862e10fc15b42.tar.bz2 px4-firmware-ba51ab2545bded39b389b7b8c2d862e10fc15b42.zip |
Merge branch 'ekf_params' of github.com:PX4/Firmware
Diffstat (limited to 'ROMFS')
-rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.fw_apps | 2 | ||||
-rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.mc_apps | 1 | ||||
-rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.mc_defaults | 6 |
3 files changed, 8 insertions, 1 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rc.fw_apps b/ROMFS/px4fmu_common/init.d/rc.fw_apps index 429abc5ec..9aca3fc5f 100644 --- a/ROMFS/px4fmu_common/init.d/rc.fw_apps +++ b/ROMFS/px4fmu_common/init.d/rc.fw_apps @@ -6,7 +6,7 @@ # # Start the attitude and position estimator # -fw_att_pos_estimator start +ekf_att_pos_estimator start # # Start attitude controller diff --git a/ROMFS/px4fmu_common/init.d/rc.mc_apps b/ROMFS/px4fmu_common/init.d/rc.mc_apps index ed3939757..268eb9bba 100644 --- a/ROMFS/px4fmu_common/init.d/rc.mc_apps +++ b/ROMFS/px4fmu_common/init.d/rc.mc_apps @@ -5,6 +5,7 @@ # attitude_estimator_ekf start +#ekf_att_pos_estimator start position_estimator_inav start mc_att_control start diff --git a/ROMFS/px4fmu_common/init.d/rc.mc_defaults b/ROMFS/px4fmu_common/init.d/rc.mc_defaults index a8c6dc811..b6b0a5b4e 100644 --- a/ROMFS/px4fmu_common/init.d/rc.mc_defaults +++ b/ROMFS/px4fmu_common/init.d/rc.mc_defaults @@ -35,6 +35,12 @@ then param set MPC_TILTMAX_AIR 45.0 param set MPC_TILTMAX_LND 15.0 param set MPC_LAND_SPEED 1.0 + + param set PE_VELNE_NOISE 0.5 + param set PE_VELNE_NOISE 0.7 + param set PE_POSNE_NOISE 0.5 + param set PE_POSD_NOISE 1.0 + fi set PWM_RATE 400 |