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.

Sign up for GitHub

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

Jump to bottom

nrf52: 使用统一的nRF5_SDK_17.1.0_ddde560，仅对qmk部分做修改 #16

Closed
wants to merge 1 commit into from
Closed

nrf52: 使用统一的nRF5_SDK_17.1.0_ddde560，仅对qmk部分做修改 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions platforms/nrf52/platform.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@ PLATFORM_SRC += \
$(SDK_ROOT)/modules/nrfx/drivers/src/nrfx_power.c \
$(SDK_ROOT)/modules/nrfx/drivers/src/nrfx_gpiote.c \
$(SDK_ROOT)/modules/nrfx/drivers/src/prs/nrfx_prs.c \
$(SDK_ROOT)/modules/nrfx/drivers/src/nrfx_usbd.c

$(SDK_ROOT)/modules/nrfx/drivers/src/nrfx_usbd.c \
$(SDK_ROOT)/modules/nrfx/drivers/src/nrfx_power.c


# Include folders common to all targets
Expand Down Expand Up @@ -256,7 +256,6 @@ EXTRAINCDIRS += \
$(SDK_ROOT)/modules/nrfx/drivers/include



# nrf52 sdk config
NRF_APP_DEF += -DAPP_TIMER_V2
NRF_APP_DEF += -DAPP_TIMER_V2_RTC1_ENABLED
Expand Down
2 changes: 2 additions & 0 deletions quantum/action.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "host.h"
#include "keycode.h"
#include "keyboard.h"
#undef MIN
#undef MAX
#include "keymap.h"
#include "mousekey.h"
#include "programmable_button.h"
Expand Down
2 changes: 2 additions & 0 deletions quantum/keymap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "host.h"
// #include "print.h"
#include "debug.h"
#undef MAX
#undef MIN
#include "keycode_config.h"
#include "gpio.h" // for pin_t

Expand Down
2 changes: 2 additions & 0 deletions quantum/led.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
#include "led.h"
#include "host.h"
#include "debug.h"
#undef MIN
#undef MAX
#include "gpio.h"

#ifdef BACKLIGHT_CAPS_LOCK
Expand Down
2 changes: 2 additions & 0 deletions quantum/matrix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdbool.h>
#include <string.h>
#include "util.h"
#undef MIN
#undef MAX
#include "matrix.h"
#include "debounce.h"
#include "quantum.h"
Expand Down
2 changes: 2 additions & 0 deletions tmk_core/protocol/host.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "host.h"
#include "util.h"
#include "debug.h"
#undef MIN
#undef MAX
#include "digitizer.h"

#ifdef NKRO_ENABLE
Expand Down