diff options
| author | Julian Oes <julian@oes.ch> | 2014-04-26 12:56:18 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-04-26 12:56:18 +0200 |
| commit | 3a12cb46487980dbf85f4606e316d9643a2b3b23 (patch) | |
| tree | d9ec413d045d23ff40fbb31c764a5a16b540e69e /src/modules/uORB | |
| parent | ea0142810a734bd8cade70668eefa562a495ec4a (diff) | |
| parent | 4a949a9565b08bac24130b36bd677d9d08b7cdc8 (diff) | |
| download | px4-firmware-3a12cb46487980dbf85f4606e316d9643a2b3b23.tar.gz px4-firmware-3a12cb46487980dbf85f4606e316d9643a2b3b23.tar.bz2 px4-firmware-3a12cb46487980dbf85f4606e316d9643a2b3b23.zip | |
Merge remote-tracking branch 'px4/master' into navigator_cleanup
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 c1bd828d8..c6fe937ef 100644 --- a/src/modules/uORB/topics/vehicle_status.h +++ b/src/modules/uORB/topics/vehicle_status.h @@ -67,6 +67,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, |