From e06cbb76b1b578bdeed32c17c9aaf05221a896d5 Mon Sep 17 00:00:00 2001
From: DonLakeFlyer <don@thegagnes.com>
Date: Tue, 18 Apr 2017 16:22:22 -0700
Subject: [PATCH 1/2] Resume mission takes precedence over Start mission
---
src/FlightDisplay/FlightDisplayView.qml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml
index c17b746..697a18c 100644
--- a/src/FlightDisplay/FlightDisplayView.qml
+++ b/src/FlightDisplay/FlightDisplayView.qml
@@ -333,6 +333,8 @@ QGCView {
anchors.left: parent.left
anchors.right: altitudeSlider.visible ? altitudeSlider.left : parent.right
anchors.bottom: parent.bottom
+
+ property var qgcView: root
}
// Button to start/stop video recording
@@ -514,7 +516,7 @@ QGCView {
z: _flightVideoPipControl.z + 1
onShowStartMissionChanged: {
- if (showStartMission) {
+ if (showStartMission && !showResumeMission) {
confirmAction(actionStartMission)
}
}
From bcffae2b130139219d615899ac9249c585bd2d42 Mon Sep 17 00:00:00 2001
From: DonLakeFlyer <don@thegagnes.com>
Date: Tue, 18 Apr 2017 16:22:38 -0700
Subject: [PATCH 2/2] Fix broken hash check with param load
---
src/FactSystem/ParameterManager.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/FactSystem/ParameterManager.cc b/src/FactSystem/ParameterManager.cc
index 09ff415..2546f6b 100644
--- a/src/FactSystem/ParameterManager.cc
+++ b/src/FactSystem/ParameterManager.cc
@@ -110,7 +110,7 @@ void ParameterManager::_parameterUpdate(int vehicleId, int componentId, QString
// ArduPilot has this strange behavior of streaming parameters that we didn't ask for. This even happens before it responds to the
// PARAM_REQUEST_LIST. We disregard any of this until the initial request is responded to.
- if (parameterId == 65535 && _initialRequestTimeoutTimer.isActive()) {
+ if (parameterId == 65535 && parameterName != "_HASH_CHECK" && _initialRequestTimeoutTimer.isActive()) {
qCDebug(ParameterManagerVerbose1Log) << "Disregarding unrequested param prior to intial list response" << parameterName;
return;
}