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/topics/rc_channels.h | |
| 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/topics/rc_channels.h')
| -rw-r--r-- | src/modules/uORB/topics/rc_channels.h | 4 |
1 files changed, 4 insertions, 0 deletions
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, |