-
-
Notifications
You must be signed in to change notification settings - Fork 3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Rebound v4 - New shield support #546
Conversation
Sorry about the additional changes, which I should have done in draft. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have a couple small comments. Then if you could add this shield to docs/docs/hardware.md
, docs/static/setup.ps1
, and docs/static/setup.sh
, that'd be great.
Thanks for working on this!
Thanks for taking a look at this! I have committed your suggested revisions and made the additional changes to hardware.md, setup.ps1, and setup.sh. I noticed at line 94 of setup.sh, it has "Pick an keyboard" rather than "Pick a keyboard". Let me know if you want me to fix the typo and I can include it in this PR. |
@PippinW Thanks for getting these updates in quick. It seems the formatting of As for the typo, could you make a separate PR so it's simpler to track and get in? |
@PippinW looks like you're running into a failed prettier check. Could you run the prettier formatter on the docs folder and push the changes? |
@Nicell My bad! Noted on the separate PR for the typo - (I have also spotted that the recently added shield, BFO-9000 is numbered incorrectly on setup.sh. It is currently No.17 rather than No.20). |
@PippinW The mis-numbered item was fixed in the last shield that got merged I believe. I think |
@Nicell Thanks again - I think this is all sorted now! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good! Thanks.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for contribution @PippinW.
I'm not familiar with this keyboard so forgive my ignorance. The shield id is given as rebound4
, but I'm also seeing references to "Rebound", "Rebound v4", and "Rebound v4-3" across the files. It comes across as inconsistent to a naïve observer. Could there potentially be other versions of this shield such as "Rebound v5" or "Rebound v4-4"? Please help me to understand the bigger picture.
Otherwise, I only spotted very minor formatting tweaks.
@innovaker - thanks for checking this over. This Rebound shield PR is for v4.x (v4.0 and onwards uses a different matrix to previous iterations - it is currently at v4.9 and I have been informed that there are no plans for a v5.0 at present). I had intended to keep consistency by using rebound4 "where it mattered" (i.e. in the /app files), but I take your point and agree that standardised terminology across the PR is less likely to cause confusion to users. Next steps: Thanks |
@innovaker All sorted and rebased! - Thanks! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @PippinW!
You'll need to rebase again because a fix was committed recently that conflicts.
Thanks for explaining the versioning situation. I can see from a cursory look of the maker's website that there's not much information provided about what differentiates the versions:
https://store.montsinger.net/products/rebound
And it's only advertised as "Rebound" style 4.9.x
.
Because of this, it might actually be worth calling the shield directory "rebound" but the files inside "rebound4". @Nicell, want do you think? I don't think we've hit versioned shields yet so this is new ground.
Otherwise, please note that you've used:
Rebound 4.x
in thehardware.md
Rebound4
insetup.sh
'soptions
andshield_title
Rebound4
insetup.ps1
's$options
I don't know if you intended to have those matching.
Following a lengthy discussion about this, @PippinW please adopt this convention:
which also means its ids in the setup scripts would be I'm sorry for the trouble. This is the first shield we've encountered whose "variant" is simply a version instead of being clearly named or stated by the maker (e.g. the |
@innovaker No problem at all, and thanks for clarifying the naming convention. |
Thanks @PippinW! Somehow you've now got 92 changed files in this PR. Do you need someone to help you sort this out? |
@innovaker Sorry about the mess. I have now cleaned up shop (and unintentionally closed the PR by a force-push). |
f5db2f3
to
9d44e61
Compare
17c1c0e
to
9d44e61
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thinking for the user facing strings we should have a space rather than an underscore. Also a small BFO change needs to be reverted in setup.sh.
@Nicell - Thanks for the input and spotting that BFO problem. I have resolved as per your suggestions, rebased and squashed. |
65db21c
to
3f86ae0
Compare
7e57360
to
4f83fbe
Compare
@innovaker @Nicell, just a friendly nudge on this PR! - does it need any more work before merging? |
@PippinW Sorry about the huge delay here, for some reason our update message didn't get put on this PR, here's a copy of it: Thank you, contributor, for your patience with how long review and merge of boards/shields has taken! There are three recent refactors/changes to boards and shields that require some attention, and then we can finally get this PR merged!
Hardware MetadataThe ProblemWhen first developing the process around contributing new shields/boards to ZMK, we failed to recognize that several key files (setup scripts, documentation page of supported hardware, and GH Action The FixBy adding discrete metadata files that are located with the boards/shields in question, and using that metadata to generate setup scripts, website hardware list, etc., users can contributing new hardware descriptions without the need to change the same files that other contributors are changing. Next StepsFirst, refer to https://zmk.dev/docs/development/hardware-metadata-files to familiarize yourself with the new metadata file format. Next, you have two options for fixing up your PR:
Pro Micro shield DT naming changesIn #876, we have simplified the DT naming for the "nexus node" we expose for pro-micro compatible boards, deprecating the use of Please see https://zmk.dev/docs/development/new-shield#shield-overlays for the updated docs on this. Split Shield Advertising ChangesIn addition, if this is a split PR, please see #658 where we have changed our conventions to remove the the name from the right sides, to prevent users attempting to pair with them and causing split sync issues. This also includes removing the " Left" suffix from the naming on the left side. See the changes in that PR for examples of what to change with your split shield. Getting HelpIf you have any questions about any of these changes, please comment here and tag @zmkfirmware/boards-shields or ask in the |
@PippinW I'll be closing this PR as we haven't heard anything in 6 months. Please feel free to reopen this if you ever come back to it. |
Adds support for a new unibody shield: Rebound 4-3. Default keymap includes 1u thumb clusters on the left "half" and 2u thumb key on the right "half" to provide examples of each layout option.
Testing has been undertaken over USB and BLE using my own rebound 4-3 with n!n and encoder. No issues with build or in use.