diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2013-10-24 18:34:22 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2013-10-24 18:34:22 +0200 |
| commit | 01d8ca1fbaf579534c0faca264bd458d20997f13 (patch) | |
| tree | df6447fb35a343923981db0ccc9f0922738cbfd8 /src/modules/fw_att_control/fw_att_control_params.c | |
| parent | bff3bf8d87a2496bf6f1857287200926a4b21e0a (diff) | |
| parent | 1e89f30120f30f0cac9c4bdd7b81ee2da96bcc8f (diff) | |
| download | px4-firmware-01d8ca1fbaf579534c0faca264bd458d20997f13.tar.gz px4-firmware-01d8ca1fbaf579534c0faca264bd458d20997f13.tar.bz2 px4-firmware-01d8ca1fbaf579534c0faca264bd458d20997f13.zip | |
manual merge fw_integrator_fix_ouputlimit into fw_staging_ouputlimit
Diffstat (limited to 'src/modules/fw_att_control/fw_att_control_params.c')
| -rw-r--r-- | src/modules/fw_att_control/fw_att_control_params.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/fw_att_control/fw_att_control_params.c b/src/modules/fw_att_control/fw_att_control_params.c index 07fac4989..41e37e61f 100644 --- a/src/modules/fw_att_control/fw_att_control_params.c +++ b/src/modules/fw_att_control/fw_att_control_params.c @@ -85,7 +85,7 @@ PARAM_DEFINE_FLOAT(FW_P_RMAX_NEG, 60.0f); // @Description This limits the range in degrees the integrator can wind up to. // @Range 0.0 to 45.0 // @Increment 1.0 -PARAM_DEFINE_FLOAT(FW_PR_IMAX, 1000.0f); +PARAM_DEFINE_FLOAT(FW_PR_IMAX, 0.2f); // @DisplayName Roll feedforward gain. // @Description This compensates during turns and ensures the nose stays level. @@ -119,7 +119,7 @@ PARAM_DEFINE_FLOAT(FW_RR_I, 0.05f); // @Description This limits the range in degrees the integrator can wind up to. // @Range 0.0 to 45.0 // @Increment 1.0 -PARAM_DEFINE_FLOAT(FW_RR_IMAX, 1000.0f); +PARAM_DEFINE_FLOAT(FW_RR_IMAX, 0.2f); // @DisplayName Maximum Roll Rate // @Description This limits the maximum roll rate the controller will output (in degrees per second). Setting a value of zero disables the limit. @@ -130,7 +130,7 @@ PARAM_DEFINE_FLOAT(FW_R_RMAX, 60); PARAM_DEFINE_FLOAT(FW_YR_P, 0.5); PARAM_DEFINE_FLOAT(FW_YR_I, 0.05); -PARAM_DEFINE_FLOAT(FW_YR_IMAX, 1000.0f); +PARAM_DEFINE_FLOAT(FW_YR_IMAX, 0.2f); PARAM_DEFINE_FLOAT(FW_YR_D, 0); //xxx: remove PARAM_DEFINE_FLOAT(FW_Y_ROLLFF, 0); PARAM_DEFINE_FLOAT(FW_AIRSPD_MIN, 9.0f); |