renamed EASY to POSHOLD and SEATBELT to ALTHOLD

This commit is contained in:
TickTock-
2014-04-27 14:06:00 -07:00
parent 6a7b104c2b
commit 269800b48c
15 changed files with 96 additions and 96 deletions
@@ -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 */
+1 -1
View File
@@ -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,
+2 -2
View File
@@ -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;