diff options
author | Julian Oes <julian@oes.ch> | 2013-10-19 11:39:31 +0200 |
---|---|---|
committer | Julian Oes <julian@oes.ch> | 2013-10-19 11:39:31 +0200 |
commit | 70ec68ffd07124b32a8957389cd29d837539e561 (patch) | |
tree | 39d6fa57a2ebd4ebf157c2a07916a800b9b99bd2 /ROMFS/px4fmu_common/init.d/16_3dr_iris | |
parent | ba77836000eaa28041969577482e3e4074d11e1b (diff) | |
parent | 9b22de147c07a5f45f597d7fe1ed0af5cf2d5628 (diff) | |
download | px4-firmware-70ec68ffd07124b32a8957389cd29d837539e561.tar.gz px4-firmware-70ec68ffd07124b32a8957389cd29d837539e561.tar.bz2 px4-firmware-70ec68ffd07124b32a8957389cd29d837539e561.zip |
Merge remote-tracking branch 'px4/master' into pwm_ioctls
Conflicts:
src/drivers/px4io/px4io.cpp
Diffstat (limited to 'ROMFS/px4fmu_common/init.d/16_3dr_iris')
-rw-r--r-- | ROMFS/px4fmu_common/init.d/16_3dr_iris | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ROMFS/px4fmu_common/init.d/16_3dr_iris b/ROMFS/px4fmu_common/init.d/16_3dr_iris index 3434735fd..d36699b9a 100644 --- a/ROMFS/px4fmu_common/init.d/16_3dr_iris +++ b/ROMFS/px4fmu_common/init.d/16_3dr_iris @@ -10,12 +10,12 @@ then # Set all params here, then disable autoconfig param set SYS_AUTOCONFIG 0 - param set MC_ATTRATE_D 0.006 + param set MC_ATTRATE_D 0.004 param set MC_ATTRATE_I 0.0 - param set MC_ATTRATE_P 0.17 + param set MC_ATTRATE_P 0.13 param set MC_ATT_D 0.0 param set MC_ATT_I 0.0 - param set MC_ATT_P 5.0 + param set MC_ATT_P 9.0 param set MC_YAWPOS_D 0.0 param set MC_YAWPOS_I 0.15 param set MC_YAWPOS_P 0.5 |