diff options
| author | TickTock- <lukecell@safe-mail.net> | 2014-04-27 12:43:13 -0700 |
|---|---|---|
| committer | TickTock- <lukecell@safe-mail.net> | 2014-04-27 12:43:13 -0700 |
| commit | 07c35010aaee59fbed21824c20666bda9c340705 (patch) | |
| tree | 87d29034e772e2f5b18cbaab5478b65daa5bb930 /src/modules/uORB | |
| parent | b4d30e53c5af47a90d98c4c058df6a645ca34d40 (diff) | |
| parent | ad77ba26427aa9a2d8b8241fc95271667a1c0863 (diff) | |
| download | px4-firmware-07c35010aaee59fbed21824c20666bda9c340705.tar.gz px4-firmware-07c35010aaee59fbed21824c20666bda9c340705.tar.bz2 px4-firmware-07c35010aaee59fbed21824c20666bda9c340705.zip | |
Merged in upstream master
Diffstat (limited to 'src/modules/uORB')
| -rw-r--r-- | src/modules/uORB/topics/manual_control_setpoint.h | 4 | ||||
| -rw-r--r-- | src/modules/uORB/topics/rc_channels.h | 4 | ||||
| -rw-r--r-- | src/modules/uORB/topics/vehicle_status.h | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/src/modules/uORB/topics/manual_control_setpoint.h b/src/modules/uORB/topics/manual_control_setpoint.h index b6257e22a..c61987df6 100644 --- a/src/modules/uORB/topics/manual_control_setpoint.h +++ b/src/modules/uORB/topics/manual_control_setpoint.h @@ -78,7 +78,11 @@ struct manual_control_setpoint_s { switch_pos_t mode_switch; /**< mode 3 position switch (mandatory): manual, assisted, auto */ switch_pos_t return_switch; /**< land 2 position switch (mandatory): land, no effect */ +<<<<<<< HEAD switch_pos_t easy_switch; /**< assisted 2 position switch (optional): seatbelt, simple */ +======= + switch_pos_t assisted_switch; /**< assisted 2 position switch (optional): seatbelt, simple */ +>>>>>>> ad77ba26427aa9a2d8b8241fc95271667a1c0863 switch_pos_t loiter_switch; /**< mission 2 position switch (optional): mission, loiter */ }; /**< manual control inputs */ diff --git a/src/modules/uORB/topics/rc_channels.h b/src/modules/uORB/topics/rc_channels.h index d99203ff6..df651e78d 100644 --- a/src/modules/uORB/topics/rc_channels.h +++ b/src/modules/uORB/topics/rc_channels.h @@ -64,7 +64,11 @@ enum RC_CHANNELS_FUNCTION { YAW = 3, MODE = 4, RETURN = 5, +<<<<<<< HEAD EASY = 6, +======= + ASSISTED = 6, +>>>>>>> ad77ba26427aa9a2d8b8241fc95271667a1c0863 LOITER = 7, OFFBOARD_MODE = 8, FLAPS = 9, 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, |