Browse Source

Map inputs to the controller we actually want

sbg
Lorenz Meier 13 years ago
parent
commit
dff0051568
  1. 6
      apps/multirotor_att_control/multirotor_att_control_main.c

6
apps/multirotor_att_control/multirotor_att_control_main.c

@ -195,7 +195,7 @@ mc_thread_main(int argc, char *argv[]) @@ -195,7 +195,7 @@ mc_thread_main(int argc, char *argv[])
rates_sp.roll = manual.roll;
rates_sp.pitch = manual.pitch;
rates_sp.yaw = att.yaw + manual.yaw * 2.0f;
rates_sp.yaw = manual.yaw;
rates_sp.thrust = manual.throttle;
//printf("rates\n");
rates_sp.timestamp = hrt_absolute_time();
@ -204,9 +204,7 @@ mc_thread_main(int argc, char *argv[]) @@ -204,9 +204,7 @@ mc_thread_main(int argc, char *argv[])
if (state.flag_control_attitude_enabled) {
att_sp.roll_body = manual.roll;
att_sp.pitch_body = manual.pitch;
att_sp.yaw_body = manual.yaw; // XXX Hack, clean up
/* set yaw rate */
rates_sp.yaw = manual.yaw;
att_sp.yaw_body = att.yaw + manual.yaw * -2.0f;
att_sp.thrust = manual.throttle;
att_sp.timestamp = hrt_absolute_time();
}

Loading…
Cancel
Save