diff options
| author | TickTock- <lukecell@safe-mail.net> | 2014-04-22 18:23:27 -0700 |
|---|---|---|
| committer | TickTock- <lukecell@safe-mail.net> | 2014-04-22 18:23:27 -0700 |
| commit | 7e621070ca0f002e2e1ccd863c31a24166ece0c2 (patch) | |
| tree | 750cac39cf7cd662bd204943cc5295c4c2ee9ad4 /src/modules/uORB | |
| parent | d6e6ee34401d79d428c025458940bbbf42f62236 (diff) | |
| download | px4-firmware-7e621070ca0f002e2e1ccd863c31a24166ece0c2.tar.gz px4-firmware-7e621070ca0f002e2e1ccd863c31a24166ece0c2.tar.bz2 px4-firmware-7e621070ca0f002e2e1ccd863c31a24166ece0c2.zip | |
renamed mission_switch to loiter_switch and assisted_switch to easy_switch
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, 4 insertions, 4 deletions
diff --git a/src/modules/uORB/topics/manual_control_setpoint.h b/src/modules/uORB/topics/manual_control_setpoint.h index 2b3a337b2..b6257e22a 100644 --- a/src/modules/uORB/topics/manual_control_setpoint.h +++ b/src/modules/uORB/topics/manual_control_setpoint.h @@ -78,8 +78,8 @@ 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 */ - switch_pos_t assisted_switch; /**< assisted 2 position switch (optional): seatbelt, simple */ - switch_pos_t mission_switch; /**< mission 2 position switch (optional): mission, loiter */ + switch_pos_t easy_switch; /**< assisted 2 position switch (optional): seatbelt, simple */ + 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 3246a39dd..d99203ff6 100644 --- a/src/modules/uORB/topics/rc_channels.h +++ b/src/modules/uORB/topics/rc_channels.h @@ -64,8 +64,8 @@ enum RC_CHANNELS_FUNCTION { YAW = 3, MODE = 4, RETURN = 5, - ASSISTED = 6, - MISSION = 7, + EASY = 6, + LOITER = 7, OFFBOARD_MODE = 8, FLAPS = 9, AUX_1 = 10, |