aboutsummaryrefslogtreecommitdiff
path: root/src/modules/commander/commander_tests
diff options
context:
space:
mode:
authorTickTock- <TjckTock@gmail.com>2014-04-28 21:47:45 -0700
committerTickTock- <TjckTock@gmail.com>2014-04-28 21:47:45 -0700
commit31089a290ba089b2b5cbcc76ed677e3f401ffa36 (patch)
treedfa7cc73cfa9b4d1b52f801aa05f66429c0ffa41 /src/modules/commander/commander_tests
parent269800b48c31d78fec900b4beaf3f655a8c18730 (diff)
downloadpx4-firmware-31089a290ba089b2b5cbcc76ed677e3f401ffa36.tar.gz
px4-firmware-31089a290ba089b2b5cbcc76ed677e3f401ffa36.tar.bz2
px4-firmware-31089a290ba089b2b5cbcc76ed677e3f401ffa36.zip
Replaces poshold/althold with posctrl/altctrl
Diffstat (limited to 'src/modules/commander/commander_tests')
-rw-r--r--src/modules/commander/commander_tests/state_machine_helper_test.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/modules/commander/commander_tests/state_machine_helper_test.cpp b/src/modules/commander/commander_tests/state_machine_helper_test.cpp
index b440e561b..18586053b 100644
--- a/src/modules/commander/commander_tests/state_machine_helper_test.cpp
+++ b/src/modules/commander/commander_tests/state_machine_helper_test.cpp
@@ -317,34 +317,34 @@ bool StateMachineHelperTest::mainStateTransitionTest(void)
TRANSITION_CHANGED == main_state_transition(&current_state, new_main_state));
ut_assert("new state: manual", MAIN_STATE_MANUAL == current_state.main_state);
- // MANUAL to ALTHOLD.
+ // MANUAL to ALTCTRL.
current_state.main_state = MAIN_STATE_MANUAL;
current_state.condition_local_altitude_valid = true;
- new_main_state = MAIN_STATE_ALTHOLD;
- ut_assert("tranisition: manual to althold",
+ new_main_state = MAIN_STATE_ALTCTRL;
+ ut_assert("tranisition: manual to altctrl",
TRANSITION_CHANGED == main_state_transition(&current_state, new_main_state));
- ut_assert("new state: althold", MAIN_STATE_ALTHOLD == current_state.main_state);
+ ut_assert("new state: altctrl", MAIN_STATE_ALTCTRL == current_state.main_state);
- // MANUAL to ALTHOLD, invalid local altitude.
+ // MANUAL to ALTCTRL, invalid local altitude.
current_state.main_state = MAIN_STATE_MANUAL;
current_state.condition_local_altitude_valid = false;
- new_main_state = MAIN_STATE_ALTHOLD;
+ new_main_state = MAIN_STATE_ALTCTRL;
ut_assert("no transition: invalid local altitude",
TRANSITION_DENIED == main_state_transition(&current_state, new_main_state));
ut_assert("current state: manual", MAIN_STATE_MANUAL == current_state.main_state);
- // MANUAL to POSHOLD.
+ // MANUAL to POSCTRL.
current_state.main_state = MAIN_STATE_MANUAL;
current_state.condition_local_position_valid = true;
- new_main_state = MAIN_STATE_POSHOLD;
- ut_assert("transition: manual to poshold",
+ new_main_state = MAIN_STATE_POSCTRL;
+ ut_assert("transition: manual to posctrl",
TRANSITION_CHANGED == main_state_transition(&current_state, new_main_state));
- ut_assert("current state: poshold", MAIN_STATE_POSHOLD == current_state.main_state);
+ ut_assert("current state: posctrl", MAIN_STATE_POSCTRL == current_state.main_state);
- // MANUAL to POSHOLD, invalid local position.
+ // MANUAL to POSCTRL, invalid local position.
current_state.main_state = MAIN_STATE_MANUAL;
current_state.condition_local_position_valid = false;
- new_main_state = MAIN_STATE_POSHOLD;
+ new_main_state = MAIN_STATE_POSCTRL;
ut_assert("no transition: invalid position",
TRANSITION_DENIED == main_state_transition(&current_state, new_main_state));
ut_assert("current state: manual", MAIN_STATE_MANUAL == current_state.main_state);