From 6fc825622c05d9947a78d554faad897447f4190a Mon Sep 17 00:00:00 2001 From: Eugene Date: Tue, 28 May 2019 16:32:27 +0800 Subject: [PATCH] [NFC] Port to SDK15.3 --- platform/MCU/nRF52840/inc/sdk_config_system.h | 5 ++++- third_party/nrf5_sdk/build.mk | 3 ++- third_party/nrf5_sdk/include.mk | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/platform/MCU/nRF52840/inc/sdk_config_system.h b/platform/MCU/nRF52840/inc/sdk_config_system.h index e5595668d9..5bda614346 100644 --- a/platform/MCU/nRF52840/inc/sdk_config_system.h +++ b/platform/MCU/nRF52840/inc/sdk_config_system.h @@ -122,7 +122,7 @@ #define NRFX_SPIS3_ENABLED 0 #define NRFX_TIMER2_ENABLED 1 -#define NRFX_TIMER4_ENABLED 0 +#define NRFX_TIMER4_ENABLED 1 #define USBD_ENABLED 1 #define USBD_CONFIG_IRQ_PRIORITY APP_IRQ_PRIORITY_LOW @@ -164,3 +164,6 @@ #define NFC_NDEF_MSG_TAG_TYPE 2 #define NFCT_CONFIG_IRQ_PRIORITY 7 #define HAL_NFC_NRF52840_ENGINEERING_ABC_WORKAROUND 1 +#define NRFX_NFCT_ENABLED 1 +#define NFC_PLATFORM_ENABLED 1 +#define NFC_PLATFORM_LOG_ENABLED 0 diff --git a/third_party/nrf5_sdk/build.mk b/third_party/nrf5_sdk/build.mk index 0dca08785f..5e34fd6192 100644 --- a/third_party/nrf5_sdk/build.mk +++ b/third_party/nrf5_sdk/build.mk @@ -70,7 +70,8 @@ CSRC += \ $(call target_files,$(TARGET_NRF5_SDK_NFC_SRC_PATH)/ndef/launchapp/,*.c) \ $(call target_files,$(TARGET_NRF5_SDK_NFC_SRC_PATH)/ndef/text/,*.c) \ $(call target_files,$(TARGET_NRF5_SDK_NFC_SRC_PATH)/ndef/uri/,*.c) \ - $(TARGET_NRF5_SDK_NFC_SRC_PATH)/t2t_lib/hal_t2t/hal_nfc_t2t.c + $(call target_files,$(TARGET_NRF5_SDK_NFC_SRC_PATH)/platform/,*.c) \ + $(TARGET_NRF5_SDK_NRFX_SRC_PATH)/drivers/src/nrfx_nfct.c # USBD CSRC += \ diff --git a/third_party/nrf5_sdk/include.mk b/third_party/nrf5_sdk/include.mk index 0c3bc3a015..31ef4749aa 100644 --- a/third_party/nrf5_sdk/include.mk +++ b/third_party/nrf5_sdk/include.mk @@ -81,7 +81,7 @@ INCLUDE_DIRS += \ # NFC INCLUDE_DIRS += \ $(TARGET_NRF5_SDK_NFC_PATH)/t2t_lib \ - $(TARGET_NRF5_SDK_NFC_PATH)/t2t_lib/hal_t2t \ + $(TARGET_NRF5_SDK_NFC_PATH)/platform \ $(TARGET_NRF5_SDK_NFC_PATH)/ndef/generic/message \ $(TARGET_NRF5_SDK_NFC_PATH)/ndef/generic/record \ $(TARGET_NRF5_SDK_NFC_PATH)/ndef/lauchapp \