diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2014-04-27 16:07:38 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-04-27 16:07:38 +0200 |
commit | ad77ba26427aa9a2d8b8241fc95271667a1c0863 (patch) | |
tree | e524aed7e6f46fe328ed4c2392259bb58d1ac5de /src/modules/uORB/topics/vehicle_status.h | |
parent | 4a949a9565b08bac24130b36bd677d9d08b7cdc8 (diff) | |
parent | 08408594ec3f136bdcf554a2a75c2e0af8e03c8c (diff) | |
download | px4-firmware-ad77ba26427aa9a2d8b8241fc95271667a1c0863.tar.gz px4-firmware-ad77ba26427aa9a2d8b8241fc95271667a1c0863.tar.bz2 px4-firmware-ad77ba26427aa9a2d8b8241fc95271667a1c0863.zip |
Merge pull request #864 from PX4/mpc_rc
mpc_local_pos + rc_timeout
Diffstat (limited to 'src/modules/uORB/topics/vehicle_status.h')
-rw-r--r-- | src/modules/uORB/topics/vehicle_status.h | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/modules/uORB/topics/vehicle_status.h b/src/modules/uORB/topics/vehicle_status.h index 256c5134c..435230432 100644 --- a/src/modules/uORB/topics/vehicle_status.h +++ b/src/modules/uORB/topics/vehicle_status.h @@ -95,29 +95,6 @@ typedef enum { FAILSAFE_STATE_MAX } failsafe_state_t; -typedef enum { - MODE_SWITCH_MANUAL = 0, - MODE_SWITCH_ASSISTED, - MODE_SWITCH_AUTO -} mode_switch_pos_t; - -typedef enum { - ASSISTED_SWITCH_SEATBELT = 0, - ASSISTED_SWITCH_EASY -} assisted_switch_pos_t; - -typedef enum { - RETURN_SWITCH_NONE = 0, - RETURN_SWITCH_NORMAL, - RETURN_SWITCH_RETURN -} return_switch_pos_t; - -typedef enum { - MISSION_SWITCH_NONE = 0, - MISSION_SWITCH_LOITER, - MISSION_SWITCH_MISSION -} mission_switch_pos_t; - enum VEHICLE_MODE_FLAG { VEHICLE_MODE_FLAG_SAFETY_ARMED = 128, VEHICLE_MODE_FLAG_MANUAL_INPUT_ENABLED = 64, @@ -189,11 +166,6 @@ struct vehicle_status_s { bool is_rotary_wing; - mode_switch_pos_t mode_switch; - return_switch_pos_t return_switch; - assisted_switch_pos_t assisted_switch; - mission_switch_pos_t mission_switch; - bool condition_battery_voltage_valid; bool condition_system_in_air_restore; /**< true if we can restore in mid air */ bool condition_system_sensors_initialized; |