Merge upstream changes #135
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Feature/viz 2 1 5 support
Feature/bsk 2 2 0
Feature/bsk 2 2 1 beta
…l (+1 squashed commit)
Addition of pinholeCamera.rst file and illustrative image pinholeCamera.png Added release notes.
Addition of test_unitPinholeCamera.py
I needed a function to convert a Eigen::MatrixXi to a C array for the pixel argument in pinholeCamera.cpp for the LandmarkMsgPayload.h message I added a new feature in gravCoeffOps.py to extend reading capabilites of polyhedron shape models
Addition of an integrated example script to show how to use pinholeCamera module. It adds: scenarioSmallBodyLandmarks.py and eros007790.tab to generate landmarks distribution based on polyhedron shape. It modifies test_scenarioTest.py to run the integrated example script with pytest
I moved the new message definition commit to the pinhole camera commit with cpp/h files as that commit would not compile without that message definition. Thanks for contributing this code!
Feature/update conan dependencies
Previously, calling setRNGSeed(this->RNGSeed) in the constructor means that this->RNGSeed still had the default value and could not be set from Python
Previously, unlike what is written in the comment at line 126, the noise model was disabled if all three components of this->senNoiseStd are uninitialized. Now the code already disables the noise model if only one of the 3 components of this->senNoiseStd is uninitialized
…lization Magnetometer fix noise initialization
Make C-module instantiation the same as C++ instantiation #316
…awFlag Refactor/418 mrp feedback control law flag
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
git fetch upstreamwhile on origin/develop
git checkout -b feature/merge-upstream-changesgit merge upstream/developfix and mark as resolved any merge conflicts then
git merge --continuethen make PR against origin/develop with branch merge-upstream-changes
Verification
Test suit must run as expected (pass)
Documentation
None
Future work
None