diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-04-26 12:24:42 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-04-26 12:24:42 +0200 |
| commit | 4a949a9565b08bac24130b36bd677d9d08b7cdc8 (patch) | |
| tree | 1e90b5a8a9c9e640e6c9501a56feb928683d5088 /src/modules/uORB | |
| parent | 5bd8e6f6b3a1bf021435cdb27471abdc82655317 (diff) | |
| parent | c1545bd237cdaf9636da55f5b907bdadc39ed130 (diff) | |
| download | px4-firmware-4a949a9565b08bac24130b36bd677d9d08b7cdc8.tar.gz px4-firmware-4a949a9565b08bac24130b36bd677d9d08b7cdc8.tar.bz2 px4-firmware-4a949a9565b08bac24130b36bd677d9d08b7cdc8.zip | |
Merge pull request #749 from DonLakeFlyer/ArmDisarm
Arm/Disarm duplication removal and support for Disarm in VEHICLE_CMD_COMPONENT_ARM_DISARM
Diffstat (limited to 'src/modules/uORB')
| -rw-r--r-- | src/modules/uORB/topics/vehicle_status.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/modules/uORB/topics/vehicle_status.h b/src/modules/uORB/topics/vehicle_status.h index 56be4d241..256c5134c 100644 --- a/src/modules/uORB/topics/vehicle_status.h +++ b/src/modules/uORB/topics/vehicle_status.h @@ -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, |