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

Merge branch 'ArmDisarm' of github.com:DonLakeFlyer/Firmware into ekf_params

Browse Source
This commit is contained in:
Lorenz Meier
2014-04-21 11:23:35 +02:00
parent 595eb679b3 c1545bd237
commit 0a89364e3c
9 changed files with 427 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/uORB/topics/vehicle_status.h
+2
View File
@@ -69,6 +69,8 @@ typedef enum {
MAIN_STATE_MAX
} main_state_t;
// If you change the order, add or remove arming_state_t states make sure to update the arrays
// in state_machine_helper.cpp as well.
typedef enum {
ARMING_STATE_INIT = 0,
ARMING_STATE_STANDBY,