diff --git a/conf/settings/control/stabilization_att_int.xml b/conf/settings/control/stabilization_att_int.xml index 6588b5470a..7f0aa9a42f 100644 --- a/conf/settings/control/stabilization_att_int.xml +++ b/conf/settings/control/stabilization_att_int.xml @@ -8,17 +8,14 @@ - - - diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c index bc845d87ab..a0d42477d3 100644 --- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c +++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c @@ -52,11 +52,6 @@ void stabilization_attitude_init(void) { stabilization_attitude_ref_init(); - VECT3_ASSIGN(stabilization_gains.a, - STABILIZATION_ATTITUDE_PHI_AGAIN, - STABILIZATION_ATTITUDE_THETA_AGAIN, - STABILIZATION_ATTITUDE_PSI_AGAIN); - VECT3_ASSIGN(stabilization_gains.p, STABILIZATION_ATTITUDE_PHI_PGAIN, STABILIZATION_ATTITUDE_THETA_PGAIN, @@ -112,14 +107,11 @@ void stabilization_attitude_run(bool_t in_flight) { /* compute feedforward command */ stabilization_att_ff_cmd[COMMAND_ROLL] = - OFFSET_AND_ROUND(stabilization_gains.dd.x * stab_att_ref_accel.p, 5) - + OFFSET_AND_ROUND(stabilization_gains.a.x * stab_att_ref_euler.phi, 6); + OFFSET_AND_ROUND(stabilization_gains.dd.x * stab_att_ref_accel.p, 5); stabilization_att_ff_cmd[COMMAND_PITCH] = - OFFSET_AND_ROUND(stabilization_gains.dd.y * stab_att_ref_accel.q, 5) - + OFFSET_AND_ROUND(stabilization_gains.a.y * stab_att_ref_euler.theta, 6); + OFFSET_AND_ROUND(stabilization_gains.dd.y * stab_att_ref_accel.q, 5); stabilization_att_ff_cmd[COMMAND_YAW] = - OFFSET_AND_ROUND(stabilization_gains.dd.z * stab_att_ref_accel.r, 5) - + OFFSET_AND_ROUND(stabilization_gains.a.z * stab_att_ref_euler.psi, 6); + OFFSET_AND_ROUND(stabilization_gains.dd.z * stab_att_ref_accel.r, 5); /* compute feedback command */ /* attitude error */ diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_int.h b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_int.h index 2051caec5d..02b761183a 100644 --- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_int.h +++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_int.h @@ -29,7 +29,6 @@ #include "generated/airframe.h" struct Int32AttitudeGains { - struct Int32Vect3 a; struct Int32Vect3 p; struct Int32Vect3 d; struct Int32Vect3 dd;