diff options
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, |