From 29e9936d321a8d7b1728dec0e79ac34f94e80ee5 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Sun, 11 Jun 2017 13:54:38 -0700 Subject: [PATCH 1/2] Fix incorrect fact usage for grid entry location --- src/MissionManager/SurveyMissionItem.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MissionManager/SurveyMissionItem.cc b/src/MissionManager/SurveyMissionItem.cc index f79836f..979d6fa 100644 --- a/src/MissionManager/SurveyMissionItem.cc +++ b/src/MissionManager/SurveyMissionItem.cc @@ -224,7 +224,7 @@ void SurveyMissionItem::save(QJsonArray& missionItems) gridObject[_jsonGridAltitudeRelativeKey] = _gridAltitudeRelativeFact.rawValue().toBool(); gridObject[_jsonGridAngleKey] = _gridAngleFact.rawValue().toDouble(); gridObject[_jsonGridSpacingKey] = _gridSpacingFact.rawValue().toDouble(); - gridObject[_jsonGridEntryLocationKey] = _gridSpacingFact.rawValue().toDouble(); + gridObject[_jsonGridEntryLocationKey] = _gridEntryLocationFact.rawValue().toDouble(); gridObject[_jsonTurnaroundDistKey] = _turnaroundDistFact.rawValue().toDouble(); saveObject[_jsonGridObjectKey] = gridObject; From 761fe881337da8dcb1513bec7cf1a861353d65ad Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Sun, 11 Jun 2017 13:54:54 -0700 Subject: [PATCH 2/2] Add DO_CHANGE_SPEED to resume rebuild command list --- src/MissionManager/MissionManager.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/MissionManager/MissionManager.cc b/src/MissionManager/MissionManager.cc index 600bae0..11266ee 100644 --- a/src/MissionManager/MissionManager.cc +++ b/src/MissionManager/MissionManager.cc @@ -1003,7 +1003,8 @@ void MissionManager::generateResumeMission(int resumeIndex) << MAV_CMD_IMAGE_START_CAPTURE << MAV_CMD_IMAGE_STOP_CAPTURE << MAV_CMD_VIDEO_START_CAPTURE - << MAV_CMD_VIDEO_STOP_CAPTURE; + << MAV_CMD_VIDEO_STOP_CAPTURE + << MAV_CMD_DO_CHANGE_SPEED; if (_vehicle->fixedWing() && _vehicle->px4Firmware()) { includedResumeCommands << MAV_CMD_NAV_TAKEOFF; }