diff options
| author | TickTock- <lukecell@safe-mail.net> | 2014-04-27 13:12:28 -0700 |
|---|---|---|
| committer | TickTock- <lukecell@safe-mail.net> | 2014-04-27 13:12:28 -0700 |
| commit | 6a7b104c2baad7527d35736979ddd1352bf4119d (patch) | |
| tree | 5ce1b86a08812b4a0485277dfaee741d1d56a837 /src/modules/uORB | |
| parent | 07c35010aaee59fbed21824c20666bda9c340705 (diff) | |
| download | px4-firmware-6a7b104c2baad7527d35736979ddd1352bf4119d.tar.gz px4-firmware-6a7b104c2baad7527d35736979ddd1352bf4119d.tar.bz2 px4-firmware-6a7b104c2baad7527d35736979ddd1352bf4119d.zip | |
compiles
Diffstat (limited to 'src/modules/uORB')
| -rw-r--r-- | src/modules/uORB/topics/manual_control_setpoint.h | 4 | ||||
| -rw-r--r-- | src/modules/uORB/topics/rc_channels.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/modules/uORB/topics/manual_control_setpoint.h b/src/modules/uORB/topics/manual_control_setpoint.h index c61987df6..b6257e22a 100644 --- a/src/modules/uORB/topics/manual_control_setpoint.h +++ b/src/modules/uORB/topics/manual_control_setpoint.h @@ -78,11 +78,7 @@ 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 */ diff --git a/src/modules/uORB/topics/rc_channels.h b/src/modules/uORB/topics/rc_channels.h index df651e78d..d99203ff6 100644 --- a/src/modules/uORB/topics/rc_channels.h +++ b/src/modules/uORB/topics/rc_channels.h @@ -64,11 +64,7 @@ enum RC_CHANNELS_FUNCTION { YAW = 3, MODE = 4, RETURN = 5, -<<<<<<< HEAD EASY = 6, -======= - ASSISTED = 6, ->>>>>>> ad77ba26427aa9a2d8b8241fc95271667a1c0863 LOITER = 7, OFFBOARD_MODE = 8, FLAPS = 9, |