diff options
author | TickTock- <lukecell@safe-mail.net> | 2014-04-27 14:06:00 -0700 |
---|---|---|
committer | TickTock- <lukecell@safe-mail.net> | 2014-04-27 14:06:00 -0700 |
commit | 269800b48c31d78fec900b4beaf3f655a8c18730 (patch) | |
tree | 02d5e68319c9b4cce0ca3a169d9c2a32d5d0844e /src/modules/uORB/topics | |
parent | 6a7b104c2baad7527d35736979ddd1352bf4119d (diff) | |
download | px4-firmware-269800b48c31d78fec900b4beaf3f655a8c18730.tar.gz px4-firmware-269800b48c31d78fec900b4beaf3f655a8c18730.tar.bz2 px4-firmware-269800b48c31d78fec900b4beaf3f655a8c18730.zip |
renamed EASY to POSHOLD and SEATBELT to ALTHOLD
Diffstat (limited to 'src/modules/uORB/topics')
-rw-r--r-- | src/modules/uORB/topics/manual_control_setpoint.h | 4 | ||||
-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, 5 insertions, 5 deletions
diff --git a/src/modules/uORB/topics/manual_control_setpoint.h b/src/modules/uORB/topics/manual_control_setpoint.h index b6257e22a..0d1f62271 100644 --- a/src/modules/uORB/topics/manual_control_setpoint.h +++ b/src/modules/uORB/topics/manual_control_setpoint.h @@ -77,8 +77,8 @@ struct manual_control_setpoint_s { 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 easy_switch; /**< assisted 2 position switch (optional): seatbelt, simple */ + switch_pos_t return_switch; /**< rturn to launch 2 position switch (mandatory): no effect, return */ + switch_pos_t poshold_switch; /**< poshold 2 position switch (optional): althold, poshold */ 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 d99203ff6..7e00c5cbc 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, - EASY = 6, + POSHOLD = 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..8719505f4 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_ALTHOLD, + MAIN_STATE_POSHOLD, MAIN_STATE_AUTO, MAIN_STATE_MAX } main_state_t; |