fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

mavlink_mission: fix dm_read check

Browse Source 
... and init to 0 is not needed, since already done in constructor
This commit is contained in:
Beat Küng 2017-03-24 08:44:06 +01:00 committed by Lorenz Meier
parent b9cddfb75b
commit 54d8e245c0
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/modules/mavlink/mavlink_mission.cpp
View File

@ -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();