fix: restore git authorship for community contributors (PR #87, #90, #99)#106
Open
zknpr wants to merge 4 commits intoepsilonrt:devfrom
Open
fix: restore git authorship for community contributors (PR #87, #90, #99)#106zknpr wants to merge 4 commits intoepsilonrt:devfrom
zknpr wants to merge 4 commits intoepsilonrt:devfrom
Conversation
…ibution Remove the implementations of: - modbus_set_slave() return value checking (originally PR epsilonrt#87 by @r00t-) - -x hex address option (originally PR epsilonrt#90 by @ciakval) - -Q/-X quirks options (originally PR epsilonrt#99 by @JesseRiemens) These features will be re-added in subsequent commits with proper git authorship attributed to their original contributors.
libmodbus considers some slave addresses invalid. It will report an error, but mbpoll previously ignored this, leading to a crash with an assertion failure. Adds return value checking to all three modbus_set_slave() call sites (write path, read path, and report slave ID). The read path also adds a modbus_get_slave() cache check to avoid redundant calls. Originally contributed in PR epsilonrt#87; adapted to the current codebase.
Add -x command-line option to print register/coil addresses in hexadecimal format (0x%04X) instead of decimal. Useful for debugging devices with hex-addressed register maps. Originally contributed in PR epsilonrt#90; adapted to the current codebase. Signed-off-by: Jan Remes <jan.remes@mycroftmind.com>
Add support for MAX_SLAVE (-Q) and REPLY_TO_BROADCAST (-X) quirks: - -Q: Accept slave addresses 0-255 (bypasses libmodbus default limit) - -X: Force reply to broadcast address requests Requires libmodbus >= 3.1.7 for modbus_enable_quirks() API. Originally contributed in PR epsilonrt#99; adapted to the current codebase.
zknpr
force-pushed
the
fix/attribution-community-prs
branch
from
d0d4319 to
7643aa9
Compare
|
it's an improvement. 👍 |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Summary
PR #100 reimplemented functionality from three community PRs instead of cherry-picking the original commits, which meant the original authors lost git authorship credit. This PR fixes that by re-attributing each feature to its original contributor.
Attribution fixes
modbus_set_slave()return value-xhex address option-Q/-Xquirks optionsApproach
For each feature:
git commit --author="Original Author <email>"so git properly records authorshipThe final tree is byte-identical to
dev— verified withgit diff devproducing empty output. No functional changes.Note to maintainer
Please use "Create a merge commit" or "Rebase and merge" (not "Squash and merge") so that the individual author attributions are preserved in the git history.
Apology
I should have cherry-picked the original commits instead of reimplementing them. This PR corrects the git history to ensure these contributors receive proper credit for their work. My apologies to @r00t-, @ciakval, and @JesseRiemens.