diff options
author | Julian Oes <joes@student.ethz.ch> | 2012-11-08 09:26:53 -0800 |
---|---|---|
committer | Julian Oes <joes@student.ethz.ch> | 2012-11-08 09:26:53 -0800 |
commit | 9f45770dc2987c815372bc1d3c1f9392c3eec62a (patch) | |
tree | 3c7833ae5f26a7825c1be07f8050dfe0e51db2ed /apps/multirotor_att_control | |
parent | 52143d6a687ee5238a27d9afcba0a8d9703bac21 (diff) | |
parent | 0245d7be8690d9eae3fb6607f42921630f2306ea (diff) | |
download | px4-firmware-9f45770dc2987c815372bc1d3c1f9392c3eec62a.tar.gz px4-firmware-9f45770dc2987c815372bc1d3c1f9392c3eec62a.tar.bz2 px4-firmware-9f45770dc2987c815372bc1d3c1f9392c3eec62a.zip |
Merge branch 'master' of https://github.com/PX4/Firmware
Diffstat (limited to 'apps/multirotor_att_control')
-rw-r--r-- | apps/multirotor_att_control/multirotor_rate_control.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/multirotor_att_control/multirotor_rate_control.c b/apps/multirotor_att_control/multirotor_rate_control.c index d5e20312b..bbaec3033 100644 --- a/apps/multirotor_att_control/multirotor_rate_control.c +++ b/apps/multirotor_att_control/multirotor_rate_control.c @@ -55,14 +55,14 @@ #include <systemlib/err.h> #include <drivers/drv_hrt.h> -PARAM_DEFINE_FLOAT(MC_YAWRATE_P, 0.1f); /* same on Flamewheel */ +PARAM_DEFINE_FLOAT(MC_YAWRATE_P, 0.0f); /* same on Flamewheel */ PARAM_DEFINE_FLOAT(MC_YAWRATE_D, 0.0f); PARAM_DEFINE_FLOAT(MC_YAWRATE_I, 0.0f); //PARAM_DEFINE_FLOAT(MC_YAWRATE_AWU, 0.0f); //PARAM_DEFINE_FLOAT(MC_YAWRATE_LIM, 1.0f); -PARAM_DEFINE_FLOAT(MC_ATTRATE_P, 0.2f); /* 0.15 F405 Flamewheel */ -PARAM_DEFINE_FLOAT(MC_ATTRATE_D, 0.05f); +PARAM_DEFINE_FLOAT(MC_ATTRATE_P, 0.0f); /* 0.15 F405 Flamewheel */ +PARAM_DEFINE_FLOAT(MC_ATTRATE_D, 0.0f); PARAM_DEFINE_FLOAT(MC_ATTRATE_I, 0.0f); //PARAM_DEFINE_FLOAT(MC_ATTRATE_AWU, 0.05f); //PARAM_DEFINE_FLOAT(MC_ATTRATE_LIM, 1.0f); /**< roughly < 500 deg/s limit */ |