Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-02 11:59:17 +08:00
Code Issues Actions 21 Packages Projects Releases Wiki Activity

Commander: Allow arming in MANUAL, STAB, ACRO, ALTCTL

Browse Source
This commit is contained in:
Lorenz Meier
2016-02-25 14:12:08 +01:00
parent 755569ac12
commit 94353a9d40
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/commander.cpp
+5 -3
View File
@@ -2284,9 +2284,11 @@ int commander_thread_main(int argc, char *argv[])
* the system can be armed in auto if armed via the GCS. * the system can be armed in auto if armed via the GCS.
*/ */
if ((status.main_state != vehicle_status_s::MAIN_STATE_MANUAL) && if ((status.main_state != vehicle_status_s::MAIN_STATE_MANUAL)
(status.main_state != vehicle_status_s::MAIN_STATE_STAB)) { && (status.main_state != vehicle_status_s::MAIN_STATE_ACRO)
print_reject_arm("NOT ARMING: Switch to MANUAL mode first."); && (status.main_state != vehicle_status_s::MAIN_STATE_STAB)
&& (status.main_state != vehicle_status_s::MAIN_STATE_ALTCTL)) {
print_reject_arm("NOT ARMING: Switch to a manual mode first.");
} else if (!status.condition_home_position_valid && } else if (!status.condition_home_position_valid &&
geofence_action == geofence_result_s::GF_ACTION_RTL) { geofence_action == geofence_result_s::GF_ACTION_RTL) {