diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-04-27 15:45:33 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-04-27 15:45:33 +0200 |
| commit | c74248c8b15af0330e0b76ff0366321bfddda34b (patch) | |
| tree | 7de37dc94e44678a852a4112671d0c07f7edbac0 /src/modules/uORB/topics/vehicle_status.h | |
| parent | 84943644d77ce21e91fa60a326ab333069333e74 (diff) | |
| parent | 4a949a9565b08bac24130b36bd677d9d08b7cdc8 (diff) | |
| download | px4-firmware-c74248c8b15af0330e0b76ff0366321bfddda34b.tar.gz px4-firmware-c74248c8b15af0330e0b76ff0366321bfddda34b.tar.bz2 px4-firmware-c74248c8b15af0330e0b76ff0366321bfddda34b.zip | |
Merged mpc_rc with master
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 48af4c9e2..435230432 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, |