fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-02 19:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merged in upstream master

Browse Source
This commit is contained in:
TickTock-
2014-04-27 12:43:13 -07:00
parent b4d30e53c5 ad77ba2642
commit 07c35010aa
50 changed files with 815 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/uORB/topics/manual_control_setpoint.h
+4
View File
@@ -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 */