Browse Source

Merge pull request #6963 from DonLakeFlyer/ParamMultiComp

Fix multi-component parameter loading
QGC4.4
Don Gagne 7 years ago committed by GitHub
parent
commit
c5396510ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      ChangeLog.md
  2. 10
      src/FactSystem/ParameterManager.cc

1
ChangeLog.md

@ -9,6 +9,7 @@ Note: This file only contains high level features or important fixes. @@ -9,6 +9,7 @@ Note: This file only contains high level features or important fixes.
* Orbit: Turn off for PX4 since still not supported
* Structure Scan: Fix loading of structure scan height
* ArduPilot: Fix location of planned home position when not connected to vehicle. Issue #6840.
* Fix loading of parameters from multiple components. Would report download complete too early, thus missing all default component params.
### 3.4.4 - Stable
* Stable desktop versions now inform user at boot if newer version is available.

10
src/FactSystem/ParameterManager.cc

@ -347,12 +347,12 @@ void ParameterManager::_parameterUpdate(int vehicleId, int componentId, QString @@ -347,12 +347,12 @@ void ParameterManager::_parameterUpdate(int vehicleId, int componentId, QString
// Add meta data to default component. We need to do this before we setup the group map since group
// map requires meta data.
_addMetaDataToDefaultComponent();
}
// When we are getting the very last component param index, reset the group maps to update for the
// new params. By handling this here, we can pick up components which finish up later than the default
// component param set.
_setupCategoryMap();
// When we are getting the very last component param index, reset the group maps to update for the
// new params. By handling this here, we can pick up components which finish up later than the default
// component param set.
_setupCategoryMap();
}
}
// Update param cache. The param cache is only used on PX4 Firmware since ArduPilot and Solo have volatile params

Loading…
Cancel
Save