Browse Source

Merge pull request #2983 from DonLakeFlyer/DoJumpFix

DO_JUMP fix
QGC4.4
Don Gagne 9 years ago
parent
commit
687468cf52
  1. 2
      src/MissionEditor/MissionEditor.qml
  2. 2
      src/MissionManager/MissionManager.cc

2
src/MissionEditor/MissionEditor.qml

@ -101,7 +101,7 @@ QGCView {
if (ScreenTools.isMobile) { if (ScreenTools.isMobile) {
_root.showDialog(mobileFileSaver, "Save Mission File", _root.showDialogDefaultWidth, StandardButton.Save | StandardButton.Cancel) _root.showDialog(mobileFileSaver, "Save Mission File", _root.showDialogDefaultWidth, StandardButton.Save | StandardButton.Cancel)
} else { } else {
controller.saveMissionToFile() controller.saveMissionToFilePicker()
} }
} }

2
src/MissionManager/MissionManager.cc

@ -300,7 +300,7 @@ void MissionManager::_handleMissionItem(const mavlink_message_t& message)
missionItem.current, missionItem.current,
this); this);
if (item->command() == MAV_CMD_DO_JUMP) { if (item->command() == MAV_CMD_DO_JUMP && !_vehicle->firmwarePlugin()->sendHomePositionToVehicle()) {
// Home is in position 0 // Home is in position 0
item->setParam1((int)item->param1() + 1); item->setParam1((int)item->param1() + 1);
} }

Loading…
Cancel
Save