diff options
author | Julian Oes <joes@student.ethz.ch> | 2013-03-26 15:37:13 -0700 |
---|---|---|
committer | Julian Oes <joes@student.ethz.ch> | 2013-03-26 15:37:13 -0700 |
commit | 3cb3fa224baffcbb5ea228287f3d5b4f226b813b (patch) | |
tree | 6c3ea2ad3c371519b13ed84a0d2e6a855a7810f2 /apps | |
parent | f8e5b0cb0e01f89e7cffcdb97f4d5daaae499f72 (diff) | |
download | px4-firmware-3cb3fa224baffcbb5ea228287f3d5b4f226b813b.tar.gz px4-firmware-3cb3fa224baffcbb5ea228287f3d5b4f226b813b.tar.bz2 px4-firmware-3cb3fa224baffcbb5ea228287f3d5b4f226b813b.zip |
Small fixes again
Diffstat (limited to 'apps')
-rw-r--r-- | apps/commander/commander.c | 6 | ||||
-rw-r--r-- | apps/mavlink/mavlink.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/apps/commander/commander.c b/apps/commander/commander.c index bde4f2856..77853aa7a 100644 --- a/apps/commander/commander.c +++ b/apps/commander/commander.c @@ -1082,7 +1082,8 @@ void handle_command(int status_pub, struct vehicle_status_s *current_vehicle_sta /* supported command handling stop */ if (result == VEHICLE_CMD_RESULT_FAILED || result == VEHICLE_CMD_RESULT_DENIED || - result == VEHICLE_CMD_RESULT_UNSUPPORTED) { + result == VEHICLE_CMD_RESULT_UNSUPPORTED || + result == VEHICLE_CMD_RESULT_TEMPORARILY_REJECTED) { tune_negative(); @@ -1828,16 +1829,19 @@ int commander_thread_main(int argc, char *argv[]) /* bottom stick position, go to manual mode */ current_status.mode_switch = MODE_SWITCH_MANUAL; + printf("mode switch: manual\n"); } else if (sp_man.mode_switch > STICK_ON_OFF_LIMIT) { /* top stick position, set auto/mission for all vehicle types */ current_status.mode_switch = MODE_SWITCH_AUTO; + printf("mode switch: auto\n"); } else { /* center stick position, set seatbelt/simple control */ current_status.mode_switch = MODE_SWITCH_SEATBELT; + printf("mode switch: seatbelt\n"); } // warnx("man ctrl mode: %d\n", (int)current_status.manual_control_mode); diff --git a/apps/mavlink/mavlink.c b/apps/mavlink/mavlink.c index 084ab0d32..2643cbf7b 100644 --- a/apps/mavlink/mavlink.c +++ b/apps/mavlink/mavlink.c @@ -236,11 +236,6 @@ get_mavlink_mode_and_state(uint8_t *mavlink_state, uint8_t *mavlink_mode) *mavlink_mode |= MAV_MODE_FLAG_GUIDED_ENABLED; } -// -// if (v_status.system_state == NAVIGATION_STATE_SEATBELT) { -// -// *mavlink_mode |= MAV_MODE_FLAG_DECODE_POSITION_GUIDED; -// } /** @@ -577,6 +572,7 @@ int mavlink_thread_main(int argc, char *argv[]) default: usage(); + break; } } |