diff options
| author | TickTock- <TjckTock@gmail.com> | 2014-04-28 21:47:45 -0700 |
|---|---|---|
| committer | TickTock- <TjckTock@gmail.com> | 2014-04-28 21:47:45 -0700 |
| commit | 31089a290ba089b2b5cbcc76ed677e3f401ffa36 (patch) | |
| tree | dfa7cc73cfa9b4d1b52f801aa05f66429c0ffa41 /src/modules/uORB/topics | |
| parent | 269800b48c31d78fec900b4beaf3f655a8c18730 (diff) | |
| download | px4-firmware-31089a290ba089b2b5cbcc76ed677e3f401ffa36.tar.gz px4-firmware-31089a290ba089b2b5cbcc76ed677e3f401ffa36.tar.bz2 px4-firmware-31089a290ba089b2b5cbcc76ed677e3f401ffa36.zip | |
Replaces poshold/althold with posctrl/altctrl
Diffstat (limited to 'src/modules/uORB/topics')
| -rw-r--r-- | src/modules/uORB/topics/manual_control_setpoint.h | 2 | ||||
| -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, 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 0d1f62271..727be9492 100644 --- a/src/modules/uORB/topics/manual_control_setpoint.h +++ b/src/modules/uORB/topics/manual_control_setpoint.h @@ -78,7 +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; /**< 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 posctrl_switch; /**< posctrl 2 position switch (optional): altctrl, posctrl */ 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 7e00c5cbc..9285235c9 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, - POSHOLD = 6, + POSCTRL = 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 8719505f4..f401140ae 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_ALTHOLD, - MAIN_STATE_POSHOLD, + MAIN_STATE_ALTCTRL, + MAIN_STATE_POSCTRL, MAIN_STATE_AUTO, MAIN_STATE_MAX } main_state_t; |