fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-16 10:03:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

ALTCTRL/POSCTRL renamed to ALTCTL/POSCTL

Browse Source
This commit is contained in:
Anton Babushkin
2014-05-11 13:35:05 +02:00
parent 808badb34d
commit 88b18bbad1
10 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/uORB/topics/manual_control_setpoint.h
+2 -2
View File
@@ -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 */
src/modules/uORB/topics/vehicle_status.h
+2 -2
View File
@@ -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;