diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-04-21 11:23:35 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-04-21 11:23:35 +0200 |
| commit | 0a89364e3c687deb060782bfd9fbccbd582e0e6d (patch) | |
| tree | b756f97d185b75d2f1eed9c746b4c0ac52083177 /src/modules/uORB | |
| parent | 595eb679b30442b52ccc7a2c2ce7ade7b5e5c6c9 (diff) | |
| parent | c1545bd237cdaf9636da55f5b907bdadc39ed130 (diff) | |
| download | px4-firmware-0a89364e3c687deb060782bfd9fbccbd582e0e6d.tar.gz px4-firmware-0a89364e3c687deb060782bfd9fbccbd582e0e6d.tar.bz2 px4-firmware-0a89364e3c687deb060782bfd9fbccbd582e0e6d.zip | |
Merge branch 'ArmDisarm' of github.com:DonLakeFlyer/Firmware into ekf_params
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, |