fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-25 04:53:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into offboard2

Browse Source
This commit is contained in:
Anton Babushkin
2014-05-21 10:40:58 +02:00
parent 8c4b35cc23 fb801b6fae
commit 950571eaf6
38 changed files with 360 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/uORB/topics/manual_control_setpoint.h
+1
View File
@@ -97,6 +97,7 @@ struct manual_control_setpoint_s {
switch_pos_t return_switch; /**< return to launch 2 position switch (mandatory): _NORMAL_, RTL */
switch_pos_t posctl_switch; /**< position control 2 position switch (optional): _ALTCTL_, POSCTL */
switch_pos_t loiter_switch; /**< loiter 2 position switch (optional): _MISSION_, LOITER */
switch_pos_t acro_switch; /**< acro 2 position switch (optional): _MANUAL_, ACRO */
switch_pos_t offboard_switch; /**< offboard 2 position switch (optional): _NORMAL_, OFFBOARD */
}; /**< manual control inputs */