Checkpoint: More state machine fixes, commited to wrong branch and now copied over

This commit is contained in:
Julian Oes
2013-03-11 10:39:57 -07:00
parent f0d8ce009e
commit 0fe5aeb02c
7 changed files with 86 additions and 43 deletions
+6 -4
View File
@@ -230,10 +230,12 @@ get_mavlink_mode_and_state(uint8_t *mavlink_state, uint8_t *mavlink_mode)
*mavlink_mode |= MAV_MODE_FLAG_MANUAL_INPUT_ENABLED;
}
// if (v_status.system_state == NAVIGATION_STATE_SEATBELT) {
//
// *mavlink_mode |= MAV_MODE_FLAG_DECODE_POSITION_GUIDED;
// }
if (v_status.navigation_state == NAVIGATION_STATE_SEATBELT
|| v_status.navigation_state == NAVIGATION_STATE_SEATBELT_DESCENT
|| v_status.navigation_state == NAVIGATION_STATE_SEATBELT_STANDBY) {
*mavlink_mode |= MAV_MODE_FLAG_GUIDED_ENABLED;
}
//
// if (v_status.system_state == NAVIGATION_STATE_SEATBELT) {
//