Closed dbendele closed 3 years ago
@buckd, I want to prune this PR such that it only contains the files in the Encoding and Decoding folder/library. Is there an easy way to do this? Commits with other libraries are interleaved.
@buckd, I want to prune this PR such that it only contains the files in the Encoding and Decoding folder/library. Is there an easy way to do this? Commits with other libraries are interleaved.
If individual commits only touch Encoding/Decoding, you can cherry-pick them into a different branch and create a PR from there. If a commit contains changes to both the library you want to modify and another library, you'll have to find a way to separate them. That would also be cherry-picking but then removing changes from the other libraries so that branch only has updates you want, which is not really an "easy way". @rtzoeller, any other recommendations?
@buckd, I want to prune this PR such that it only contains the files in the Encoding and Decoding folder/library. Is there an easy way to do this? Commits with other libraries are interleaved.
If individual commits only touch Encoding/Decoding, you can cherry-pick them into a different branch and create a PR from there. If a commit contains changes to both the library you want to modify and another library, you'll have to find a way to separate them. That would also be cherry-picking but then removing changes from the other libraries so that branch only has updates you want, which is not really an "easy way". @rtzoeller, any other recommendations?
We identified that there were two new PR's worth of changes in this branch, plus some changes from an old PR which was squash-merged, and then did roughly the following:
git rebase --onto
. git rebase -i ballard_arinc_429
while on this branch, and dropped, edited, and squashed commits. This included removing some files from commits which had disparate changes.Once you get the high level ideas down, git rebase -i
is pretty good at holding your hand through the process. We pushed the original branch before starting, to be confident we wouldn't lose work.
Bleep bloop!
LabVIEW Diff Robot here with some diffs served up hot for your pull request.
Notice something funny? Help fix me on my GitHub repo.
Bleep bloop!
LabVIEW Diff Robot here with some diffs served up hot for your pull request.
Notice something funny? Help fix me on my GitHub repo.
Bleep bloop!
LabVIEW Diff Robot here with some diffs served up hot for your pull request.
Notice something funny? Help fix me on my GitHub repo.
Notes to Reviewers: Encoding and Decoding.lvlib--BCD Decode Integer.vi added base to connector pane Encoding and Decoding.lvlib--BNR Decode Integer.vim added to encapsulate decoding to correct data type Encoding and Decoding.lvlib--BNR Encode Integer.vim added to encapsulate encoding logic for all datatypes Encoding and Decoding.lvlib--BNR Encode.vim uses new subVI BNR Encode Integer.vim Encoding and Decoding.lvlib--Get Bits Per Digit from Base.vim added subdiagram labels to clearly indicate base Encoding and Decoding.lvlib--Update Bit Field.vim added VI to provide high speed data path for discrete values Encoding and Decoding.lvlib--Write Parity.vim moved from Protocol class
Tests added for new discrete functionality and for parity write
- [ ] There is no real change in
BNR Decode.vim
. Please revert and then all looks good.
useful change: current index of input BNR encoded value changed from 26 to 0
What does this Pull Request accomplish?
Adds a faster code path to support discrete value updates.
Why should this Pull Request be merged?
Discrete-value updates were identified as a high-channel, high-performance use case identified during the last Avionics Custom Device meeting.
What testing has been done?
New tests added for discrete and parity functionality moved into this library. Automated functional tests pass.