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

Shield and board definitions for M60 #233

Merged
merged 4 commits into from Oct 5, 2020

Conversation

megamind4089
Copy link
Contributor

@megamind4089 megamind4089 commented Oct 2, 2020

Added board and shield definition for M60 keyboard and makerdiary nrf52840 m.2 module

Tested all keys and working fine

https://imgur.com/a/Ry9HgvA

@megamind4089 megamind4089 changed the title Shield and board for M60 Shield and board definitions for M60 Oct 2, 2020
Copy link
Contributor

@petejohanson petejohanson 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 the PR! A few thoughts/comments, and a few fixes needed.

app/boards/arm/nrf52840_m2/CMakeLists.txt Show resolved Hide resolved
app/boards/arm/nrf52840_m2/Kconfig Show resolved Hide resolved
app/boards/arm/nrf52840_m2/Kconfig.board Outdated Show resolved Hide resolved
app/boards/arm/nrf52840_m2/board.cmake Show resolved Hide resolved
app/boards/arm/nrf52840_m2/board.cmake Outdated Show resolved Hide resolved
app/boards/shields/m60/Kconfig.defconfig Outdated Show resolved Hide resolved
app/boards/shields/m60/m60.keymap Show resolved Hide resolved
app/boards/shields/m60/m60.keymap Show resolved Hide resolved
app/boards/shields/m60/m60.keymap Show resolved Hide resolved
@megamind4089 megamind4089 force-pushed the m60 branch 2 times, most recently from efbcfd5 to c80de7d Compare Oct 3, 2020
app/boards/shields/m60/m60.keymap Outdated Show resolved Hide resolved
@innovaker innovaker added board PRs and issues related to boards. shields PRs and issues related to shields labels Oct 3, 2020
Copy link
Contributor

@petejohanson petejohanson left a comment

Choose a reason for hiding this comment

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

One question/likely change for the keymap, and a few confirmations needed for the header tweaks. If those authors aren't readily available, I would suggest reverting just those couple changes, so we don't block merging this.

};


&flash0 {
Copy link
Contributor

Choose a reason for hiding this comment

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

I think I saw mention of additional flash on this? Not needed for the initial PR, but if it does have extra flash, we should get it defined at some point.

app/boards/shields/m60/m60.keymap Outdated Show resolved Hide resolved
app/boards/shields/romac/romac.keymap Show resolved Hide resolved
@megamind4089
Copy link
Contributor Author

Thanks @bmcgavin and @Na-Cly

@petejohanson Addressed the comments.

Copy link
Contributor

@petejohanson petejohanson left a comment

Choose a reason for hiding this comment

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

Looks great! Thanks for adding these.

@petejohanson petejohanson merged commit febf2f4 into zmkfirmware:main Oct 5, 2020
1 check passed
@megamind4089 megamind4089 deleted the m60 branch Oct 14, 2020
MangoIV pushed a commit to MangoIV/zmk that referenced this pull request Dec 18, 2020
Shield and board definitions for M60
tyalie pushed a commit to tyalie/zmk that referenced this pull request Nov 15, 2022
Shield and board definitions for M60
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
board PRs and issues related to boards. shields PRs and issues related to shields
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants