fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-27 16:43:34 +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/rc_channels.h
+4
View File
@@ -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,