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

nrf52: 使NRF_SDK和QMK保持独立 #17

Conversation

striveFar
Copy link

本次更改点:在nrf平台相关代码头文件被包含前取消qmk中已有且被包含的宏定义,解决编译问题的同时,解耦QMK和NRF_SDK

@github-actions github-actions bot added the core label Sep 15, 2022
@Huckies
Copy link

Huckies commented Sep 20, 2022

推荐采用

#ifdef MIN
#undef MIN
#endif

这样的形式,避免后期导致奇怪的编译问题。

@github-actions
Copy link

github-actions bot commented Nov 4, 2022

Thank you for your contribution!
This pull request has been automatically marked as stale because it has not had activity in the last 45 days. It will be closed in 30 days if no further activity occurs. Please feel free to give a status update now, or re-open when it's ready.
For maintainers: Please label with bug, awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

@github-actions github-actions bot added the stale label Nov 4, 2022
@jiaxin96 jiaxin96 merged commit fbce2a6 into Oh-My-Mechanical-Keyboard:nrf52_protocal Nov 18, 2022
jiaxin96 pushed a commit that referenced this pull request Nov 19, 2022
* bastardkb: cleanup blackpill configuration

Fixes #17

* bastardkb: fix splinky configuration

The pinout of the splinky changed between the last beta batch, and the
production one. This commit updates the keyboard definition to support
the new pinout by default, while offering backward compatibility.

Define `SPLINKY_BETA_PINOUT` to build the firmware with pre-production
pinout.

Fixes #15

* bastardkb: add support for STeMCell

* Update scylla/tbkmini/skeletyl outdated readmes

* bastardkb/dilemma: enable circular scroll

* bastardkb/dilemma: add initial version of the `via` keymap

* bastardkb/dilemma/assembled: add new keyboard

Fixes #20

* bastardkb/dilemma: remove elite-c

* Initial support for the Dilemma 3x5+3 Assembled RGB

* Address code review comments

* Address more comments

* Address review comments

* Address more nits

* bastardkb: split splinky-based keyboards to distinguish between Splinky v2 and v3 pinout
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants