aboutsummaryrefslogtreecommitdiff
path: root/apps/commander/state_machine_helper.c
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2012-12-30 11:01:09 +0100
committerLorenz Meier <lm@inf.ethz.ch>2012-12-30 11:01:09 +0100
commit2577e1a749e72814146b96c3e0473fbfb8b15a71 (patch)
tree3630e9b29ba41997bcba2439c3b76d21d8a214cd /apps/commander/state_machine_helper.c
parent62a95bf8e6592b31ae7e84e53b654bc5e6b71cd1 (diff)
downloadpx4-firmware-2577e1a749e72814146b96c3e0473fbfb8b15a71.tar.gz
px4-firmware-2577e1a749e72814146b96c3e0473fbfb8b15a71.tar.bz2
px4-firmware-2577e1a749e72814146b96c3e0473fbfb8b15a71.zip
Removed compile errors, removed non-wanted MAVLink dependency in commander app
Diffstat (limited to 'apps/commander/state_machine_helper.c')
-rw-r--r--apps/commander/state_machine_helper.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/apps/commander/state_machine_helper.c b/apps/commander/state_machine_helper.c
index f30fd975b..fdd32ca40 100644
--- a/apps/commander/state_machine_helper.c
+++ b/apps/commander/state_machine_helper.c
@@ -522,20 +522,20 @@ void update_state_machine_mode_manual(int status_pub, struct vehicle_status_s *c
current_status->flag_control_manual_enabled = true;
/* set behaviour based on airframe */
- if ((current_status.system_type == MAV_TYPE_QUADROTOR) ||
- (current_status.system_type == MAV_TYPE_HEXAROTOR) ||
- (current_status.system_type == MAV_TYPE_OCTOROTOR)) {
+ if ((current_status->system_type == VEHICLE_TYPE_QUADROTOR) ||
+ (current_status->system_type == VEHICLE_TYPE_HEXAROTOR) ||
+ (current_status->system_type == VEHICLE_TYPE_OCTOROTOR)) {
/* assuming a rotary wing, set to SAS */
- current_status.manual_control_mode = VEHICLE_MANUAL_CONTROL_MODE_SAS;
- current_status.flag_control_attitude_enabled = true;
- current_status.flag_control_rates_enabled = true;
+ current_status->manual_control_mode = VEHICLE_MANUAL_CONTROL_MODE_SAS;
+ current_status->flag_control_attitude_enabled = true;
+ current_status->flag_control_rates_enabled = true;
} else {
/* assuming a fixed wing, set to direct pass-through */
- current_status.manual_control_mode = VEHICLE_MANUAL_CONTROL_MODE_DIRECT;
- current_status.flag_control_attitude_enabled = false;
- current_status.flag_control_rates_enabled = false;
+ current_status->manual_control_mode = VEHICLE_MANUAL_CONTROL_MODE_DIRECT;
+ current_status->flag_control_attitude_enabled = false;
+ current_status->flag_control_rates_enabled = false;
}
if (old_mode != current_status->flight_mode) state_machine_publish(status_pub, current_status, mavlink_fd);