Skip to content

Commit

Permalink
Merge pull request mavlink#6963 from DonLakeFlyer/ParamMultiComp
Browse files Browse the repository at this point in the history
Fix multi-component parameter loading
  • Loading branch information
DonLakeFlyer authored Oct 29, 2018
2 parents 44fb64f + f8e005f commit c539651
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
10 changes: 5 additions & 5 deletions src/FactSystem/ParameterManager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c539651

Please sign in to comment.