From 54d8e245c01c70a6ea99816e536ea2dac3da2f9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Fri, 24 Mar 2017 08:44:06 +0100 Subject: [PATCH] mavlink_mission: fix dm_read check ... and init to 0 is not needed, since already done in constructor --- src/modules/mavlink/mavlink_mission.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/modules/mavlink/mavlink_mission.cpp b/src/modules/mavlink/mavlink_mission.cpp index 86c42c9400..1cb431e600 100644 --- a/src/modules/mavlink/mavlink_mission.cpp +++ b/src/modules/mavlink/mavlink_mission.cpp @@ -110,23 +110,15 @@ MavlinkMissionManager::init_offboard_mission() if (!_dataman_init) { _dataman_init = true; - int ret = dm_read(DM_KEY_MISSION_STATE, 0, &mission_state, sizeof(mission_s)) == sizeof(mission_s); + int ret = dm_read(DM_KEY_MISSION_STATE, 0, &mission_state, sizeof(mission_s)); if (ret > 0) { _dataman_id = mission_state.dataman_id; _count[(uint8_t)MAV_MISSION_TYPE_MISSION] = mission_state.count; _current_seq = mission_state.current_seq; - } else if (ret == 0) { - _dataman_id = 0; - _count = 0; - _current_seq = 0; - - } else { - PX4_WARN("offboard mission init failed"); - _dataman_id = 0; - _count = 0; - _current_seq = 0; + } else if (ret < 0) { + PX4_ERR("offboard mission init failed (%i)", errno); } load_geofence_stats();