diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-04-26 22:01:18 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-04-26 22:01:18 +0200 |
| commit | 811dd12ac56396d752def4070288fc74a7dd1abb (patch) | |
| tree | bcf22c437a0592a52c2ce1cdd6117c70385f0ce4 /src/modules/uORB/topics/vehicle_status.h | |
| parent | cfe346ddfafbc1d2e04f510fbee8b6fc3b1aedb3 (diff) | |
| parent | 4a949a9565b08bac24130b36bd677d9d08b7cdc8 (diff) | |
| download | px4-firmware-811dd12ac56396d752def4070288fc74a7dd1abb.tar.gz px4-firmware-811dd12ac56396d752def4070288fc74a7dd1abb.tar.bz2 px4-firmware-811dd12ac56396d752def4070288fc74a7dd1abb.zip | |
Merge remote-tracking branch 'upstream/master' into mtecs
Diffstat (limited to 'src/modules/uORB/topics/vehicle_status.h')
| -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, |