diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2013-08-27 23:08:00 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2013-08-27 23:08:00 +0200 |
| commit | 66c61fbe96e11ee7099431a8370d84f862543810 (patch) | |
| tree | 69c8bdaa273cea3b47b432a922f44d5c5338a27f /src/modules/mavlink/mavlink.c | |
| parent | 864c1d048c6d9390d6bdf5a8058d48df9d36e973 (diff) | |
| download | px4-firmware-66c61fbe96e11ee7099431a8370d84f862543810.tar.gz px4-firmware-66c61fbe96e11ee7099431a8370d84f862543810.tar.bz2 px4-firmware-66c61fbe96e11ee7099431a8370d84f862543810.zip | |
Full failsafe rewrite.
Diffstat (limited to 'src/modules/mavlink/mavlink.c')
| -rw-r--r-- | src/modules/mavlink/mavlink.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/modules/mavlink/mavlink.c b/src/modules/mavlink/mavlink.c index 0a506b1a9..d7b0fa9c7 100644 --- a/src/modules/mavlink/mavlink.c +++ b/src/modules/mavlink/mavlink.c @@ -240,11 +240,7 @@ get_mavlink_mode_and_state(uint8_t *mavlink_state, uint8_t *mavlink_base_mode, u **/ /* set calibration state */ - if (v_status.preflight_calibration) { - *mavlink_state = MAV_STATE_CALIBRATING; - } else if (v_status.system_emergency) { - *mavlink_state = MAV_STATE_EMERGENCY; - } else if (v_status.arming_state == ARMING_STATE_INIT + if (v_status.arming_state == ARMING_STATE_INIT || v_status.arming_state == ARMING_STATE_IN_AIR_RESTORE || v_status.arming_state == ARMING_STATE_STANDBY_ERROR) { // TODO review *mavlink_state = MAV_STATE_UNINIT; |