fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-06-26 22:00:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'beta' into acro2

Browse Source
This commit is contained in:
Anton Babushkin
2014-02-01 11:27:41 +01:00
parent 2923bdf39f 8897894b19
commit 77c6231c8e
7 changed files with 86 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/commander.cpp
+2
View File
@@ -369,6 +369,7 @@ int arm()
if (arming_res == TRANSITION_CHANGED) {
mavlink_log_info(mavlink_fd, "[cmd] ARMED by commandline");
return 0;
} else {
return 1;
}
@@ -381,6 +382,7 @@ int disarm()
if (arming_res == TRANSITION_CHANGED) {
mavlink_log_info(mavlink_fd, "[cmd] ARMED by commandline");
return 0;
} else {
return 1;
}