Merge pull request #749 from DonLakeFlyer/ArmDisarm

Arm/Disarm duplication removal and support for Disarm in VEHICLE_CMD_COMPONENT_ARM_DISARM
This commit is contained in:
Lorenz Meier
2014-04-26 12:24:42 +02:00
9 changed files with 427 additions and 332 deletions
+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,