Browse Source

Merge pull request #5012 from DonLakeFlyer/SomeFixes

Some fixes
QGC4.4
Don Gagne 8 years ago committed by GitHub
parent
commit
6677c9b2a2
  1. 2
      src/FactSystem/ParameterManager.cc
  2. 4
      src/FlightDisplay/FlightDisplayView.qml

2
src/FactSystem/ParameterManager.cc

@ -110,7 +110,7 @@ void ParameterManager::_parameterUpdate(int vehicleId, int componentId, QString @@ -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;
}

4
src/FlightDisplay/FlightDisplayView.qml

@ -333,6 +333,8 @@ QGCView { @@ -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 { @@ -514,7 +516,7 @@ QGCView {
z: _flightVideoPipControl.z + 1
onShowStartMissionChanged: {
if (showStartMission) {
if (showStartMission && !showResumeMission) {
confirmAction(actionStartMission)
}
}

Loading…
Cancel
Save