Skip to content
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

Adding Bastyl shield #604

Closed
wants to merge 8 commits into from
Closed

Adding Bastyl shield #604

wants to merge 8 commits into from

Conversation

mseflek
Copy link

@mseflek mseflek commented Jan 11, 2021

Adding shield for split keyboard Bastyl.

Tested on my Bastyl with a pair of nice!nano MCUs.

@mseflek
Copy link
Author

mseflek commented Jan 11, 2021

Just noticed I forgot to update the commented out part of the keymap to reflect the layout. please hold-off on merging until I fix that. EDIT: Fixed!

@Nicell Nicell self-requested a review January 11, 2021 19:48
@Nicell Nicell self-assigned this Jan 11, 2021
@innovaker innovaker added enhancement New feature or request shields PRs and issues related to shields labels Jan 15, 2021
Copy link
Member

@Nicell Nicell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for adding this shield @mseflek! There seems to be a duplicate of each file that has "-checkpoint" in it. Any idea what's up with that? On first glance the "-checkpoint" files look pretty good (minus the naming of course).

@mseflek
Copy link
Author

mseflek commented Jan 30, 2021

Thanks for adding this shield @mseflek! There seems to be a duplicate of each file that has "-checkpoint" in it. Any idea what's up with that? On first glance the "-checkpoint" files look pretty good (minus the naming of course).

That was my bad -- I typically code for data science so my "IDE" is Jupyter lab. It auto-saves and creates checkpoint files, and I forgot to exclude them from my initial commit before. Thanks for catching. Should be fixed now.

@mseflek mseflek requested a review from Nicell January 30, 2021 20:36
@noeljee
Copy link

noeljee commented Feb 7, 2021

Just finished my Bastyl build. Can’t wait to get the shield up and running!

@petejohanson
Copy link
Contributor

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!

  1. Hardware Metadata
  2. Pro Micro shield DT naming changes
  3. Split changes for BLE advertising

Hardware Metadata

The Problem

When 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 build.yml file) required changes, often in the same spot, for every PR. This resulted in immediate merge conflicts for every other PR after one was merged, which is a headache for contributors.

The Fix

By 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 Steps

First, 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:

  1. If comfortable with git rebase, perform an interactive rebase and revert any changes to build.yml, hardware.md, or the setup scripts setup.sh/setup.ps1, and then add the new metadata YAML file. Then force push your branch. Or,
  2. Create a new branch from an up-to-date main, copy in the files for your new hardware, add the metadata file, then commit and push the new branch. Then, edit your open PR to point to your new branch.

Pro Micro shield DT naming changes

In #876, we have simplified the DT naming for the "nexus node" we expose for pro-micro compatible boards, deprecating the use of pro_micro_a, and renaming pro_micro_d node to simply pro_micro. For pro-micro boards and shields, you'll need to adjust your DT to use the proper names.

Please see https://zmk.dev/docs/development/new-shield#shield-overlays for the updated docs on this.

Split Shield Advertising Changes

In 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 Help

If you have any questions about any of these changes, please comment here and tag @zmkfirmware/boards-shields or ask in the #boards-shields Discord channel.

@Nicell
Copy link
Member

Nicell commented Jan 30, 2022

Hello! We're closing this PR due to there being no activity since the metadata update to ZMK in September of last year. If you are still interested in updating this PR, please let us know, and we can reopen it and review your changes (hopefully a lot faster this time)!

@Nicell Nicell closed this Jan 30, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request shields PRs and issues related to shields
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants