diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-05-11 13:35:05 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-05-11 13:35:05 +0200 |
| commit | 88b18bbad1be31cf31ff964c6cf6f3123948488d (patch) | |
| tree | 90e402ea54cc6c7d6d0cd35435fcef8f75a1904d /src/modules/uORB | |
| parent | 808badb34d3b88ad40aac60f817960c51cb499c5 (diff) | |
| download | px4-firmware-88b18bbad1be31cf31ff964c6cf6f3123948488d.tar.gz px4-firmware-88b18bbad1be31cf31ff964c6cf6f3123948488d.tar.bz2 px4-firmware-88b18bbad1be31cf31ff964c6cf6f3123948488d.zip | |
ALTCTRL/POSCTRL renamed to ALTCTL/POSCTL
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/vehicle_status.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 727be9492..ac394786d 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; /**< rturn to launch 2 position switch (mandatory): no effect, return */ - switch_pos_t posctrl_switch; /**< posctrl 2 position switch (optional): altctrl, posctrl */ + switch_pos_t return_switch; /**< rturn to launch 2 position switch (mandatory): normal, return */ + switch_pos_t posctl_switch; /**< posctrl 2 position switch (optional): altctl, posctl */ switch_pos_t loiter_switch; /**< mission 2 position switch (optional): mission, loiter */ }; /**< manual control inputs */ diff --git a/src/modules/uORB/topics/vehicle_status.h b/src/modules/uORB/topics/vehicle_status.h index f401140ae..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_ALTCTRL, - MAIN_STATE_POSCTRL, + MAIN_STATE_ALTCTL, + MAIN_STATE_POSCTL, MAIN_STATE_AUTO, MAIN_STATE_MAX } main_state_t; |