diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2012-10-04 16:38:11 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-10-04 16:38:11 +0200 |
| commit | 2fa0dec36954b0f3c99da0a443a9c51a7a0479c5 (patch) | |
| tree | 875f7506d1f5896506000d634556a2e290026021 /apps | |
| parent | 67a2c8a173819018ba2155688aa2a7bb682d8a77 (diff) | |
| download | px4-firmware-2fa0dec36954b0f3c99da0a443a9c51a7a0479c5.tar.gz px4-firmware-2fa0dec36954b0f3c99da0a443a9c51a7a0479c5.tar.bz2 px4-firmware-2fa0dec36954b0f3c99da0a443a9c51a7a0479c5.zip | |
Back out testing changes that are a bit too much ahead of time for master
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/commander/state_machine_helper.c | 12 | ||||
| -rw-r--r-- | apps/multirotor_att_control/multirotor_att_control_main.c | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/apps/commander/state_machine_helper.c b/apps/commander/state_machine_helper.c index 1e82bc417..f9ec6ba91 100644 --- a/apps/commander/state_machine_helper.c +++ b/apps/commander/state_machine_helper.c @@ -503,8 +503,8 @@ void update_state_machine_mode_manual(int status_pub, struct vehicle_status_s *c current_status->flight_mode = VEHICLE_FLIGHT_MODE_MANUAL; current_status->flag_control_manual_enabled = true; //XXX /* enable attitude control per default */ - current_status->flag_control_attitude_enabled = false; - current_status->flag_control_rates_enabled = true; + current_status->flag_control_attitude_enabled = true; + current_status->flag_control_rates_enabled = false; if (old_mode != current_status->flight_mode) state_machine_publish(status_pub, current_status, mavlink_fd); if (current_status->state_machine == SYSTEM_STATE_GROUND_READY || current_status->state_machine == SYSTEM_STATE_STABILIZED || current_status->state_machine == SYSTEM_STATE_AUTO) { @@ -518,8 +518,8 @@ void update_state_machine_mode_stabilized(int status_pub, struct vehicle_status_ int old_mode = current_status->flight_mode; current_status->flight_mode = VEHICLE_FLIGHT_MODE_STABILIZED; current_status->flag_control_manual_enabled = true; //XXX - current_status->flag_control_attitude_enabled = false; - current_status->flag_control_rates_enabled = true; + current_status->flag_control_attitude_enabled = true; + current_status->flag_control_rates_enabled = false; if (old_mode != current_status->flight_mode) state_machine_publish(status_pub, current_status, mavlink_fd); if (current_status->state_machine == SYSTEM_STATE_GROUND_READY || current_status->state_machine == SYSTEM_STATE_MANUAL || current_status->state_machine == SYSTEM_STATE_AUTO) { @@ -533,8 +533,8 @@ void update_state_machine_mode_auto(int status_pub, struct vehicle_status_s *cur int old_mode = current_status->flight_mode; current_status->flight_mode = VEHICLE_FLIGHT_MODE_AUTO; current_status->flag_control_manual_enabled = true; //XXX - current_status->flag_control_attitude_enabled = false; - current_status->flag_control_rates_enabled = true; + current_status->flag_control_attitude_enabled = true; + current_status->flag_control_rates_enabled = false; if (old_mode != current_status->flight_mode) state_machine_publish(status_pub, current_status, mavlink_fd); if (current_status->state_machine == SYSTEM_STATE_GROUND_READY || current_status->state_machine == SYSTEM_STATE_MANUAL || current_status->state_machine == SYSTEM_STATE_STABILIZED) { diff --git a/apps/multirotor_att_control/multirotor_att_control_main.c b/apps/multirotor_att_control/multirotor_att_control_main.c index 4b386ffd4..18efe1ae2 100644 --- a/apps/multirotor_att_control/multirotor_att_control_main.c +++ b/apps/multirotor_att_control/multirotor_att_control_main.c @@ -224,13 +224,13 @@ mc_thread_main(int argc, char *argv[]) /** STEP 3: Identify the controller setup to run and set up the inputs correctly */ /* run attitude controller */ - // if (state.flag_control_attitude_enabled && !state.flag_control_rates_enabled) { - // multirotor_control_attitude(&att_sp, &att, NULL, &actuators); - // orb_publish(ORB_ID_VEHICLE_ATTITUDE_CONTROLS, actuator_pub, &actuators); - // } else if (state.flag_control_attitude_enabled && state.flag_control_rates_enabled) { - // multirotor_control_attitude(&att_sp, &att, &rates_sp, NULL); - // orb_publish(ORB_ID(vehicle_rates_setpoint), rates_sp_pub, &rates_sp); - // } + if (state.flag_control_attitude_enabled && !state.flag_control_rates_enabled) { + multirotor_control_attitude(&att_sp, &att, NULL, &actuators); + orb_publish(ORB_ID_VEHICLE_ATTITUDE_CONTROLS, actuator_pub, &actuators); + } else if (state.flag_control_attitude_enabled && state.flag_control_rates_enabled) { + multirotor_control_attitude(&att_sp, &att, &rates_sp, NULL); + orb_publish(ORB_ID(vehicle_rates_setpoint), rates_sp_pub, &rates_sp); + } if (state.flag_control_rates_enabled) { |