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

Arming with IO working now

Browse Source
This commit is contained in:
Julian Oes
2013-06-14 16:04:23 +02:00
parent 90f5e30f2a
commit 5b21362e1f
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/state_machine_helper.c
+4
View File
@@ -70,6 +70,7 @@ int arming_state_transition(int status_pub, struct vehicle_status_s *current_sta
if (current_state->arming_state == ARMING_STATE_STANDBY) {
ret = OK;
safety->armed = false;
safety->ready_to_arm = false;
}
break;
case ARMING_STATE_STANDBY:
@@ -82,6 +83,7 @@ int arming_state_transition(int status_pub, struct vehicle_status_s *current_sta
if (current_state->condition_system_sensors_initialized) {
ret = OK;
safety->armed = false;
safety->ready_to_arm = true;
} else {
mavlink_log_critical(mavlink_fd, "Rej. STANDBY state, sensors not initialized");
}
@@ -115,6 +117,7 @@ int arming_state_transition(int status_pub, struct vehicle_status_s *current_sta
|| current_state->arming_state == ARMING_STATE_ARMED_ERROR) {
ret = OK;
safety->armed = false;
safety->ready_to_arm = false;
}
break;
case ARMING_STATE_REBOOT:
@@ -126,6 +129,7 @@ int arming_state_transition(int status_pub, struct vehicle_status_s *current_sta
ret = OK;
safety->armed = false;
safety->ready_to_arm = false;
}
break;