Merge branch 'beta'

This commit is contained in:
Lorenz Meier
2015-07-05 13:48:16 +02:00
@@ -79,7 +79,7 @@ PARAM_DEFINE_FLOAT(MPC_Z_P, 1.0f);
* @min 0.0 * @min 0.0
* @group Multicopter Position Control * @group Multicopter Position Control
*/ */
PARAM_DEFINE_FLOAT(MPC_Z_VEL_P, 0.1f); PARAM_DEFINE_FLOAT(MPC_Z_VEL_P, 0.2f);
/** /**
* Integral gain for vertical velocity error * Integral gain for vertical velocity error