diff options
| author | Julian Oes <julian@oes.ch> | 2014-07-02 14:59:43 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-07-02 14:59:43 +0200 |
| commit | fdceb8b0620c347c9f7f477dbf295dcfff12012c (patch) | |
| tree | 4b41752c9cb81cb035034b3893872476495a3acd /src/modules/commander | |
| parent | 40780e29164f323d4896d75d9f585434375d83b0 (diff) | |
| parent | 28a31708f98eefa4ceb04617f2da3dd7892c99fa (diff) | |
| download | px4-firmware-fdceb8b0620c347c9f7f477dbf295dcfff12012c.tar.gz px4-firmware-fdceb8b0620c347c9f7f477dbf295dcfff12012c.tar.bz2 px4-firmware-fdceb8b0620c347c9f7f477dbf295dcfff12012c.zip | |
Merge branch 'master' into navigator_rewrite_offboard2_merge
Conflicts:
mavlink/include/mavlink/v1.0/common/common.h
src/modules/mavlink/mavlink_receiver.cpp
Diffstat (limited to 'src/modules/commander')
| -rw-r--r-- | src/modules/commander/commander.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp index 6a0ed041b..ff99e7baf 100644 --- a/src/modules/commander/commander.cpp +++ b/src/modules/commander/commander.cpp @@ -609,6 +609,7 @@ bool handle_command(struct vehicle_status_s *status, const struct safety_s *safe // XXX TODO } + return true; } int commander_thread_main(int argc, char *argv[]) @@ -1622,7 +1623,6 @@ set_main_state_rc(struct vehicle_status_s *status, struct manual_control_setpoin switch (sp_man->mode_switch) { case SWITCH_POS_NONE: res = TRANSITION_NOT_CHANGED; - warnx("NONE"); break; case SWITCH_POS_OFF: // MANUAL |