dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

main state auto mission don't require valid mission

This commit is contained in:
Daniel Agar 2017-04-17 12:50:04 -04:00
parent 6f89e9d551
commit 1913b970d7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/commander/commander_tests/state_machine_helper_test.cpp
View File

@ -298,7 +298,7 @@ bool StateMachineHelperTest::armingStateTransitionTest()
&status_flags,
5.0f, /* avionics rail voltage */
check_gps,
true, /* can arm without valid mission */
false, /* valid mission not required*/
2e6 /* 2 seconds after boot, everything should be checked */
);

4
src/modules/commander/state_machine_helper.cpp
View File

@ -415,9 +415,9 @@ main_state_transition(struct vehicle_status_s *status, main_state_t new_main_sta
case commander_state_s::MAIN_STATE_AUTO_MISSION:
/* need global position, home position, and a valid mission */
// TODO: require mission? condition_auto_mission_available
if (status_flags->condition_global_position_valid &&
status_flags->condition_home_position_valid &&
status_flags->condition_auto_mission_available) {
status_flags->condition_home_position_valid) {
ret = TRANSITION_CHANGED;
}