updating targets and enable EKF3 (TAKE 2) #241
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
# Conflicts: # libraries/AP_RCProtocol/AP_RCProtocol_FPort2.cpp
# Conflicts: # libraries/AP_PiccoloCAN/AP_PiccoloCAN.cpp # Conflicts: # libraries/AP_PiccoloCAN/AP_PiccoloCAN.cpp # libraries/AP_PiccoloCAN/AP_PiccoloCAN.h # libraries/AP_PiccoloCAN/piccolo_protocol/license.txt
|
Damn, this doesnt look great either. Tell me which should be the base branch on this repo please, I was using master_custom_light |
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.
This is what I've provided on the group as 11.1e.
Basically the 11.1 code with the wide-OSD-bars and a few more or updated targets.
I've rebased master_custom and merged to that on my fork. Seems that master_custom_light isnt used the way I did.