diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-12 09:39:52 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-12 09:39:52 +0200 |
| commit | 7c75f61863436df3ca7610b11d2022dd422cca8c (patch) | |
| tree | 44a91e4e39e396272bd8b16121721fceb5b5582b /src/modules/uORB | |
| parent | 8cbd38061ccccf2173b16ea4b5db69bb1fbd2fd4 (diff) | |
| parent | 3f4c264050774e79add989cb85a80623038478c0 (diff) | |
| download | px4-firmware-7c75f61863436df3ca7610b11d2022dd422cca8c.tar.gz px4-firmware-7c75f61863436df3ca7610b11d2022dd422cca8c.tar.bz2 px4-firmware-7c75f61863436df3ca7610b11d2022dd422cca8c.zip | |
Merge remote-tracking branch 'upstream/master' into manualcontrolrename
Conflicts:
src/modules/commander/commander.cpp
src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
src/modules/uORB/topics/manual_control_setpoint.h
Diffstat (limited to 'src/modules/uORB')
| -rw-r--r-- | src/modules/uORB/topics/manual_control_setpoint.h | 8 | ||||
| -rw-r--r-- | src/modules/uORB/topics/rc_channels.h | 2 | ||||
| -rw-r--r-- | src/modules/uORB/topics/vehicle_status.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/modules/uORB/topics/manual_control_setpoint.h b/src/modules/uORB/topics/manual_control_setpoint.h index 593e9453f..a8fb795f4 100644 --- a/src/modules/uORB/topics/manual_control_setpoint.h +++ b/src/modules/uORB/topics/manual_control_setpoint.h @@ -86,10 +86,10 @@ struct manual_control_setpoint_s { float aux4; /**< default function: camera roll */ float aux5; /**< default function: payload drop */ - 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 loiter_switch; /**< mission 2 position switch (optional): mission, loiter */ + switch_pos_t mode_switch; /**< main mode 3 position switch (mandatory): _MANUAL_, ASSIST, AUTO */ + switch_pos_t return_switch; /**< return to launch 2 position switch (mandatory): _NORMAL_, RTL */ + switch_pos_t posctl_switch; /**< position control 2 position switch (optional): _ALTCTL_, POSCTL */ + switch_pos_t loiter_switch; /**< loiter 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 c168b2fac..b60402452 100644 --- a/src/modules/uORB/topics/rc_channels.h +++ b/src/modules/uORB/topics/rc_channels.h @@ -64,7 +64,7 @@ enum RC_CHANNELS_FUNCTION { YAW = 3, MODE = 4, RETURN = 5, - ASSISTED = 6, + POSCTL = 6, LOITER = 7, OFFBOARD_MODE = 8, FLAPS = 9, diff --git a/src/modules/uORB/topics/vehicle_status.h b/src/modules/uORB/topics/vehicle_status.h index 435230432..f56355246 100644 --- a/src/modules/uORB/topics/vehicle_status.h +++ b/src/modules/uORB/topics/vehicle_status.h @@ -63,8 +63,8 @@ /* main state machine */ typedef enum { MAIN_STATE_MANUAL = 0, - MAIN_STATE_SEATBELT, - MAIN_STATE_EASY, + MAIN_STATE_ALTCTL, + MAIN_STATE_POSCTL, MAIN_STATE_AUTO, MAIN_STATE_MAX } main_state_t; |