From 56815eb6f77ba48d5970133e3a27fbac37c1efd6 Mon Sep 17 00:00:00 2001 From: supperthomas <78900636@qq.com> Date: Sat, 19 Jun 2021 21:12:27 +0800 Subject: [bsp/nrf5x] fix the config --- bsp/nrf5x/nrf52840/.config | 138 ++++++++++++++++++++++++++++++++++++------ bsp/nrf5x/nrf52840/rtconfig.h | 20 +++++- 2 files changed, 139 insertions(+), 19 deletions(-) (limited to 'bsp/nrf5x') diff --git a/bsp/nrf5x/nrf52840/.config b/bsp/nrf5x/nrf52840/.config index 10441fdb08..ed83405af1 100644 --- a/bsp/nrf5x/nrf52840/.config +++ b/bsp/nrf5x/nrf52840/.config @@ -23,6 +23,12 @@ CONFIG_IDLE_THREAD_STACK_SIZE=256 CONFIG_RT_USING_TIMER_SOFT=y CONFIG_RT_TIMER_THREAD_PRIO=4 CONFIG_RT_TIMER_THREAD_STACK_SIZE=512 + +# +# kservice optimization +# +# CONFIG_RT_KSERVICE_USING_STDLIB is not set +# CONFIG_RT_KSERVICE_USING_TINY_SIZE is not set CONFIG_RT_DEBUG=y # CONFIG_RT_DEBUG_COLOR is not set # CONFIG_RT_DEBUG_INIT_CONFIG is not set @@ -54,6 +60,7 @@ CONFIG_RT_USING_MEMPOOL=y # CONFIG_RT_USING_NOHEAP is not set CONFIG_RT_USING_SMALL_MEM=y # CONFIG_RT_USING_SLAB is not set +# CONFIG_RT_USING_USERHEAP is not set # CONFIG_RT_USING_MEMTRACE is not set CONFIG_RT_USING_HEAP=y @@ -66,7 +73,7 @@ CONFIG_RT_USING_DEVICE=y CONFIG_RT_USING_CONSOLE=y CONFIG_RT_CONSOLEBUF_SIZE=128 CONFIG_RT_CONSOLE_DEVICE_NAME="uart0" -CONFIG_RT_VER_NUM=0x40003 +CONFIG_RT_VER_NUM=0x40004 # CONFIG_RT_USING_CPU_FFS is not set # CONFIG_ARCH_CPU_STACK_GROWS_UPWARD is not set @@ -149,9 +156,9 @@ CONFIG_RT_USING_PIN=y # # POSIX layer and C standard library # -CONFIG_RT_USING_LIBC=y +# CONFIG_RT_USING_LIBC is not set # CONFIG_RT_USING_PTHREADS is not set -# CONFIG_RT_USING_MODULE is not set +# CONFIG_RT_LIBC_USING_TIME is not set # # Network @@ -188,6 +195,12 @@ CONFIG_RT_USING_LIBC=y # CONFIG_RT_USING_RYM is not set # CONFIG_RT_USING_ULOG is not set # CONFIG_RT_USING_UTEST is not set +# CONFIG_RT_USING_RT_LINK is not set + +# +# RT-Thread Utestcases +# +# CONFIG_RT_USING_UTESTCASES is not set # # RT-Thread online packages @@ -256,8 +269,6 @@ CONFIG_RT_USING_LIBC=y # CONFIG_PKG_USING_LIBRWS is not set # CONFIG_PKG_USING_TCPSERVER is not set # CONFIG_PKG_USING_PROTOBUF_C is not set -# CONFIG_PKG_USING_ONNX_PARSER is not set -# CONFIG_PKG_USING_ONNX_BACKEND is not set # CONFIG_PKG_USING_DLT645 is not set # CONFIG_PKG_USING_QXWZ is not set # CONFIG_PKG_USING_SMTP_CLIENT is not set @@ -271,6 +282,13 @@ CONFIG_RT_USING_LIBC=y # CONFIG_PKG_USING_PDULIB is not set # CONFIG_PKG_USING_BTSTACK is not set # CONFIG_PKG_USING_LORAWAN_ED_STACK is not set +# CONFIG_PKG_USING_WAYZ_IOTKIT is not set +# CONFIG_PKG_USING_MAVLINK is not set +# CONFIG_PKG_USING_RAPIDJSON is not set +# CONFIG_PKG_USING_BSAL is not set +# CONFIG_PKG_USING_AGILE_MODBUS is not set +# CONFIG_PKG_USING_AGILE_FTP is not set +# CONFIG_PKG_USING_EMBEDDEDPROTO is not set # # security packages @@ -296,7 +314,13 @@ CONFIG_RT_USING_LIBC=y # CONFIG_PKG_USING_STEMWIN is not set # CONFIG_PKG_USING_WAVPLAYER is not set # CONFIG_PKG_USING_TJPGD is not set +# CONFIG_PKG_USING_PDFGEN is not set # CONFIG_PKG_USING_HELIX is not set +# CONFIG_PKG_USING_AZUREGUIX is not set +# CONFIG_PKG_USING_TOUCHGFX2RTT is not set +# CONFIG_PKG_USING_NUEMWIN is not set +# CONFIG_PKG_USING_MP3PLAYER is not set +# CONFIG_PKG_USING_TINYJPEG is not set # # tools packages @@ -305,12 +329,16 @@ CONFIG_RT_USING_LIBC=y # CONFIG_PKG_USING_EASYFLASH is not set # CONFIG_PKG_USING_EASYLOGGER is not set # CONFIG_PKG_USING_SYSTEMVIEW is not set +# CONFIG_PKG_USING_SEGGER_RTT is not set # CONFIG_PKG_USING_RDB is not set # CONFIG_PKG_USING_QRCODE is not set # CONFIG_PKG_USING_ULOG_EASYFLASH is not set +# CONFIG_PKG_USING_ULOG_FILE is not set +# CONFIG_PKG_USING_LOGMGR is not set # CONFIG_PKG_USING_ADBD is not set # CONFIG_PKG_USING_COREMARK is not set # CONFIG_PKG_USING_DHRYSTONE is not set +# CONFIG_PKG_USING_MEMORYPERF is not set # CONFIG_PKG_USING_NR_MICRO_SHELL is not set # CONFIG_PKG_USING_CHINESE_FONT_LIBRARY is not set # CONFIG_PKG_USING_LUNAR_CALENDAR is not set @@ -318,14 +346,48 @@ CONFIG_RT_USING_LIBC=y # CONFIG_PKG_USING_GPS_RMC is not set # CONFIG_PKG_USING_URLENCODE is not set # CONFIG_PKG_USING_UMCN is not set +# CONFIG_PKG_USING_LWRB2RTT is not set +# CONFIG_PKG_USING_CPU_USAGE is not set +# CONFIG_PKG_USING_GBK2UTF8 is not set +# CONFIG_PKG_USING_VCONSOLE is not set +# CONFIG_PKG_USING_KDB is not set +# CONFIG_PKG_USING_WAMR is not set +# CONFIG_PKG_USING_MICRO_XRCE_DDS_CLIENT is not set +# CONFIG_PKG_USING_LWLOG is not set +# CONFIG_PKG_USING_ANV_TRACE is not set +# CONFIG_PKG_USING_ANV_MEMLEAK is not set +# CONFIG_PKG_USING_ANV_TESTSUIT is not set +# CONFIG_PKG_USING_ANV_BENCH is not set +# CONFIG_PKG_USING_DEVMEM is not set +# CONFIG_PKG_USING_REGEX is not set +# CONFIG_PKG_USING_MEM_SANDBOX is not set +# CONFIG_PKG_USING_SOLAR_TERMS is not set +# CONFIG_PKG_USING_GAN_ZHI is not set # # system packages # + +# +# acceleration: Assembly language or algorithmic acceleration packages +# +# CONFIG_PKG_USING_RT_MEMCPY_CM is not set +# CONFIG_PKG_USING_QFPLIB_M0_FULL is not set +# CONFIG_PKG_USING_QFPLIB_M0_TINY is not set +# CONFIG_PKG_USING_QFPLIB_M3 is not set + +# +# Micrium: Micrium software products porting for RT-Thread +# +# CONFIG_PKG_USING_UCOSIII_WRAPPER is not set +# CONFIG_PKG_USING_UCOSII_WRAPPER is not set +# CONFIG_PKG_USING_UC_CRC is not set +# CONFIG_PKG_USING_UC_CLK is not set +# CONFIG_PKG_USING_UC_COMMON is not set +# CONFIG_PKG_USING_UC_MODBUS is not set # CONFIG_PKG_USING_GUIENGINE is not set # CONFIG_PKG_USING_CAIRO is not set # CONFIG_PKG_USING_PIXMAN is not set -# CONFIG_PKG_USING_LWEXT4 is not set # CONFIG_PKG_USING_PARTITION is not set # CONFIG_PKG_USING_FAL is not set # CONFIG_PKG_USING_FLASHDB is not set @@ -335,6 +397,9 @@ CONFIG_RT_USING_LIBC=y # CONFIG_PKG_USING_CMSIS is not set # CONFIG_PKG_USING_DFS_YAFFS is not set # CONFIG_PKG_USING_LITTLEFS is not set +# CONFIG_PKG_USING_DFS_JFFS2 is not set +# CONFIG_PKG_USING_DFS_UFFS is not set +# CONFIG_PKG_USING_LWEXT4 is not set # CONFIG_PKG_USING_THREAD_POOL is not set # CONFIG_PKG_USING_ROBOTS is not set # CONFIG_PKG_USING_EV is not set @@ -344,11 +409,12 @@ CONFIG_RT_USING_LIBC=y # CONFIG_PKG_USING_RAMDISK is not set # CONFIG_PKG_USING_MININI is not set # CONFIG_PKG_USING_QBOOT is not set -# CONFIG_PKG_USING_UCOSIII_WRAPPER is not set -# CONFIG_PKG_USING_UC_CRC is not set -# CONFIG_PKG_USING_UC_CLK is not set -# CONFIG_PKG_USING_UC_COMMON is not set # CONFIG_PKG_USING_PPOOL is not set +# CONFIG_PKG_USING_OPENAMP is not set +# CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE is not set +# CONFIG_PKG_USING_LPM is not set +# CONFIG_PKG_USING_TLSF is not set +# CONFIG_PKG_USING_EVENT_RECORDER is not set # # peripheral libraries and drivers @@ -357,6 +423,7 @@ CONFIG_RT_USING_LIBC=y # CONFIG_PKG_USING_REALTEK_AMEBA is not set # CONFIG_PKG_USING_SHT2X is not set # CONFIG_PKG_USING_SHT3X is not set +# CONFIG_PKG_USING_AS7341 is not set # CONFIG_PKG_USING_STM32_SDIO is not set # CONFIG_PKG_USING_ICM20608 is not set # CONFIG_PKG_USING_U8G2 is not set @@ -376,7 +443,6 @@ CONFIG_PKG_NRFX_VER="v2.1.0" # CONFIG_PKG_USING_WM_LIBRARIES is not set # CONFIG_PKG_USING_KENDRYTE_SDK is not set # CONFIG_PKG_USING_INFRARED is not set -# CONFIG_PKG_USING_ROSSERIAL is not set # CONFIG_PKG_USING_AGILE_BUTTON is not set # CONFIG_PKG_USING_AGILE_LED is not set # CONFIG_PKG_USING_AT24CXX is not set @@ -407,6 +473,35 @@ CONFIG_PKG_NRFX_VER="v2.1.0" # CONFIG_PKG_USING_WK2124 is not set # CONFIG_PKG_USING_LY68L6400 is not set # CONFIG_PKG_USING_DM9051 is not set +# CONFIG_PKG_USING_SSD1306 is not set +# CONFIG_PKG_USING_QKEY is not set +# CONFIG_PKG_USING_RS485 is not set +# CONFIG_PKG_USING_NES is not set +# CONFIG_PKG_USING_VIRTUAL_SENSOR is not set +# CONFIG_PKG_USING_VDEVICE is not set +# CONFIG_PKG_USING_SGM706 is not set +# CONFIG_PKG_USING_STM32WB55_SDK is not set +# CONFIG_PKG_USING_RDA58XX is not set +# CONFIG_PKG_USING_LIBNFC is not set +# CONFIG_PKG_USING_MFOC is not set +# CONFIG_PKG_USING_TMC51XX is not set +# CONFIG_PKG_USING_TCA9534 is not set +# CONFIG_PKG_USING_KOBUKI is not set +# CONFIG_PKG_USING_ROSSERIAL is not set +# CONFIG_PKG_USING_MICRO_ROS is not set + +# +# AI packages +# +# CONFIG_PKG_USING_LIBANN is not set +# CONFIG_PKG_USING_NNOM is not set +# CONFIG_PKG_USING_ONNX_BACKEND is not set +# CONFIG_PKG_USING_ONNX_PARSER is not set +# CONFIG_PKG_USING_TENSORFLOWLITEMICRO is not set +# CONFIG_PKG_USING_ELAPACK is not set +# CONFIG_PKG_USING_ULAPACK is not set +# CONFIG_PKG_USING_QUEST is not set +# CONFIG_PKG_USING_NAXOS is not set # # miscellaneous packages @@ -416,10 +511,12 @@ CONFIG_PKG_NRFX_VER="v2.1.0" # CONFIG_PKG_USING_FASTLZ is not set # CONFIG_PKG_USING_MINILZO is not set # CONFIG_PKG_USING_QUICKLZ is not set +# CONFIG_PKG_USING_LZMA is not set # CONFIG_PKG_USING_MULTIBUTTON is not set # CONFIG_PKG_USING_FLEXIBLE_BUTTON is not set # CONFIG_PKG_USING_CANFESTIVAL is not set # CONFIG_PKG_USING_ZLIB is not set +# CONFIG_PKG_USING_MINIZIP is not set # CONFIG_PKG_USING_DSTR is not set # CONFIG_PKG_USING_TINYFRAME is not set # CONFIG_PKG_USING_KENDRYTE_DEMO is not set @@ -436,19 +533,25 @@ CONFIG_PKG_NRFX_VER="v2.1.0" # CONFIG_PKG_USING_PERIPHERAL_SAMPLES is not set # CONFIG_PKG_USING_HELLO is not set # CONFIG_PKG_USING_VI is not set -# CONFIG_PKG_USING_NNOM is not set -# CONFIG_PKG_USING_LIBANN is not set -# CONFIG_PKG_USING_ELAPACK is not set +# CONFIG_PKG_USING_KI is not set # CONFIG_PKG_USING_ARMv7M_DWT is not set # CONFIG_PKG_USING_VT100 is not set -# CONFIG_PKG_USING_TETRIS is not set -# CONFIG_PKG_USING_ULAPACK is not set # CONFIG_PKG_USING_UKAL is not set # CONFIG_PKG_USING_CRCLIB is not set + +# +# entertainment: terminal games and other interesting software packages +# # CONFIG_PKG_USING_THREES is not set # CONFIG_PKG_USING_2048 is not set +# CONFIG_PKG_USING_SNAKE is not set +# CONFIG_PKG_USING_TETRIS is not set +# CONFIG_PKG_USING_DONUT is not set +# CONFIG_PKG_USING_ACLOCK is not set # CONFIG_PKG_USING_LWGPS is not set -# CONFIG_PKG_USING_TENSORFLOWLITEMICRO is not set +# CONFIG_PKG_USING_STATE_MACHINE is not set +# CONFIG_PKG_USING_MCURSES is not set +# CONFIG_PKG_USING_COWSAY is not set # # Hardware Drivers Config @@ -480,6 +583,7 @@ CONFIG_BSP_USING_UART0=y CONFIG_NRFX_UART0_ENABLED=1 CONFIG_BSP_UART0_RX_PIN=8 CONFIG_BSP_UART0_TX_PIN=6 +# CONFIG_BSP_USING_I2C is not set # CONFIG_BSP_USING_SPI is not set # CONFIG_BSP_USING_ON_CHIP_FLASH is not set diff --git a/bsp/nrf5x/nrf52840/rtconfig.h b/bsp/nrf5x/nrf52840/rtconfig.h index 9f8dc015dd..d821014dab 100644 --- a/bsp/nrf5x/nrf52840/rtconfig.h +++ b/bsp/nrf5x/nrf52840/rtconfig.h @@ -19,6 +19,9 @@ #define RT_USING_TIMER_SOFT #define RT_TIMER_THREAD_PRIO 4 #define RT_TIMER_THREAD_STACK_SIZE 512 + +/* kservice optimization */ + #define RT_DEBUG /* Inter-Thread communication */ @@ -41,7 +44,7 @@ #define RT_USING_CONSOLE #define RT_CONSOLEBUF_SIZE 128 #define RT_CONSOLE_DEVICE_NAME "uart0" -#define RT_VER_NUM 0x40003 +#define RT_VER_NUM 0x40004 /* RT-Thread Components */ @@ -85,7 +88,6 @@ /* POSIX layer and C standard library */ -#define RT_USING_LIBC /* Network */ @@ -107,6 +109,9 @@ /* Utilities */ +/* RT-Thread Utestcases */ + + /* RT-Thread online packages */ /* IoT - internet of things */ @@ -137,18 +142,29 @@ /* system packages */ +/* acceleration: Assembly language or algorithmic acceleration packages */ + + +/* Micrium: Micrium software products porting for RT-Thread */ + /* peripheral libraries and drivers */ #define PKG_USING_NRFX #define PKG_USING_NRFX_V210 +/* AI packages */ + + /* miscellaneous packages */ /* samples: kernel and components samples */ +/* entertainment: terminal games and other interesting software packages */ + + /* Hardware Drivers Config */ #define SOC_NRF52840 -- cgit v1.3.1 From 8849d16394b819a6c1d912423b03edffe886e87b Mon Sep 17 00:00:00 2001 From: supperthomas <78900636@qq.com> Date: Sat, 19 Jun 2021 22:16:52 +0800 Subject: [bsp/nrf5x] rebuild nrf52840 gpio --- bsp/nrf5x/nrf52840/.config | 36 +- bsp/nrf5x/nrf52840/board/SConscript | 3 +- bsp/nrf5x/nrf52840/board/app_config.h | 4 - bsp/nrf5x/nrf52840/board/board.h | 10 + bsp/nrf5x/nrf52840/board/linker_scripts/link.lds | 1 - bsp/nrf5x/nrf52840/board/sdk_config.h | 3 - bsp/nrf5x/nrf52840/project.uvoptx | 558 ++++++++++------------- bsp/nrf5x/nrf52840/project.uvprojx | 368 +++++++-------- bsp/nrf5x/nrf52840/rtconfig.h | 20 +- bsp/nrf5x/nrf52840/rtconfig.py | 2 +- bsp/nrf5x/nrf52840/template.uvoptx | 2 +- bsp/nrf5x/nrf52840/template.uvprojx | 13 +- 12 files changed, 461 insertions(+), 559 deletions(-) delete mode 100644 bsp/nrf5x/nrf52840/board/app_config.h (limited to 'bsp/nrf5x') diff --git a/bsp/nrf5x/nrf52840/.config b/bsp/nrf5x/nrf52840/.config index ed83405af1..f9c63e767c 100644 --- a/bsp/nrf5x/nrf52840/.config +++ b/bsp/nrf5x/nrf52840/.config @@ -437,9 +437,9 @@ CONFIG_RT_USING_PIN=y # CONFIG_PKG_USING_NRF5X_SDK is not set CONFIG_PKG_USING_NRFX=y CONFIG_PKG_NRFX_PATH="/packages/peripherals/nrfx" -CONFIG_PKG_USING_NRFX_V210=y -# CONFIG_PKG_USING_NRFX_LATEST_VERSION is not set -CONFIG_PKG_NRFX_VER="v2.1.0" +# CONFIG_PKG_USING_NRFX_V210 is not set +CONFIG_PKG_USING_NRFX_LATEST_VERSION=y +CONFIG_PKG_NRFX_VER="latest" # CONFIG_PKG_USING_WM_LIBRARIES is not set # CONFIG_PKG_USING_KENDRYTE_SDK is not set # CONFIG_PKG_USING_INFRARED is not set @@ -557,35 +557,18 @@ CONFIG_PKG_NRFX_VER="v2.1.0" # Hardware Drivers Config # CONFIG_SOC_NRF52840=y -CONFIG_NRFX_CLOCK_ENABLED=1 -CONFIG_NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY=7 -CONFIG_NRFX_CLOCK_CONFIG_LF_SRC=1 CONFIG_SOC_NORDIC=y - -# -# Onboard Peripheral Drivers -# -CONFIG_BSP_USING_JLINK_TO_USART=y -# CONFIG_BSP_USING_QSPI_FLASH is not set +CONFIG_BSP_BOARD_PCA_10056=y # # On-chip Peripheral Drivers # CONFIG_BSP_USING_GPIO=y CONFIG_NRFX_GPIOTE_ENABLED=1 -# CONFIG_BSP_USING_SAADC is not set -# CONFIG_BSP_USING_PWM is not set CONFIG_BSP_USING_UART=y -CONFIG_NRFX_USING_UART=y -# CONFIG_NRFX_USING_UARTE is not set -CONFIG_NRFX_UART_ENABLED=1 CONFIG_BSP_USING_UART0=y -CONFIG_NRFX_UART0_ENABLED=1 CONFIG_BSP_UART0_RX_PIN=8 CONFIG_BSP_UART0_TX_PIN=6 -# CONFIG_BSP_USING_I2C is not set -# CONFIG_BSP_USING_SPI is not set -# CONFIG_BSP_USING_ON_CHIP_FLASH is not set # # On-chip flash config @@ -595,8 +578,9 @@ CONFIG_MCU_FLASH_SIZE_KB=1024 CONFIG_MCU_SRAM_START_ADDRESS=0x20000000 CONFIG_MCU_SRAM_SIZE_KB=256 CONFIG_MCU_FLASH_PAGE_SIZE=0x1000 -# CONFIG_BSP_USING_WDT is not set -# CONFIG_BSP_USING_ONCHIP_RTC is not set -CONFIG_BLE_STACK_USING_NULL=y -# CONFIG_BSP_USING_SOFTDEVICE is not set -# CONFIG_BSP_USING_NIMBLE is not set +CONFIG_NRFX_CLOCK_ENABLED=1 +CONFIG_NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY=7 +CONFIG_NRFX_CLOCK_CONFIG_LF_SRC=1 +CONFIG_NRFX_USING_UART=y +CONFIG_NRFX_UART_ENABLED=1 +CONFIG_NRFX_UART0_ENABLED=1 diff --git a/bsp/nrf5x/nrf52840/board/SConscript b/bsp/nrf5x/nrf52840/board/SConscript index 27bcddd310..d74f1a8861 100644 --- a/bsp/nrf5x/nrf52840/board/SConscript +++ b/bsp/nrf5x/nrf52840/board/SConscript @@ -5,7 +5,6 @@ from building import * cwd = GetCurrentDir() src = Glob('*.c') CPPPATH = [cwd] -define = ['USE_APP_CONFIG'] -group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH,CPPDEFINES = define) +group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/bsp/nrf5x/nrf52840/board/app_config.h b/bsp/nrf5x/nrf52840/board/app_config.h deleted file mode 100644 index 67db2eb886..0000000000 --- a/bsp/nrf5x/nrf52840/board/app_config.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef APP_CONFIG_H -#define APP_CONFIG_H - -#endif //APP_CONFIG_H diff --git a/bsp/nrf5x/nrf52840/board/board.h b/bsp/nrf5x/nrf52840/board/board.h index a3ccadfa36..edfb0b635a 100644 --- a/bsp/nrf5x/nrf52840/board/board.h +++ b/bsp/nrf5x/nrf52840/board/board.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2006-2021, RT-Thread Development Team + * + * SPDX-License-Identifier: Apache-2.0 + * + * Change Logs: + * Date Author Notes + * 2020-06-19 supperthomas first version + * + */ #ifndef _BOARD_H_ #define _BOARD_H_ diff --git a/bsp/nrf5x/nrf52840/board/linker_scripts/link.lds b/bsp/nrf5x/nrf52840/board/linker_scripts/link.lds index 9a9609eed7..f91b8466ca 100644 --- a/bsp/nrf5x/nrf52840/board/linker_scripts/link.lds +++ b/bsp/nrf5x/nrf52840/board/linker_scripts/link.lds @@ -7,7 +7,6 @@ MEMORY { FLASH (rx) : ORIGIN = 0x0, LENGTH = 0x100000 RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x40000 - CODE_RAM (rwx) : ORIGIN = 0x800000, LENGTH = 0x10000 } INCLUDE "packages/nrfx-v2.1.0/mdk/nrf_common.ld" diff --git a/bsp/nrf5x/nrf52840/board/sdk_config.h b/bsp/nrf5x/nrf52840/board/sdk_config.h index d62c024da3..25fa4938fa 100644 --- a/bsp/nrf5x/nrf52840/board/sdk_config.h +++ b/bsp/nrf5x/nrf52840/board/sdk_config.h @@ -43,9 +43,6 @@ #ifndef SDK_CONFIG_H #define SDK_CONFIG_H // <<< Use Configuration Wizard in Context Menu >>>\n -#ifdef USE_APP_CONFIG -#include "app_config.h" -#endif // nRF_BLE #include diff --git a/bsp/nrf5x/nrf52840/project.uvoptx b/bsp/nrf5x/nrf52840/project.uvoptx index ff162faafb..376d1dc34b 100644 --- a/bsp/nrf5x/nrf52840/project.uvoptx +++ b/bsp/nrf5x/nrf52840/project.uvoptx @@ -10,7 +10,7 @@ *.s*; *.src; *.a* *.obj; *.o *.lib - *.txt; *.h; *.inc + *.txt; *.h; *.inc; *.md *.plm *.cpp 0 @@ -182,7 +182,7 @@ - Kernel + Applications 0 0 0 @@ -194,184 +194,192 @@ 0 0 0 - ..\..\..\src\clock.c - clock.c + applications\application.c + application.c 0 0 + + + + CPU + 0 + 0 + 0 + 0 - 1 + 2 2 1 0 0 0 - ..\..\..\src\components.c - components.c + ..\..\..\libcpu\arm\common\div0.c + div0.c 0 0 - 1 + 2 3 1 0 0 0 - ..\..\..\src\device.c - device.c + ..\..\..\libcpu\arm\common\showmem.c + showmem.c 0 0 - 1 + 2 4 1 0 0 0 - ..\..\..\src\idle.c - idle.c + ..\..\..\libcpu\arm\common\backtrace.c + backtrace.c 0 0 - 1 + 2 5 - 1 + 2 0 0 0 - ..\..\..\src\ipc.c - ipc.c + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + context_rvds.S 0 0 - 1 + 2 6 1 0 0 0 - ..\..\..\src\irq.c - irq.c + ..\..\..\libcpu\arm\cortex-m4\cpuport.c + cpuport.c 0 0 + + + + DeviceDrivers + 0 + 0 + 0 + 0 - 1 + 3 7 1 0 0 0 - ..\..\..\src\kservice.c - kservice.c + ..\..\..\components\drivers\misc\pin.c + pin.c 0 0 - 1 + 3 8 1 0 0 0 - ..\..\..\src\mem.c - mem.c + ..\..\..\components\drivers\serial\serial.c + serial.c 0 0 - 1 + 3 9 1 0 0 0 - ..\..\..\src\mempool.c - mempool.c + ..\..\..\components\drivers\src\workqueue.c + workqueue.c 0 0 - 1 + 3 10 1 0 0 0 - ..\..\..\src\object.c - object.c + ..\..\..\components\drivers\src\ringbuffer.c + ringbuffer.c 0 0 - 1 + 3 11 1 0 0 0 - ..\..\..\src\scheduler.c - scheduler.c + ..\..\..\components\drivers\src\waitqueue.c + waitqueue.c 0 0 - 1 + 3 12 1 0 0 0 - ..\..\..\src\signal.c - signal.c + ..\..\..\components\drivers\src\completion.c + completion.c 0 0 - 1 + 3 13 1 0 0 0 - ..\..\..\src\thread.c - thread.c + ..\..\..\components\drivers\src\dataqueue.c + dataqueue.c 0 0 - 1 + 3 14 1 0 0 0 - ..\..\..\src\timer.c - timer.c + ..\..\..\components\drivers\src\ringblk_buf.c + ringblk_buf.c 0 0 - - - - Applications - 0 - 0 - 0 - 0 - 2 + 3 15 1 0 0 0 - applications\application.c - application.c + ..\..\..\components\drivers\src\pipe.c + pipe.c 0 0 @@ -384,7 +392,7 @@ 0 0 - 3 + 4 16 1 0 @@ -396,25 +404,17 @@ 0 - 3 + 4 17 1 0 0 0 - ..\libraries\drivers\drv_uart.c - drv_uart.c + ..\libraries\drivers\drv_gpio.c + drv_gpio.c 0 0 - - - - nrfx - 0 - 0 - 0 - 0 4 18 @@ -422,635 +422,635 @@ 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_adc.c - nrfx_adc.c + ..\libraries\drivers\drv_uart.c + drv_uart.c 0 0 + + + + finsh + 0 + 0 + 0 + 0 - 4 + 5 19 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_clock.c - nrfx_clock.c + ..\..\..\components\finsh\shell.c + shell.c 0 0 - 4 + 5 20 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_comp.c - nrfx_comp.c + ..\..\..\components\finsh\msh.c + msh.c 0 0 - 4 + 5 21 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_dppi.c - nrfx_dppi.c + ..\..\..\components\finsh\cmd.c + cmd.c 0 0 + + + + Kernel + 0 + 0 + 0 + 0 - 4 + 6 22 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_egu.c - nrfx_egu.c + ..\..\..\src\thread.c + thread.c 0 0 - 4 + 6 23 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_gpiote.c - nrfx_gpiote.c + ..\..\..\src\ipc.c + ipc.c 0 0 - 4 + 6 24 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_i2s.c - nrfx_i2s.c + ..\..\..\src\device.c + device.c 0 0 - 4 + 6 25 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_ipc.c - nrfx_ipc.c + ..\..\..\src\object.c + object.c 0 0 - 4 + 6 26 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_lpcomp.c - nrfx_lpcomp.c + ..\..\..\src\irq.c + irq.c 0 0 - 4 + 6 27 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_nfct.c - nrfx_nfct.c + ..\..\..\src\scheduler.c + scheduler.c 0 0 - 4 + 6 28 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_nvmc.c - nrfx_nvmc.c + ..\..\..\src\kservice.c + kservice.c 0 0 - 4 + 6 29 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_pdm.c - nrfx_pdm.c + ..\..\..\src\clock.c + clock.c 0 0 - 4 + 6 30 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_power.c - nrfx_power.c + ..\..\..\src\mempool.c + mempool.c 0 0 - 4 + 6 31 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_ppi.c - nrfx_ppi.c + ..\..\..\src\components.c + components.c 0 0 - 4 + 6 32 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_pwm.c - nrfx_pwm.c + ..\..\..\src\mem.c + mem.c 0 0 - 4 + 6 33 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_qdec.c - nrfx_qdec.c + ..\..\..\src\idle.c + idle.c 0 0 - 4 + 6 34 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_qspi.c - nrfx_qspi.c + ..\..\..\src\timer.c + timer.c 0 0 + + + + nrfx + 0 + 0 + 0 + 0 - 4 + 7 35 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_rng.c - nrfx_rng.c + packages\nrfx-latest\drivers\src\nrfx_ppi.c + nrfx_ppi.c 0 0 - 4 + 7 36 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_rtc.c - nrfx_rtc.c + packages\nrfx-latest\drivers\src\nrfx_twim.c + nrfx_twim.c 0 0 - 4 + 7 37 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_saadc.c - nrfx_saadc.c + packages\nrfx-latest\drivers\src\nrfx_temp.c + nrfx_temp.c 0 0 - 4 + 7 38 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_spi.c - nrfx_spi.c + packages\nrfx-latest\drivers\src\nrfx_rng.c + nrfx_rng.c 0 0 - 4 + 7 39 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_spim.c - nrfx_spim.c + packages\nrfx-latest\drivers\src\nrfx_twi.c + nrfx_twi.c 0 0 - 4 + 7 40 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_spis.c + packages\nrfx-latest\drivers\src\nrfx_spis.c nrfx_spis.c 0 0 - 4 + 7 41 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_systick.c - nrfx_systick.c + packages\nrfx-latest\drivers\src\nrfx_nfct.c + nrfx_nfct.c 0 0 - 4 + 7 42 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_temp.c - nrfx_temp.c + packages\nrfx-latest\drivers\src\nrfx_usbd.c + nrfx_usbd.c 0 0 - 4 + 7 43 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_timer.c - nrfx_timer.c + packages\nrfx-latest\drivers\src\nrfx_pwm.c + nrfx_pwm.c 0 0 - 4 + 7 44 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_twi.c - nrfx_twi.c + packages\nrfx-latest\drivers\src\nrfx_egu.c + nrfx_egu.c 0 0 - 4 + 7 45 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_twi_twim.c - nrfx_twi_twim.c + packages\nrfx-latest\drivers\src\nrfx_adc.c + nrfx_adc.c 0 0 - 4 + 7 46 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_twim.c - nrfx_twim.c + packages\nrfx-latest\drivers\src\nrfx_uarte.c + nrfx_uarte.c 0 0 - 4 + 7 47 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_twis.c - nrfx_twis.c + packages\nrfx-latest\drivers\src\nrfx_clock.c + nrfx_clock.c 0 0 - 4 + 7 48 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_uart.c - nrfx_uart.c + packages\nrfx-latest\drivers\src\nrfx_pdm.c + nrfx_pdm.c 0 0 - 4 + 7 49 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_uarte.c - nrfx_uarte.c + packages\nrfx-latest\drivers\src\nrfx_rtc.c + nrfx_rtc.c 0 0 - 4 + 7 50 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_usbd.c - nrfx_usbd.c + packages\nrfx-latest\drivers\src\nrfx_dppi.c + nrfx_dppi.c 0 0 - 4 + 7 51 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_usbreg.c - nrfx_usbreg.c + packages\nrfx-latest\drivers\src\nrfx_twis.c + nrfx_twis.c 0 0 - 4 + 7 52 1 0 0 0 - packages\nrfx-v2.1.0\drivers\src\nrfx_wdt.c - nrfx_wdt.c + packages\nrfx-latest\drivers\src\nrfx_ipc.c + nrfx_ipc.c 0 0 - 4 + 7 53 1 0 0 0 - packages\nrfx-v2.1.0\mdk\system_nrf52840.c - system_nrf52840.c + packages\nrfx-latest\drivers\src\nrfx_timer.c + nrfx_timer.c 0 0 - 4 + 7 54 - 2 + 1 0 0 0 - packages\nrfx-v2.1.0\mdk\arm_startup_nrf52840.s - arm_startup_nrf52840.s + packages\nrfx-latest\drivers\src\nrfx_nvmc.c + nrfx_nvmc.c 0 0 - - - - cpu - 0 - 0 - 0 - 0 - 5 + 7 55 1 0 0 0 - ..\..\..\libcpu\arm\common\backtrace.c - backtrace.c + packages\nrfx-latest\drivers\src\nrfx_comp.c + nrfx_comp.c 0 0 - 5 + 7 56 1 0 0 0 - ..\..\..\libcpu\arm\common\div0.c - div0.c + packages\nrfx-latest\drivers\src\nrfx_systick.c + nrfx_systick.c 0 0 - 5 + 7 57 1 0 0 0 - ..\..\..\libcpu\arm\common\showmem.c - showmem.c + packages\nrfx-latest\drivers\src\nrfx_usbreg.c + nrfx_usbreg.c 0 0 - 5 + 7 58 - 1 + 2 0 0 0 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c - cpuport.c + packages\nrfx-latest\mdk\arm_startup_nrf52840.s + arm_startup_nrf52840.s 0 0 - 5 + 7 59 - 2 + 1 0 0 0 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S - context_rvds.S + packages\nrfx-latest\drivers\src\nrfx_saadc.c + nrfx_saadc.c 0 0 - - - - DeviceDrivers - 0 - 0 - 0 - 0 - 6 + 7 60 1 0 0 0 - ..\..\..\components\drivers\misc\pin.c - pin.c + packages\nrfx-latest\drivers\src\nrfx_wdt.c + nrfx_wdt.c 0 0 - 6 + 7 61 1 0 0 0 - ..\..\..\components\drivers\serial\serial.c - serial.c + packages\nrfx-latest\drivers\src\nrfx_gpiote.c + nrfx_gpiote.c 0 0 - 6 + 7 62 1 0 0 0 - ..\..\..\components\drivers\src\completion.c - completion.c + packages\nrfx-latest\drivers\src\nrfx_spi.c + nrfx_spi.c 0 0 - 6 + 7 63 1 0 0 0 - ..\..\..\components\drivers\src\dataqueue.c - dataqueue.c + packages\nrfx-latest\drivers\src\nrfx_twi_twim.c + nrfx_twi_twim.c 0 0 - 6 + 7 64 1 0 0 0 - ..\..\..\components\drivers\src\pipe.c - pipe.c + packages\nrfx-latest\mdk\system_nrf52840.c + system_nrf52840.c 0 0 - 6 + 7 65 1 0 0 0 - ..\..\..\components\drivers\src\ringblk_buf.c - ringblk_buf.c + packages\nrfx-latest\drivers\src\nrfx_lpcomp.c + nrfx_lpcomp.c 0 0 - 6 + 7 66 1 0 0 0 - ..\..\..\components\drivers\src\ringbuffer.c - ringbuffer.c + packages\nrfx-latest\drivers\src\nrfx_qdec.c + nrfx_qdec.c 0 0 - 6 + 7 67 1 0 0 0 - ..\..\..\components\drivers\src\waitqueue.c - waitqueue.c + packages\nrfx-latest\drivers\src\nrfx_power.c + nrfx_power.c 0 0 - 6 + 7 68 1 0 0 0 - ..\..\..\components\drivers\src\workqueue.c - workqueue.c + packages\nrfx-latest\drivers\src\nrfx_uart.c + nrfx_uart.c 0 0 - - - - finsh - 0 - 0 - 0 - 0 7 69 @@ -1058,8 +1058,8 @@ 0 0 0 - ..\..\..\components\finsh\shell.c - shell.c + packages\nrfx-latest\drivers\src\nrfx_i2s.c + nrfx_i2s.c 0 0 @@ -1070,8 +1070,8 @@ 0 0 0 - ..\..\..\components\finsh\cmd.c - cmd.c + packages\nrfx-latest\drivers\src\nrfx_spim.c + nrfx_spim.c 0 0 @@ -1082,64 +1082,8 @@ 0 0 0 - ..\..\..\components\finsh\msh.c - msh.c - 0 - 0 - - - - - libc - 0 - 0 - 0 - 0 - - 8 - 72 - 1 - 0 - 0 - 0 - ..\..\..\components\libc\compilers\armlibc\libc.c - libc.c - 0 - 0 - - - 8 - 73 - 1 - 0 - 0 - 0 - ..\..\..\components\libc\compilers\armlibc\mem_std.c - mem_std.c - 0 - 0 - - - 8 - 74 - 1 - 0 - 0 - 0 - ..\..\..\components\libc\compilers\armlibc\stubs.c - stubs.c - 0 - 0 - - - 8 - 75 - 1 - 0 - 0 - 0 - ..\..\..\components\libc\compilers\common\time.c - time.c + packages\nrfx-latest\drivers\src\nrfx_qspi.c + nrfx_qspi.c 0 0 diff --git a/bsp/nrf5x/nrf52840/project.uvprojx b/bsp/nrf5x/nrf52840/project.uvprojx index b1bf5b73cf..be44fa7a0c 100644 --- a/bsp/nrf5x/nrf52840/project.uvprojx +++ b/bsp/nrf5x/nrf52840/project.uvprojx @@ -10,13 +10,13 @@ rtthread 0x4 ARM-ADS - 5060750::V5.06 update 6 (build 750)::ARMCC + 5060960::V5.06 update 7 (build 960)::ARMCC 0 nRF52840_xxAA Nordic Semiconductor - NordicSemiconductor.nRF_DeviceFamilyPack.8.32.1 + NordicSemiconductor.nRF_DeviceFamilyPack.8.38.0 http://developer.nordicsemi.com/nRF5_SDK/pieces/nRF_DeviceFamilyPack/ IRAM(0x20000000,0x40000) IROM(0x00000000,0x100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE @@ -185,6 +185,7 @@ 0 2 0 + 0 0 0 8 @@ -336,9 +337,9 @@ 0 --reduce_paths - NRF52840_XXAA, USE_APP_CONFIG, RT_USING_ARM_LIBC + NRF52840_XXAA, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - .;..\..\..\include;applications;.;board;..\libraries\drivers;packages\nrfx-v2.1.0;packages\nrfx-v2.1.0\drivers;packages\nrfx-v2.1.0\drivers\include;packages\nrfx-v2.1.0\mdk;packages\nrfx-v2.1.0\hal;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\finsh;..\..\..\components\libc\compilers\armlibc;..\..\..\components\libc\compilers\common;..\libraries\cmsis\include + applications;.;..\libraries\cmsis\include;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;..\libraries\drivers;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\none-gcc;packages\nrfx-latest;packages\nrfx-latest\drivers;packages\nrfx-latest\drivers\include;packages\nrfx-latest\mdk;packages\nrfx-latest\hal;..\..\..\examples\utest\testcases\kernel @@ -351,16 +352,16 @@ 0 0 0 - 0 + 4 - --cpreproc_opts=-DBLE_STACK_SUPPORT_REQD,-DNRF_SD_BLE_API_VERSION=4,-DS132,-DSOFTDEVICE_PRESENT,-DSWI_DISABLE0,-DCONFIG_GPIO_AS_PINRESET,-DNRF52,-DNRF52832_XXAA,-DNRF52_PAN_12,-DNRF52_PAN_15,-DNRF52_PAN_20,-DNRF52_PAN_31,-DNRF52_PAN_36,-DNRF52_PAN_51,-DNRF52_PAN_54,-DNRF52_PAN_55,-DNRF52_PAN_58,-DNRF52_PAN_64,-DNRF52_PAN_74 + - 1 + 0 0 0 0 @@ -369,7 +370,7 @@ 0x00000000 0x20000000 - + .\board\linker_scripts\link.sct @@ -380,87 +381,92 @@ - Kernel + Applications - clock.c + application.c 1 - ..\..\..\src\clock.c + applications\application.c + + + + CPU + - components.c + div0.c 1 - ..\..\..\src\components.c + ..\..\..\libcpu\arm\common\div0.c - device.c + showmem.c 1 - ..\..\..\src\device.c + ..\..\..\libcpu\arm\common\showmem.c - idle.c + backtrace.c 1 - ..\..\..\src\idle.c + ..\..\..\libcpu\arm\common\backtrace.c - ipc.c - 1 - ..\..\..\src\ipc.c + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S - irq.c + cpuport.c 1 - ..\..\..\src\irq.c + ..\..\..\libcpu\arm\cortex-m4\cpuport.c + + + + DeviceDrivers + - kservice.c + pin.c 1 - ..\..\..\src\kservice.c + ..\..\..\components\drivers\misc\pin.c - mem.c + serial.c 1 - ..\..\..\src\mem.c + ..\..\..\components\drivers\serial\serial.c - mempool.c + workqueue.c 1 - ..\..\..\src\mempool.c + ..\..\..\components\drivers\src\workqueue.c - object.c + ringbuffer.c 1 - ..\..\..\src\object.c + ..\..\..\components\drivers\src\ringbuffer.c - scheduler.c + waitqueue.c 1 - ..\..\..\src\scheduler.c + ..\..\..\components\drivers\src\waitqueue.c - signal.c + completion.c 1 - ..\..\..\src\signal.c + ..\..\..\components\drivers\src\completion.c - thread.c + dataqueue.c 1 - ..\..\..\src\thread.c + ..\..\..\components\drivers\src\dataqueue.c - timer.c + ringblk_buf.c 1 - ..\..\..\src\timer.c + ..\..\..\components\drivers\src\ringblk_buf.c - - - - Applications - - application.c + pipe.c 1 - applications\application.c + ..\..\..\components\drivers\src\pipe.c @@ -472,6 +478,11 @@ 1 board\board.c + + drv_gpio.c + 1 + ..\libraries\drivers\drv_gpio.c + drv_uart.c 1 @@ -480,317 +491,282 @@ - nrfx + finsh - nrfx_adc.c - 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_adc.c - - - nrfx_clock.c + shell.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_clock.c + ..\..\..\components\finsh\shell.c - nrfx_comp.c + msh.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_comp.c + ..\..\..\components\finsh\msh.c - nrfx_dppi.c + cmd.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_dppi.c + ..\..\..\components\finsh\cmd.c + + + + Kernel + - nrfx_egu.c + thread.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_egu.c + ..\..\..\src\thread.c - nrfx_gpiote.c + ipc.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_gpiote.c + ..\..\..\src\ipc.c - nrfx_i2s.c + device.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_i2s.c + ..\..\..\src\device.c - nrfx_ipc.c + object.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_ipc.c + ..\..\..\src\object.c - nrfx_lpcomp.c + irq.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_lpcomp.c + ..\..\..\src\irq.c - nrfx_nfct.c + scheduler.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_nfct.c + ..\..\..\src\scheduler.c - nrfx_nvmc.c + kservice.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_nvmc.c + ..\..\..\src\kservice.c - nrfx_pdm.c + clock.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_pdm.c + ..\..\..\src\clock.c - nrfx_power.c + mempool.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_power.c + ..\..\..\src\mempool.c - nrfx_ppi.c + components.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_ppi.c + ..\..\..\src\components.c - nrfx_pwm.c + mem.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_pwm.c + ..\..\..\src\mem.c - nrfx_qdec.c + idle.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_qdec.c + ..\..\..\src\idle.c - nrfx_qspi.c + timer.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_qspi.c + ..\..\..\src\timer.c + + + + nrfx + - nrfx_rng.c + nrfx_ppi.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_rng.c + packages\nrfx-latest\drivers\src\nrfx_ppi.c - nrfx_rtc.c + nrfx_twim.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_rtc.c + packages\nrfx-latest\drivers\src\nrfx_twim.c - nrfx_saadc.c + nrfx_temp.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_saadc.c + packages\nrfx-latest\drivers\src\nrfx_temp.c - nrfx_spi.c + nrfx_rng.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_spi.c + packages\nrfx-latest\drivers\src\nrfx_rng.c - nrfx_spim.c + nrfx_twi.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_spim.c + packages\nrfx-latest\drivers\src\nrfx_twi.c nrfx_spis.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_spis.c + packages\nrfx-latest\drivers\src\nrfx_spis.c - nrfx_systick.c + nrfx_nfct.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_systick.c + packages\nrfx-latest\drivers\src\nrfx_nfct.c - nrfx_temp.c + nrfx_usbd.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_temp.c + packages\nrfx-latest\drivers\src\nrfx_usbd.c - nrfx_timer.c + nrfx_pwm.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_timer.c + packages\nrfx-latest\drivers\src\nrfx_pwm.c - nrfx_twi.c + nrfx_egu.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_twi.c + packages\nrfx-latest\drivers\src\nrfx_egu.c - nrfx_twi_twim.c + nrfx_adc.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_twi_twim.c + packages\nrfx-latest\drivers\src\nrfx_adc.c - nrfx_twim.c + nrfx_uarte.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_twim.c + packages\nrfx-latest\drivers\src\nrfx_uarte.c - nrfx_twis.c + nrfx_clock.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_twis.c + packages\nrfx-latest\drivers\src\nrfx_clock.c - nrfx_uart.c + nrfx_pdm.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_uart.c + packages\nrfx-latest\drivers\src\nrfx_pdm.c - nrfx_uarte.c + nrfx_rtc.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_uarte.c + packages\nrfx-latest\drivers\src\nrfx_rtc.c - nrfx_usbd.c + nrfx_dppi.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_usbd.c + packages\nrfx-latest\drivers\src\nrfx_dppi.c - nrfx_usbreg.c + nrfx_twis.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_usbreg.c + packages\nrfx-latest\drivers\src\nrfx_twis.c - nrfx_wdt.c + nrfx_ipc.c 1 - packages\nrfx-v2.1.0\drivers\src\nrfx_wdt.c + packages\nrfx-latest\drivers\src\nrfx_ipc.c - system_nrf52840.c + nrfx_timer.c 1 - packages\nrfx-v2.1.0\mdk\system_nrf52840.c + packages\nrfx-latest\drivers\src\nrfx_timer.c - arm_startup_nrf52840.s - 2 - packages\nrfx-v2.1.0\mdk\arm_startup_nrf52840.s - - - - - cpu - - - backtrace.c + nrfx_nvmc.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + packages\nrfx-latest\drivers\src\nrfx_nvmc.c - div0.c + nrfx_comp.c 1 - ..\..\..\libcpu\arm\common\div0.c + packages\nrfx-latest\drivers\src\nrfx_comp.c - showmem.c + nrfx_systick.c 1 - ..\..\..\libcpu\arm\common\showmem.c + packages\nrfx-latest\drivers\src\nrfx_systick.c - cpuport.c + nrfx_usbreg.c 1 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c + packages\nrfx-latest\drivers\src\nrfx_usbreg.c - context_rvds.S + arm_startup_nrf52840.s 2 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S - - - - - DeviceDrivers - - - pin.c - 1 - ..\..\..\components\drivers\misc\pin.c + packages\nrfx-latest\mdk\arm_startup_nrf52840.s - serial.c - 1 - ..\..\..\components\drivers\serial\serial.c - - - completion.c + nrfx_saadc.c 1 - ..\..\..\components\drivers\src\completion.c + packages\nrfx-latest\drivers\src\nrfx_saadc.c - dataqueue.c + nrfx_wdt.c 1 - ..\..\..\components\drivers\src\dataqueue.c + packages\nrfx-latest\drivers\src\nrfx_wdt.c - pipe.c + nrfx_gpiote.c 1 - ..\..\..\components\drivers\src\pipe.c + packages\nrfx-latest\drivers\src\nrfx_gpiote.c - ringblk_buf.c - 1 - ..\..\..\components\drivers\src\ringblk_buf.c - - - ringbuffer.c + nrfx_spi.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + packages\nrfx-latest\drivers\src\nrfx_spi.c - waitqueue.c + nrfx_twi_twim.c 1 - ..\..\..\components\drivers\src\waitqueue.c + packages\nrfx-latest\drivers\src\nrfx_twi_twim.c - workqueue.c + system_nrf52840.c 1 - ..\..\..\components\drivers\src\workqueue.c + packages\nrfx-latest\mdk\system_nrf52840.c - - - - finsh - - shell.c + nrfx_lpcomp.c 1 - ..\..\..\components\finsh\shell.c + packages\nrfx-latest\drivers\src\nrfx_lpcomp.c - cmd.c + nrfx_qdec.c 1 - ..\..\..\components\finsh\cmd.c + packages\nrfx-latest\drivers\src\nrfx_qdec.c - msh.c + nrfx_power.c 1 - ..\..\..\components\finsh\msh.c + packages\nrfx-latest\drivers\src\nrfx_power.c - - - - libc - - libc.c + nrfx_uart.c 1 - ..\..\..\components\libc\compilers\armlibc\libc.c + packages\nrfx-latest\drivers\src\nrfx_uart.c - mem_std.c + nrfx_i2s.c 1 - ..\..\..\components\libc\compilers\armlibc\mem_std.c + packages\nrfx-latest\drivers\src\nrfx_i2s.c - stubs.c + nrfx_spim.c 1 - ..\..\..\components\libc\compilers\armlibc\stubs.c + packages\nrfx-latest\drivers\src\nrfx_spim.c - time.c + nrfx_qspi.c 1 - ..\..\..\components\libc\compilers\common\time.c + packages\nrfx-latest\drivers\src\nrfx_qspi.c diff --git a/bsp/nrf5x/nrf52840/rtconfig.h b/bsp/nrf5x/nrf52840/rtconfig.h index d821014dab..7b387a4444 100644 --- a/bsp/nrf5x/nrf52840/rtconfig.h +++ b/bsp/nrf5x/nrf52840/rtconfig.h @@ -151,7 +151,7 @@ /* peripheral libraries and drivers */ #define PKG_USING_NRFX -#define PKG_USING_NRFX_V210 +#define PKG_USING_NRFX_LATEST_VERSION /* AI packages */ @@ -168,24 +168,15 @@ /* Hardware Drivers Config */ #define SOC_NRF52840 -#define NRFX_CLOCK_ENABLED 1 -#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY 7 -#define NRFX_CLOCK_CONFIG_LF_SRC 1 #define SOC_NORDIC - -/* Onboard Peripheral Drivers */ - -#define BSP_USING_JLINK_TO_USART +#define BSP_BOARD_PCA_10056 /* On-chip Peripheral Drivers */ #define BSP_USING_GPIO #define NRFX_GPIOTE_ENABLED 1 #define BSP_USING_UART -#define NRFX_USING_UART -#define NRFX_UART_ENABLED 1 #define BSP_USING_UART0 -#define NRFX_UART0_ENABLED 1 #define BSP_UART0_RX_PIN 8 #define BSP_UART0_TX_PIN 6 @@ -196,6 +187,11 @@ #define MCU_SRAM_START_ADDRESS 0x20000000 #define MCU_SRAM_SIZE_KB 256 #define MCU_FLASH_PAGE_SIZE 0x1000 -#define BLE_STACK_USING_NULL +#define NRFX_CLOCK_ENABLED 1 +#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY 7 +#define NRFX_CLOCK_CONFIG_LF_SRC 1 +#define NRFX_USING_UART +#define NRFX_UART_ENABLED 1 +#define NRFX_UART0_ENABLED 1 #endif diff --git a/bsp/nrf5x/nrf52840/rtconfig.py b/bsp/nrf5x/nrf52840/rtconfig.py index 4ef29e332f..c809814516 100644 --- a/bsp/nrf5x/nrf52840/rtconfig.py +++ b/bsp/nrf5x/nrf52840/rtconfig.py @@ -40,7 +40,7 @@ if PLATFORM == 'gcc': OBJDUMP = PREFIX + 'objdump' OBJCPY = PREFIX + 'objcopy' - DEVICE = ' -mcpu=cortex-m4 -mthumb -ffunction-sections -fdata-sections' + DEVICE = ' -mcpu='+CPU + ' -mthumb -ffunction-sections -fdata-sections' CFLAGS = DEVICE AFLAGS = ' -c' + DEVICE + ' -x assembler-with-cpp' LFLAGS = DEVICE + ' -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,Reset_Handler -T board/linker_scripts/link.lds' diff --git a/bsp/nrf5x/nrf52840/template.uvoptx b/bsp/nrf5x/nrf52840/template.uvoptx index f567bf47e8..94da3c0c18 100644 --- a/bsp/nrf5x/nrf52840/template.uvoptx +++ b/bsp/nrf5x/nrf52840/template.uvoptx @@ -10,7 +10,7 @@ *.s*; *.src; *.a* *.obj; *.o *.lib - *.txt; *.h; *.inc + *.txt; *.h; *.inc; *.md *.plm *.cpp 0 diff --git a/bsp/nrf5x/nrf52840/template.uvprojx b/bsp/nrf5x/nrf52840/template.uvprojx index 62c5997a13..33ed1f7c16 100644 --- a/bsp/nrf5x/nrf52840/template.uvprojx +++ b/bsp/nrf5x/nrf52840/template.uvprojx @@ -16,7 +16,7 @@ nRF52840_xxAA Nordic Semiconductor - NordicSemiconductor.nRF_DeviceFamilyPack.8.32.1 + NordicSemiconductor.nRF_DeviceFamilyPack.8.38.0 http://developer.nordicsemi.com/nRF5_SDK/pieces/nRF_DeviceFamilyPack/ IRAM(0x20000000,0x40000) IROM(0x00000000,0x100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE @@ -185,6 +185,7 @@ 0 2 0 + 0 0 0 8 @@ -336,7 +337,7 @@ 0 --reduce_paths - BLE_STACK_SUPPORT_REQD NRF_SD_BLE_API_VERSION=4 S140 SOFTDEVICE_PRESENT SWI_DISABLE0 CONFIG_GPIO_AS_PINRESET NRF52 NRF52832_XXAA NRF52_PAN_12 NRF52_PAN_15 NRF52_PAN_20 NRF52_PAN_31 NRF52_PAN_36 NRF52_PAN_51 NRF52_PAN_54 NRF52_PAN_55 NRF52_PAN_58 NRF52_PAN_64 NRF52_PAN_74 + @@ -351,16 +352,16 @@ 0 0 0 - 0 + 4 - --cpreproc_opts=-DBLE_STACK_SUPPORT_REQD,-DNRF_SD_BLE_API_VERSION=4,-DS132,-DSOFTDEVICE_PRESENT,-DSWI_DISABLE0,-DCONFIG_GPIO_AS_PINRESET,-DNRF52,-DNRF52832_XXAA,-DNRF52_PAN_12,-DNRF52_PAN_15,-DNRF52_PAN_20,-DNRF52_PAN_31,-DNRF52_PAN_36,-DNRF52_PAN_51,-DNRF52_PAN_54,-DNRF52_PAN_55,-DNRF52_PAN_58,-DNRF52_PAN_64,-DNRF52_PAN_74 + - 1 + 0 0 0 0 @@ -369,7 +370,7 @@ 0x00000000 0x20000000 - + .\board\linker_scripts\link.sct --diag_suppress 6330 -- cgit v1.3.1 From 19ec36bc6ef096cc161f67341857487788464c85 Mon Sep 17 00:00:00 2001 From: supperthomas <78900636@qq.com> Date: Sat, 26 Jun 2021 07:03:45 +0800 Subject: rebuild the Kconfig --- bsp/nrf5x/nrf52840/.config | 44 ++-- bsp/nrf5x/nrf52840/board/Kconfig | 511 +++++++++++++++++++++---------------- bsp/nrf5x/nrf52840/project.uvoptx | 426 ++++++++++++++++++++----------- bsp/nrf5x/nrf52840/project.uvprojx | 260 +++++++++++-------- bsp/nrf5x/nrf52840/rtconfig.h | 16 +- 5 files changed, 755 insertions(+), 502 deletions(-) (limited to 'bsp/nrf5x') diff --git a/bsp/nrf5x/nrf52840/.config b/bsp/nrf5x/nrf52840/.config index f9c63e767c..9612d30606 100644 --- a/bsp/nrf5x/nrf52840/.config +++ b/bsp/nrf5x/nrf52840/.config @@ -15,7 +15,7 @@ CONFIG_RT_THREAD_PRIORITY_32=y # CONFIG_RT_THREAD_PRIORITY_256 is not set CONFIG_RT_THREAD_PRIORITY_MAX=32 CONFIG_RT_TICK_PER_SECOND=100 -CONFIG_RT_USING_OVERFLOW_CHECK=y +# CONFIG_RT_USING_OVERFLOW_CHECK is not set CONFIG_RT_USING_HOOK=y CONFIG_RT_USING_IDLE_HOOK=y CONFIG_RT_IDLE_HOOK_LIST_SIZE=4 @@ -29,18 +29,7 @@ CONFIG_RT_TIMER_THREAD_STACK_SIZE=512 # # CONFIG_RT_KSERVICE_USING_STDLIB is not set # CONFIG_RT_KSERVICE_USING_TINY_SIZE is not set -CONFIG_RT_DEBUG=y -# CONFIG_RT_DEBUG_COLOR is not set -# CONFIG_RT_DEBUG_INIT_CONFIG is not set -# CONFIG_RT_DEBUG_THREAD_CONFIG is not set -# CONFIG_RT_DEBUG_SCHEDULER_CONFIG is not set -# CONFIG_RT_DEBUG_IPC_CONFIG is not set -# CONFIG_RT_DEBUG_TIMER_CONFIG is not set -# CONFIG_RT_DEBUG_IRQ_CONFIG is not set -# CONFIG_RT_DEBUG_MEM_CONFIG is not set -# CONFIG_RT_DEBUG_SLAB_CONFIG is not set -# CONFIG_RT_DEBUG_MEMHEAP_CONFIG is not set -# CONFIG_RT_DEBUG_MODULE_CONFIG is not set +# CONFIG_RT_DEBUG is not set # # Inter-Thread communication @@ -48,8 +37,8 @@ CONFIG_RT_DEBUG=y CONFIG_RT_USING_SEMAPHORE=y CONFIG_RT_USING_MUTEX=y CONFIG_RT_USING_EVENT=y -CONFIG_RT_USING_MAILBOX=y -CONFIG_RT_USING_MESSAGEQUEUE=y +# CONFIG_RT_USING_MAILBOX is not set +# CONFIG_RT_USING_MESSAGEQUEUE is not set # CONFIG_RT_USING_SIGNALS is not set # @@ -106,7 +95,7 @@ CONFIG_FINSH_CMD_SIZE=80 # CONFIG_FINSH_USING_AUTH is not set CONFIG_FINSH_USING_MSH=y CONFIG_FINSH_USING_MSH_DEFAULT=y -CONFIG_FINSH_USING_MSH_ONLY=y +# CONFIG_FINSH_USING_MSH_ONLY is not set CONFIG_FINSH_ARG_MAX=10 # @@ -560,27 +549,44 @@ CONFIG_SOC_NRF52840=y CONFIG_SOC_NORDIC=y CONFIG_BSP_BOARD_PCA_10056=y +# +# Onboard Peripheral Drivers +# +CONFIG_BSP_USING_JLINK_TO_USART=y +# CONFIG_BSP_USING_QSPI_FLASH is not set + # # On-chip Peripheral Drivers # CONFIG_BSP_USING_GPIO=y -CONFIG_NRFX_GPIOTE_ENABLED=1 CONFIG_BSP_USING_UART=y +CONFIG_NRFX_USING_UART=y +# CONFIG_NRFX_USING_UARTE is not set CONFIG_BSP_USING_UART0=y CONFIG_BSP_UART0_RX_PIN=8 CONFIG_BSP_UART0_TX_PIN=6 +# CONFIG_BSP_USING_SAADC is not set +# CONFIG_BSP_USING_I2C is not set +# CONFIG_BSP_USING_SPI is not set +# CONFIG_BSP_USING_PWM is not set +# CONFIG_BSP_USING_WDT is not set +# CONFIG_BSP_USING_ONCHIP_RTC is not set +# CONFIG_BSP_USING_ON_CHIP_FLASH is not set # -# On-chip flash config +# MCU flash config # CONFIG_MCU_FLASH_START_ADDRESS=0x00000000 CONFIG_MCU_FLASH_SIZE_KB=1024 CONFIG_MCU_SRAM_START_ADDRESS=0x20000000 CONFIG_MCU_SRAM_SIZE_KB=256 CONFIG_MCU_FLASH_PAGE_SIZE=0x1000 +CONFIG_BLE_STACK_USING_NULL=y +# CONFIG_BSP_USING_SOFTDEVICE is not set +# CONFIG_BSP_USING_NIMBLE is not set CONFIG_NRFX_CLOCK_ENABLED=1 CONFIG_NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY=7 CONFIG_NRFX_CLOCK_CONFIG_LF_SRC=1 -CONFIG_NRFX_USING_UART=y CONFIG_NRFX_UART_ENABLED=1 CONFIG_NRFX_UART0_ENABLED=1 +CONFIG_NRFX_GPIOTE_ENABLED=1 diff --git a/bsp/nrf5x/nrf52840/board/Kconfig b/bsp/nrf5x/nrf52840/board/Kconfig index 71e7595048..8a2fe7d49d 100644 --- a/bsp/nrf5x/nrf52840/board/Kconfig +++ b/bsp/nrf5x/nrf52840/board/Kconfig @@ -2,31 +2,26 @@ menu "Hardware Drivers Config" config SOC_NRF52840 bool - config SOC_NRF52840 select RT_USING_COMPONENTS_INIT select RT_USING_USER_MAIN default y - config NRFX_CLOCK_ENABLED - int - default 1 - config NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY - int - default 7 - config NRFX_CLOCK_CONFIG_LF_SRC - int - default 1 - config SOC_NORDIC bool - config SOC_NORDIC default y +choice + prompt "Select BSP board " + default BSP_BOARD_PCA_10056 + + config BSP_BOARD_PCA_10056 + bool "NRF52840 pca10056 " + +endchoice + menu "Onboard Peripheral Drivers" config BSP_USING_JLINK_TO_USART bool "Enable JLINK TO USART (uart0|RX_PIN:8|TX_PIN:6)" - select BSP_USING_UART - select BSP_USING_UART0 default y menuconfig BSP_USING_QSPI_FLASH @@ -68,135 +63,17 @@ menu "Onboard Peripheral Drivers" endif endmenu + menu "On-chip Peripheral Drivers" + config BSP_USING_GPIO bool "Enable GPIO" select RT_USING_PIN default y - if BSP_USING_GPIO - config NRFX_GPIOTE_ENABLED - int - default 1 - endif - config BSP_USING_SAADC - bool "Enable SAADC" - select RT_USING_ADC - default n - if BSP_USING_SAADC - config NRFX_SAADC_ENABLED - int - default 1 - endif - menuconfig BSP_USING_PWM - bool "Enable PWM" - select RT_USING_PWM - default n - if BSP_USING_PWM - config NRFX_PWM_ENABLED - int - default 1 - config BSP_USING_PWM0 - bool "Enable PWM0 bus" - default y - if BSP_USING_PWM0 - config NRFX_PWM0_ENABLED - int - default 1 - config BSP_USING_PWM0_CH0 - int "PWM0 channel 0 pin number set" - range 0 47 - default 13 - config BSP_USING_PWM0_CH1 - int "PWM0 channel 1 pin number set" - range 0 47 - default 14 - config BSP_USING_PWM0_CH2 - int "PWM0 channel 2 pin number set" - range 0 47 - default 15 - config BSP_USING_PWM0_CH3 - int "PWM0 channel 3 pin number set" - range 0 47 - default 16 - endif - config BSP_USING_PWM1 - bool "Enable PWM1 bus" - default n - if BSP_USING_PWM1 - config NRFX_PWM1_ENABLED - int - default 1 - config BSP_USING_PWM1_CH0 - int "PWM1 channel 0 pin number set" - range 0 47 - default 13 - config BSP_USING_PWM1_CH1 - int "PWM1 channel 1 pin number set" - range 0 47 - default 14 - config BSP_USING_PWM1_CH2 - int "PWM1 channel 2 pin number set" - range 0 47 - default 15 - config BSP_USING_PWM1_CH3 - int "PWM1 channel 3 pin number set" - range 0 47 - default 16 - endif - config BSP_USING_PWM2 - bool "Enable PWM2 bus" - default n - if BSP_USING_PWM2 - config NRFX_PWM2_ENABLED - int - default 1 - config BSP_USING_PWM2_CH0 - int "PWM2 channel 0 pin number set" - range 0 47 - default 13 - config BSP_USING_PWM2_CH1 - int "PWM2 channel 1 pin number set" - range 0 47 - default 14 - config BSP_USING_PWM2_CH2 - int "PWM2 channel 2 pin number set" - range 0 47 - default 15 - config BSP_USING_PWM2_CH3 - int "PWM2 channel 3 pin number set" - range 0 47 - default 16 - endif - config BSP_USING_PWM3 - bool "Enable PWM3 bus" - default n - if BSP_USING_PWM3 - config NRFX_PWM3_ENABLED - int - default 1 - config BSP_USING_PWM3_CH0 - int "PWM3 channel 0 pin number set" - range 0 47 - default 13 - config BSP_USING_PWM3_CH1 - int "PWM3 channel 1 pin number set" - range 0 47 - default 14 - config BSP_USING_PWM3_CH2 - int "PWM3 channel 2 pin number set" - range 0 47 - default 15 - config BSP_USING_PWM3_CH3 - int "PWM3 channel 3 pin number set" - range 0 47 - default 16 - endif - endif - config BSP_USING_UART bool "Enable UART" - default y + default n select RT_USING_SERIAL if BSP_USING_UART choice @@ -212,17 +89,12 @@ menu "On-chip Peripheral Drivers" endchoice endif if BSP_USING_UART&&NRFX_USING_UART - config NRFX_UART_ENABLED - int - default 1 + config BSP_USING_UART0 bool "Enable UART0" default y if BSP_USING_UART0 - config NRFX_UART0_ENABLED - int - default 1 config BSP_UART0_RX_PIN int "uart0 rx pin number" range 0 31 @@ -271,21 +143,21 @@ menu "On-chip Peripheral Drivers" default 5 endif endif - config BSP_USING_I2C + + config BSP_USING_SAADC + bool "Enable ADC" + select RT_USING_ADC + default n + + menuconfig BSP_USING_I2C bool "Enable I2C" select RT_USING_I2C default n if BSP_USING_I2C - config NRFX_TWIM_ENABLED - int - default 1 config BSP_USING_I2C0 bool "Enable I2C0 bus" - default n + default y if BSP_USING_I2C0 - config NRFX_TWIM0_ENABLED - int - default 1 config BSP_I2C0_SCL_PIN int "i2c0 scl pin number" range 0 31 @@ -299,9 +171,6 @@ menu "On-chip Peripheral Drivers" bool "Enable I2C1 bus" default n if BSP_USING_I2C1 - config NRFX_TWIM1_ENABLED - int - default 1 config BSP_I2C1_SCL_PIN int "i2c1 scl pin number" range 0 31 @@ -312,15 +181,13 @@ menu "On-chip Peripheral Drivers" default 2 endif endif - config BSP_USING_SPI + + menuconfig BSP_USING_SPI bool "Enable SPI" select RT_USING_SPI default n if BSP_USING_SPI - config NRFX_SPI_ENABLED - int - default 1 config BSP_USING_SPI0 bool "Enable SPI0 bus" default y @@ -350,9 +217,6 @@ menu "On-chip Peripheral Drivers" bool "Enable SPI1 bus" default n if BSP_USING_SPI1 - config NRFX_SPI1_ENABLED - int "Enable SPI1 instance" - default 1 config BSP_SPI1_SCK_PIN int "SPI0 sck pin number set" range 0 47 @@ -375,9 +239,6 @@ menu "On-chip Peripheral Drivers" bool "Enable SPI2 bus" default n if BSP_USING_SPI2 - config NRFX_SPI2_ENABLED - int "Enable SPI2 instance" - default 1 config BSP_SPI2_SCK_PIN int "SPI0 sck pin number set" range 0 47 @@ -397,12 +258,119 @@ menu "On-chip Peripheral Drivers" endif endif + + menuconfig BSP_USING_PWM + bool "Enable PWM" + select RT_USING_PWM + default n + if BSP_USING_PWM + config BSP_USING_PWM0 + bool "Enable PWM0 bus" + default y + if BSP_USING_PWM0 + config BSP_USING_PWM0_CH0 + int "PWM0 channel 0 pin number set" + range 0 47 + default 13 + config BSP_USING_PWM0_CH1 + int "PWM0 channel 1 pin number set" + range 0 47 + default 14 + config BSP_USING_PWM0_CH2 + int "PWM0 channel 2 pin number set" + range 0 47 + default 15 + config BSP_USING_PWM0_CH3 + int "PWM0 channel 3 pin number set" + range 0 47 + default 16 + endif + config BSP_USING_PWM1 + bool "Enable PWM1 bus" + default n + if BSP_USING_PWM1 + config NRFX_PWM1_ENABLED + int + default 1 + config BSP_USING_PWM1_CH0 + int "PWM1 channel 0 pin number set" + range 0 47 + default 13 + config BSP_USING_PWM1_CH1 + int "PWM1 channel 1 pin number set" + range 0 47 + default 14 + config BSP_USING_PWM1_CH2 + int "PWM1 channel 2 pin number set" + range 0 47 + default 15 + config BSP_USING_PWM1_CH3 + int "PWM1 channel 3 pin number set" + range 0 47 + default 16 + endif + config BSP_USING_PWM2 + bool "Enable PWM2 bus" + default n + if BSP_USING_PWM2 + config BSP_USING_PWM2_CH0 + int "PWM2 channel 0 pin number set" + range 0 47 + default 13 + config BSP_USING_PWM2_CH1 + int "PWM2 channel 1 pin number set" + range 0 47 + default 14 + config BSP_USING_PWM2_CH2 + int "PWM2 channel 2 pin number set" + range 0 47 + default 15 + config BSP_USING_PWM2_CH3 + int "PWM2 channel 3 pin number set" + range 0 47 + default 16 + endif + config BSP_USING_PWM3 + bool "Enable PWM3 bus" + default n + if BSP_USING_PWM3 + config BSP_USING_PWM3_CH0 + int "PWM3 channel 0 pin number set" + range 0 47 + default 13 + config BSP_USING_PWM3_CH1 + int "PWM3 channel 1 pin number set" + range 0 47 + default 14 + config BSP_USING_PWM3_CH2 + int "PWM3 channel 2 pin number set" + range 0 47 + default 15 + config BSP_USING_PWM3_CH3 + int "PWM3 channel 3 pin number set" + range 0 47 + default 16 + endif + endif + + config BSP_USING_WDT + bool "Enable WDT" + select RT_USING_WDT + default n + + menuconfig BSP_USING_ONCHIP_RTC + bool "Enable RTC" + select RT_USING_RTC + select RT_USING_LIBC + default n + + config BSP_USING_ON_CHIP_FLASH select PKG_USING_FAL bool "Enable on-chip FLASH" default n - menu "On-chip flash config" + menu "MCU flash config" config MCU_FLASH_START_ADDRESS hex "MCU FLASH START ADDRESS" @@ -410,71 +378,20 @@ menu "On-chip Peripheral Drivers" config MCU_FLASH_SIZE_KB int "MCU FLASH SIZE, MAX size 1024 KB" - range 1 1024 - default 1024 + default 1024 config MCU_SRAM_START_ADDRESS hex "MCU RAM START ADDRESS" default 0x20000000 - config MCU_SRAM_SIZE_KB - int "MCU RAM SIZE, MAX size 256 KB" - range 1 256 + config MCU_SRAM_SIZE_KB + int "MCU RAM SIZE" default 256 config MCU_FLASH_PAGE_SIZE hex "MCU FLASH PAGE SIZE, please not change,nrfx default is 0x1000" - range 0x1000 0x1000 default 0x1000 endmenu - config BSP_USING_WDT - bool "Enable WDT" - select RT_USING_WDT - default n - if BSP_USING_WDT - config NRFX_WDT_ENABLED - int - default 1 - config NRFX_WDT0_ENABLED - int - default 1 - config NRFX_WDT_CONFIG_NO_IRQ - int - default 1 - endif - - menuconfig BSP_USING_ONCHIP_RTC - bool "Enable RTC" - select RT_USING_RTC - select RT_USING_LIBC - default n - if BSP_USING_ONCHIP_RTC - config NRFX_CLOCK_ENABLED - int - default 1 - config NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY - int - default 7 - config NRFX_RTC_ENABLED - int - default 1 - config NRFX_RTC0_ENABLED - int - default 1 - config NRFX_RTC1_ENABLED - int - default 1 - config NRFX_RTC2_ENABLED - int - default 1 - config RTC_INSTANCE_ID - int - default 2 - config RTC_INSTANCE_ID - int "select RTC instance id, must be 0, 1, 2" - range 0 2 - default 2 - endif endmenu @@ -497,6 +414,166 @@ config BSP_USING_NIMBLE bool "use nimble stack(iot)" endchoice +if SOC_NORDIC + config NRFX_CLOCK_ENABLED + int + default 1 + config NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY + int + default 7 + config NRFX_CLOCK_CONFIG_LF_SRC + int + default 1 +endif + +if BSP_USING_UART + config NRFX_USING_UART + bool + default y + + config NRFX_UART_ENABLED + int + default 1 +if BSP_USING_UART0 + config NRFX_UART0_ENABLED + int + default 1 +endif + +if NRFX_USING_UART + config NRFX_UART_ENABLED + int + default 1 +endif + +if NRFX_USING_UARTE + config NRFX_UARTE0_ENABLED + int + default 1 +endif + + +endif + +if BSP_USING_GPIO + config NRFX_GPIOTE_ENABLED + int + default 1 +endif + +if BSP_USING_SAADC + config NRFX_SAADC_ENABLED + int + default 1 +endif + +if BSP_USING_I2C + config NRFX_TWIM_ENABLED + int + default 1 + if BSP_USING_I2C0 + config NRFX_TWIM0_ENABLED + int + default 1 + endif + + if BSP_USING_I2C1 + config NRFX_TWIM1_ENABLED + int + default 1 + endif +endif + +if BSP_USING_SPI + config NRFX_SPI_ENABLED + int + default 1 + + if BSP_USING_SPI0 + config NRFX_SPI0_ENABLED + int + default 1 + endif + + if BSP_USING_SPI1 + config NRFX_SPI1_ENABLED + int + default 1 + endif + + if BSP_USING_SPI2 + config NRFX_SPI2_ENABLED + int + default 1 + endif +endif + +if BSP_USING_PWM + config NRFX_PWM_ENABLED + int + default 1 + if BSP_USING_PWM0 + config NRFX_PWM0_ENABLED + int + default 1 + endif + if BSP_USING_PWM1 + config NRFX_PWM1_ENABLED + int + default 1 + endif + if BSP_USING_PWM2 + config NRFX_PWM2_ENABLED + int + default 1 + endif + if BSP_USING_PWM3 + config NRFX_PWM3_ENABLED + int + default 1 + endif + +endif + +if BSP_USING_WDT + config NRFX_WDT_ENABLED + int + default 1 + config NRFX_WDT0_ENABLED + int + default 1 + config NRFX_WDT_CONFIG_NO_IRQ + int + default 1 +endif + +if BSP_USING_ONCHIP_RTC + config NRFX_CLOCK_ENABLED + int + default 1 + config NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY + int + default 7 + config NRFX_RTC_ENABLED + int + default 1 + config NRFX_RTC0_ENABLED + int + default 1 + config NRFX_RTC1_ENABLED + int + default 1 + config NRFX_RTC2_ENABLED + int + default 1 + config RTC_INSTANCE_ID + int + default 2 + config RTC_INSTANCE_ID + int + range 0 2 + default 2 +endif endmenu diff --git a/bsp/nrf5x/nrf52840/project.uvoptx b/bsp/nrf5x/nrf52840/project.uvoptx index 376d1dc34b..232521460c 100644 --- a/bsp/nrf5x/nrf52840/project.uvoptx +++ b/bsp/nrf5x/nrf52840/project.uvoptx @@ -183,7 +183,7 @@ Applications - 0 + 1 0 0 0 @@ -214,8 +214,8 @@ 0 0 0 - ..\..\..\libcpu\arm\common\div0.c - div0.c + ..\..\..\libcpu\arm\common\backtrace.c + backtrace.c 0 0 @@ -238,8 +238,8 @@ 0 0 0 - ..\..\..\libcpu\arm\common\backtrace.c - backtrace.c + ..\..\..\libcpu\arm\common\div0.c + div0.c 0 0 @@ -306,8 +306,8 @@ 0 0 0 - ..\..\..\components\drivers\src\workqueue.c - workqueue.c + ..\..\..\components\drivers\src\waitqueue.c + waitqueue.c 0 0 @@ -318,8 +318,8 @@ 0 0 0 - ..\..\..\components\drivers\src\ringbuffer.c - ringbuffer.c + ..\..\..\components\drivers\src\workqueue.c + workqueue.c 0 0 @@ -330,8 +330,8 @@ 0 0 0 - ..\..\..\components\drivers\src\waitqueue.c - waitqueue.c + ..\..\..\components\drivers\src\completion.c + completion.c 0 0 @@ -342,8 +342,8 @@ 0 0 0 - ..\..\..\components\drivers\src\completion.c - completion.c + ..\..\..\components\drivers\src\dataqueue.c + dataqueue.c 0 0 @@ -354,8 +354,8 @@ 0 0 0 - ..\..\..\components\drivers\src\dataqueue.c - dataqueue.c + ..\..\..\components\drivers\src\ringbuffer.c + ringbuffer.c 0 0 @@ -387,7 +387,7 @@ Drivers - 0 + 1 0 0 0 @@ -442,8 +442,8 @@ 0 0 0 - ..\..\..\components\finsh\shell.c - shell.c + ..\..\..\components\finsh\finsh_node.c + finsh_node.c 0 0 @@ -454,8 +454,8 @@ 0 0 0 - ..\..\..\components\finsh\msh.c - msh.c + ..\..\..\components\finsh\finsh_parser.c + finsh_parser.c 0 0 @@ -471,134 +471,134 @@ 0 0 - - - - Kernel - 0 - 0 - 0 - 0 - 6 + 5 22 1 0 0 0 - ..\..\..\src\thread.c - thread.c + ..\..\..\components\finsh\msh.c + msh.c 0 0 - 6 + 5 23 1 0 0 0 - ..\..\..\src\ipc.c - ipc.c + ..\..\..\components\finsh\finsh_vm.c + finsh_vm.c 0 0 - 6 + 5 24 1 0 0 0 - ..\..\..\src\device.c - device.c + ..\..\..\components\finsh\shell.c + shell.c 0 0 - 6 + 5 25 1 0 0 0 - ..\..\..\src\object.c - object.c + ..\..\..\components\finsh\finsh_var.c + finsh_var.c 0 0 - 6 + 5 26 1 0 0 0 - ..\..\..\src\irq.c - irq.c + ..\..\..\components\finsh\finsh_compiler.c + finsh_compiler.c 0 0 - 6 + 5 27 1 0 0 0 - ..\..\..\src\scheduler.c - scheduler.c + ..\..\..\components\finsh\finsh_heap.c + finsh_heap.c 0 0 - 6 + 5 28 1 0 0 0 - ..\..\..\src\kservice.c - kservice.c + ..\..\..\components\finsh\finsh_ops.c + finsh_ops.c 0 0 - 6 + 5 29 1 0 0 0 - ..\..\..\src\clock.c - clock.c + ..\..\..\components\finsh\finsh_error.c + finsh_error.c 0 0 - 6 + 5 30 1 0 0 0 - ..\..\..\src\mempool.c - mempool.c + ..\..\..\components\finsh\finsh_token.c + finsh_token.c 0 0 - 6 + 5 31 1 0 0 0 - ..\..\..\src\components.c - components.c + ..\..\..\components\finsh\finsh_init.c + finsh_init.c 0 0 + + + + Kernel + 0 + 0 + 0 + 0 6 32 @@ -606,8 +606,8 @@ 0 0 0 - ..\..\..\src\mem.c - mem.c + ..\..\..\src\kservice.c + kservice.c 0 0 @@ -618,8 +618,8 @@ 0 0 0 - ..\..\..\src\idle.c - idle.c + ..\..\..\src\clock.c + clock.c 0 0 @@ -635,134 +635,134 @@ 0 0 - - - - nrfx - 0 - 0 - 0 - 0 - 7 + 6 35 1 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_ppi.c - nrfx_ppi.c + ..\..\..\src\scheduler.c + scheduler.c 0 0 - 7 + 6 36 1 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_twim.c - nrfx_twim.c + ..\..\..\src\device.c + device.c 0 0 - 7 + 6 37 1 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_temp.c - nrfx_temp.c + ..\..\..\src\ipc.c + ipc.c 0 0 - 7 + 6 38 1 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_rng.c - nrfx_rng.c + ..\..\..\src\irq.c + irq.c 0 0 - 7 + 6 39 1 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_twi.c - nrfx_twi.c + ..\..\..\src\object.c + object.c 0 0 - 7 + 6 40 1 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_spis.c - nrfx_spis.c + ..\..\..\src\mempool.c + mempool.c 0 0 - 7 + 6 41 1 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_nfct.c - nrfx_nfct.c + ..\..\..\src\components.c + components.c 0 0 - 7 + 6 42 1 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_usbd.c - nrfx_usbd.c + ..\..\..\src\thread.c + thread.c 0 0 - 7 + 6 43 1 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_pwm.c - nrfx_pwm.c + ..\..\..\src\idle.c + idle.c 0 0 - 7 + 6 44 1 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_egu.c - nrfx_egu.c + ..\..\..\src\mem.c + mem.c 0 0 + + + + nrfx + 0 + 0 + 0 + 0 7 45 @@ -770,8 +770,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_adc.c - nrfx_adc.c + packages\nrfx-latest\drivers\src\nrfx_qspi.c + nrfx_qspi.c 0 0 @@ -782,8 +782,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_uarte.c - nrfx_uarte.c + packages\nrfx-latest\drivers\src\nrfx_spis.c + nrfx_spis.c 0 0 @@ -794,8 +794,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_clock.c - nrfx_clock.c + packages\nrfx-latest\drivers\src\nrfx_usbd.c + nrfx_usbd.c 0 0 @@ -806,8 +806,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_pdm.c - nrfx_pdm.c + packages\nrfx-latest\drivers\src\nrfx_qdec.c + nrfx_qdec.c 0 0 @@ -818,8 +818,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_rtc.c - nrfx_rtc.c + packages\nrfx-latest\drivers\src\nrfx_adc.c + nrfx_adc.c 0 0 @@ -830,8 +830,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_dppi.c - nrfx_dppi.c + packages\nrfx-latest\drivers\src\nrfx_power.c + nrfx_power.c 0 0 @@ -842,8 +842,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_twis.c - nrfx_twis.c + packages\nrfx-latest\drivers\src\nrfx_egu.c + nrfx_egu.c 0 0 @@ -854,8 +854,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_ipc.c - nrfx_ipc.c + packages\nrfx-latest\drivers\src\nrfx_twim.c + nrfx_twim.c 0 0 @@ -866,8 +866,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_timer.c - nrfx_timer.c + packages\nrfx-latest\drivers\src\nrfx_nvmc.c + nrfx_nvmc.c 0 0 @@ -878,8 +878,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_nvmc.c - nrfx_nvmc.c + packages\nrfx-latest\drivers\src\nrfx_temp.c + nrfx_temp.c 0 0 @@ -902,8 +902,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_systick.c - nrfx_systick.c + packages\nrfx-latest\drivers\src\nrfx_dppi.c + nrfx_dppi.c 0 0 @@ -914,20 +914,20 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_usbreg.c - nrfx_usbreg.c + packages\nrfx-latest\drivers\src\nrfx_uart.c + nrfx_uart.c 0 0 7 58 - 2 + 1 0 0 0 - packages\nrfx-latest\mdk\arm_startup_nrf52840.s - arm_startup_nrf52840.s + packages\nrfx-latest\drivers\src\nrfx_gpiote.c + nrfx_gpiote.c 0 0 @@ -938,8 +938,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_saadc.c - nrfx_saadc.c + packages\nrfx-latest\drivers\src\nrfx_systick.c + nrfx_systick.c 0 0 @@ -950,8 +950,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_wdt.c - nrfx_wdt.c + packages\nrfx-latest\drivers\src\nrfx_ipc.c + nrfx_ipc.c 0 0 @@ -962,8 +962,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_gpiote.c - nrfx_gpiote.c + packages\nrfx-latest\drivers\src\nrfx_pwm.c + nrfx_pwm.c 0 0 @@ -974,20 +974,20 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_spi.c - nrfx_spi.c + packages\nrfx-latest\drivers\src\nrfx_twi.c + nrfx_twi.c 0 0 7 63 - 1 + 2 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_twi_twim.c - nrfx_twi_twim.c + packages\nrfx-latest\mdk\arm_startup_nrf52840.s + arm_startup_nrf52840.s 0 0 @@ -998,8 +998,8 @@ 0 0 0 - packages\nrfx-latest\mdk\system_nrf52840.c - system_nrf52840.c + packages\nrfx-latest\drivers\src\nrfx_rtc.c + nrfx_rtc.c 0 0 @@ -1010,8 +1010,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_lpcomp.c - nrfx_lpcomp.c + packages\nrfx-latest\drivers\src\nrfx_twis.c + nrfx_twis.c 0 0 @@ -1022,8 +1022,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_qdec.c - nrfx_qdec.c + packages\nrfx-latest\drivers\src\nrfx_nfct.c + nrfx_nfct.c 0 0 @@ -1034,8 +1034,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_power.c - nrfx_power.c + packages\nrfx-latest\drivers\src\nrfx_usbreg.c + nrfx_usbreg.c 0 0 @@ -1046,8 +1046,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_uart.c - nrfx_uart.c + packages\nrfx-latest\drivers\src\nrfx_rng.c + nrfx_rng.c 0 0 @@ -1058,8 +1058,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_i2s.c - nrfx_i2s.c + packages\nrfx-latest\drivers\src\nrfx_wdt.c + nrfx_wdt.c 0 0 @@ -1070,6 +1070,90 @@ 0 0 0 + packages\nrfx-latest\drivers\src\nrfx_ppi.c + nrfx_ppi.c + 0 + 0 + + + 7 + 71 + 1 + 0 + 0 + 0 + packages\nrfx-latest\drivers\src\nrfx_saadc.c + nrfx_saadc.c + 0 + 0 + + + 7 + 72 + 1 + 0 + 0 + 0 + packages\nrfx-latest\drivers\src\nrfx_spi.c + nrfx_spi.c + 0 + 0 + + + 7 + 73 + 1 + 0 + 0 + 0 + packages\nrfx-latest\mdk\system_nrf52840.c + system_nrf52840.c + 0 + 0 + + + 7 + 74 + 1 + 0 + 0 + 0 + packages\nrfx-latest\drivers\src\nrfx_lpcomp.c + nrfx_lpcomp.c + 0 + 0 + + + 7 + 75 + 1 + 0 + 0 + 0 + packages\nrfx-latest\drivers\src\nrfx_twi_twim.c + nrfx_twi_twim.c + 0 + 0 + + + 7 + 76 + 1 + 0 + 0 + 0 + packages\nrfx-latest\drivers\src\nrfx_clock.c + nrfx_clock.c + 0 + 0 + + + 7 + 77 + 1 + 0 + 0 + 0 packages\nrfx-latest\drivers\src\nrfx_spim.c nrfx_spim.c 0 @@ -1077,13 +1161,49 @@ 7 - 71 + 78 1 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_qspi.c - nrfx_qspi.c + packages\nrfx-latest\drivers\src\nrfx_i2s.c + nrfx_i2s.c + 0 + 0 + + + 7 + 79 + 1 + 0 + 0 + 0 + packages\nrfx-latest\drivers\src\nrfx_uarte.c + nrfx_uarte.c + 0 + 0 + + + 7 + 80 + 1 + 0 + 0 + 0 + packages\nrfx-latest\drivers\src\nrfx_pdm.c + nrfx_pdm.c + 0 + 0 + + + 7 + 81 + 1 + 0 + 0 + 0 + packages\nrfx-latest\drivers\src\nrfx_timer.c + nrfx_timer.c 0 0 diff --git a/bsp/nrf5x/nrf52840/project.uvprojx b/bsp/nrf5x/nrf52840/project.uvprojx index be44fa7a0c..7646c98bf2 100644 --- a/bsp/nrf5x/nrf52840/project.uvprojx +++ b/bsp/nrf5x/nrf52840/project.uvprojx @@ -394,9 +394,9 @@ CPU - div0.c + backtrace.c 1 - ..\..\..\libcpu\arm\common\div0.c + ..\..\..\libcpu\arm\common\backtrace.c showmem.c @@ -404,9 +404,9 @@ ..\..\..\libcpu\arm\common\showmem.c - backtrace.c + div0.c 1 - ..\..\..\libcpu\arm\common\backtrace.c + ..\..\..\libcpu\arm\common\div0.c context_rvds.S @@ -434,19 +434,14 @@ ..\..\..\components\drivers\serial\serial.c - workqueue.c - 1 - ..\..\..\components\drivers\src\workqueue.c - - - ringbuffer.c + waitqueue.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\waitqueue.c - waitqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\workqueue.c completion.c @@ -458,6 +453,11 @@ 1 ..\..\..\components\drivers\src\dataqueue.c + + ringbuffer.c + 1 + ..\..\..\components\drivers\src\ringbuffer.c + ringblk_buf.c 1 @@ -494,64 +494,114 @@ finsh - shell.c + finsh_node.c 1 - ..\..\..\components\finsh\shell.c + ..\..\..\components\finsh\finsh_node.c - msh.c + finsh_parser.c 1 - ..\..\..\components\finsh\msh.c + ..\..\..\components\finsh\finsh_parser.c cmd.c 1 ..\..\..\components\finsh\cmd.c + + msh.c + 1 + ..\..\..\components\finsh\msh.c + + + finsh_vm.c + 1 + ..\..\..\components\finsh\finsh_vm.c + + + shell.c + 1 + ..\..\..\components\finsh\shell.c + + + finsh_var.c + 1 + ..\..\..\components\finsh\finsh_var.c + + + finsh_compiler.c + 1 + ..\..\..\components\finsh\finsh_compiler.c + + + finsh_heap.c + 1 + ..\..\..\components\finsh\finsh_heap.c + + + finsh_ops.c + 1 + ..\..\..\components\finsh\finsh_ops.c + + + finsh_error.c + 1 + ..\..\..\components\finsh\finsh_error.c + + + finsh_token.c + 1 + ..\..\..\components\finsh\finsh_token.c + + + finsh_init.c + 1 + ..\..\..\components\finsh\finsh_init.c + Kernel - thread.c + kservice.c 1 - ..\..\..\src\thread.c + ..\..\..\src\kservice.c - ipc.c + clock.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\clock.c - device.c + timer.c 1 - ..\..\..\src\device.c + ..\..\..\src\timer.c - object.c + scheduler.c 1 - ..\..\..\src\object.c + ..\..\..\src\scheduler.c - irq.c + device.c 1 - ..\..\..\src\irq.c + ..\..\..\src\device.c - scheduler.c + ipc.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\ipc.c - kservice.c + irq.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\irq.c - clock.c + object.c 1 - ..\..\..\src\clock.c + ..\..\..\src\object.c mempool.c @@ -564,9 +614,9 @@ ..\..\..\src\components.c - mem.c + thread.c 1 - ..\..\..\src\mem.c + ..\..\..\src\thread.c idle.c @@ -574,9 +624,9 @@ ..\..\..\src\idle.c - timer.c + mem.c 1 - ..\..\..\src\timer.c + ..\..\..\src\mem.c @@ -584,114 +634,114 @@ nrfx - nrfx_ppi.c + nrfx_qspi.c 1 - packages\nrfx-latest\drivers\src\nrfx_ppi.c + packages\nrfx-latest\drivers\src\nrfx_qspi.c - nrfx_twim.c + nrfx_spis.c 1 - packages\nrfx-latest\drivers\src\nrfx_twim.c + packages\nrfx-latest\drivers\src\nrfx_spis.c - nrfx_temp.c + nrfx_usbd.c 1 - packages\nrfx-latest\drivers\src\nrfx_temp.c + packages\nrfx-latest\drivers\src\nrfx_usbd.c - nrfx_rng.c + nrfx_qdec.c 1 - packages\nrfx-latest\drivers\src\nrfx_rng.c + packages\nrfx-latest\drivers\src\nrfx_qdec.c - nrfx_twi.c + nrfx_adc.c 1 - packages\nrfx-latest\drivers\src\nrfx_twi.c + packages\nrfx-latest\drivers\src\nrfx_adc.c - nrfx_spis.c + nrfx_power.c 1 - packages\nrfx-latest\drivers\src\nrfx_spis.c + packages\nrfx-latest\drivers\src\nrfx_power.c - nrfx_nfct.c + nrfx_egu.c 1 - packages\nrfx-latest\drivers\src\nrfx_nfct.c + packages\nrfx-latest\drivers\src\nrfx_egu.c - nrfx_usbd.c + nrfx_twim.c 1 - packages\nrfx-latest\drivers\src\nrfx_usbd.c + packages\nrfx-latest\drivers\src\nrfx_twim.c - nrfx_pwm.c + nrfx_nvmc.c 1 - packages\nrfx-latest\drivers\src\nrfx_pwm.c + packages\nrfx-latest\drivers\src\nrfx_nvmc.c - nrfx_egu.c + nrfx_temp.c 1 - packages\nrfx-latest\drivers\src\nrfx_egu.c + packages\nrfx-latest\drivers\src\nrfx_temp.c - nrfx_adc.c + nrfx_comp.c 1 - packages\nrfx-latest\drivers\src\nrfx_adc.c + packages\nrfx-latest\drivers\src\nrfx_comp.c - nrfx_uarte.c + nrfx_dppi.c 1 - packages\nrfx-latest\drivers\src\nrfx_uarte.c + packages\nrfx-latest\drivers\src\nrfx_dppi.c - nrfx_clock.c + nrfx_uart.c 1 - packages\nrfx-latest\drivers\src\nrfx_clock.c + packages\nrfx-latest\drivers\src\nrfx_uart.c - nrfx_pdm.c + nrfx_gpiote.c 1 - packages\nrfx-latest\drivers\src\nrfx_pdm.c + packages\nrfx-latest\drivers\src\nrfx_gpiote.c - nrfx_rtc.c + nrfx_systick.c 1 - packages\nrfx-latest\drivers\src\nrfx_rtc.c + packages\nrfx-latest\drivers\src\nrfx_systick.c - nrfx_dppi.c + nrfx_ipc.c 1 - packages\nrfx-latest\drivers\src\nrfx_dppi.c + packages\nrfx-latest\drivers\src\nrfx_ipc.c - nrfx_twis.c + nrfx_pwm.c 1 - packages\nrfx-latest\drivers\src\nrfx_twis.c + packages\nrfx-latest\drivers\src\nrfx_pwm.c - nrfx_ipc.c + nrfx_twi.c 1 - packages\nrfx-latest\drivers\src\nrfx_ipc.c + packages\nrfx-latest\drivers\src\nrfx_twi.c - nrfx_timer.c - 1 - packages\nrfx-latest\drivers\src\nrfx_timer.c + arm_startup_nrf52840.s + 2 + packages\nrfx-latest\mdk\arm_startup_nrf52840.s - nrfx_nvmc.c + nrfx_rtc.c 1 - packages\nrfx-latest\drivers\src\nrfx_nvmc.c + packages\nrfx-latest\drivers\src\nrfx_rtc.c - nrfx_comp.c + nrfx_twis.c 1 - packages\nrfx-latest\drivers\src\nrfx_comp.c + packages\nrfx-latest\drivers\src\nrfx_twis.c - nrfx_systick.c + nrfx_nfct.c 1 - packages\nrfx-latest\drivers\src\nrfx_systick.c + packages\nrfx-latest\drivers\src\nrfx_nfct.c nrfx_usbreg.c @@ -699,14 +749,9 @@ packages\nrfx-latest\drivers\src\nrfx_usbreg.c - arm_startup_nrf52840.s - 2 - packages\nrfx-latest\mdk\arm_startup_nrf52840.s - - - nrfx_saadc.c + nrfx_rng.c 1 - packages\nrfx-latest\drivers\src\nrfx_saadc.c + packages\nrfx-latest\drivers\src\nrfx_rng.c nrfx_wdt.c @@ -714,19 +759,19 @@ packages\nrfx-latest\drivers\src\nrfx_wdt.c - nrfx_gpiote.c + nrfx_ppi.c 1 - packages\nrfx-latest\drivers\src\nrfx_gpiote.c + packages\nrfx-latest\drivers\src\nrfx_ppi.c - nrfx_spi.c + nrfx_saadc.c 1 - packages\nrfx-latest\drivers\src\nrfx_spi.c + packages\nrfx-latest\drivers\src\nrfx_saadc.c - nrfx_twi_twim.c + nrfx_spi.c 1 - packages\nrfx-latest\drivers\src\nrfx_twi_twim.c + packages\nrfx-latest\drivers\src\nrfx_spi.c system_nrf52840.c @@ -739,19 +784,19 @@ packages\nrfx-latest\drivers\src\nrfx_lpcomp.c - nrfx_qdec.c + nrfx_twi_twim.c 1 - packages\nrfx-latest\drivers\src\nrfx_qdec.c + packages\nrfx-latest\drivers\src\nrfx_twi_twim.c - nrfx_power.c + nrfx_clock.c 1 - packages\nrfx-latest\drivers\src\nrfx_power.c + packages\nrfx-latest\drivers\src\nrfx_clock.c - nrfx_uart.c + nrfx_spim.c 1 - packages\nrfx-latest\drivers\src\nrfx_uart.c + packages\nrfx-latest\drivers\src\nrfx_spim.c nrfx_i2s.c @@ -759,14 +804,19 @@ packages\nrfx-latest\drivers\src\nrfx_i2s.c - nrfx_spim.c + nrfx_uarte.c 1 - packages\nrfx-latest\drivers\src\nrfx_spim.c + packages\nrfx-latest\drivers\src\nrfx_uarte.c - nrfx_qspi.c + nrfx_pdm.c 1 - packages\nrfx-latest\drivers\src\nrfx_qspi.c + packages\nrfx-latest\drivers\src\nrfx_pdm.c + + + nrfx_timer.c + 1 + packages\nrfx-latest\drivers\src\nrfx_timer.c diff --git a/bsp/nrf5x/nrf52840/rtconfig.h b/bsp/nrf5x/nrf52840/rtconfig.h index 7b387a4444..9d269d9391 100644 --- a/bsp/nrf5x/nrf52840/rtconfig.h +++ b/bsp/nrf5x/nrf52840/rtconfig.h @@ -11,7 +11,6 @@ #define RT_THREAD_PRIORITY_32 #define RT_THREAD_PRIORITY_MAX 32 #define RT_TICK_PER_SECOND 100 -#define RT_USING_OVERFLOW_CHECK #define RT_USING_HOOK #define RT_USING_IDLE_HOOK #define RT_IDLE_HOOK_LIST_SIZE 4 @@ -22,15 +21,12 @@ /* kservice optimization */ -#define RT_DEBUG /* Inter-Thread communication */ #define RT_USING_SEMAPHORE #define RT_USING_MUTEX #define RT_USING_EVENT -#define RT_USING_MAILBOX -#define RT_USING_MESSAGEQUEUE /* Memory Management */ @@ -69,7 +65,6 @@ #define FINSH_CMD_SIZE 80 #define FINSH_USING_MSH #define FINSH_USING_MSH_DEFAULT -#define FINSH_USING_MSH_ONLY #define FINSH_ARG_MAX 10 /* Device virtual file system */ @@ -171,27 +166,32 @@ #define SOC_NORDIC #define BSP_BOARD_PCA_10056 +/* Onboard Peripheral Drivers */ + +#define BSP_USING_JLINK_TO_USART + /* On-chip Peripheral Drivers */ #define BSP_USING_GPIO -#define NRFX_GPIOTE_ENABLED 1 #define BSP_USING_UART +#define NRFX_USING_UART #define BSP_USING_UART0 #define BSP_UART0_RX_PIN 8 #define BSP_UART0_TX_PIN 6 -/* On-chip flash config */ +/* MCU flash config */ #define MCU_FLASH_START_ADDRESS 0x00000000 #define MCU_FLASH_SIZE_KB 1024 #define MCU_SRAM_START_ADDRESS 0x20000000 #define MCU_SRAM_SIZE_KB 256 #define MCU_FLASH_PAGE_SIZE 0x1000 +#define BLE_STACK_USING_NULL #define NRFX_CLOCK_ENABLED 1 #define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY 7 #define NRFX_CLOCK_CONFIG_LF_SRC 1 -#define NRFX_USING_UART #define NRFX_UART_ENABLED 1 #define NRFX_UART0_ENABLED 1 +#define NRFX_GPIOTE_ENABLED 1 #endif -- cgit v1.3.1 From c2a06c0cfb6eab4a0e8d7696bb2dc531d9595ac1 Mon Sep 17 00:00:00 2001 From: supperthomas <78900636@qq.com> Date: Sat, 26 Jun 2021 18:47:31 +0800 Subject: [bsp/nrf5x] add the bsp ble_nano_33 --- bsp/nrf5x/libraries/drivers/drv_uart.c | 5 +- bsp/nrf5x/libraries/drivers/drv_uart.h | 1 - bsp/nrf5x/nrf52840/.config | 100 +++++----- bsp/nrf5x/nrf52840/Kconfig | 5 +- bsp/nrf5x/nrf52840/applications/application.c | 9 +- bsp/nrf5x/nrf52840/board/Kconfig | 17 +- bsp/nrf5x/nrf52840/board/board.c | 8 +- bsp/nrf5x/nrf52840/project.uvoptx | 258 +++++++++++++------------- bsp/nrf5x/nrf52840/project.uvprojx | 244 ++++++++++++------------ bsp/nrf5x/nrf52840/rtconfig.h | 69 +++---- 10 files changed, 364 insertions(+), 352 deletions(-) (limited to 'bsp/nrf5x') diff --git a/bsp/nrf5x/libraries/drivers/drv_uart.c b/bsp/nrf5x/libraries/drivers/drv_uart.c index 8ee6992f02..c0c50b736c 100644 --- a/bsp/nrf5x/libraries/drivers/drv_uart.c +++ b/bsp/nrf5x/libraries/drivers/drv_uart.c @@ -6,6 +6,7 @@ * Change Logs: * Date Author Notes * 2020-04-28 xckhmf Modify for + * 2021-06-26 supperthomas fix rt_hw_uart_init * */ #include @@ -236,7 +237,7 @@ static struct rt_uart_ops _uart_ops = { _uart_getc }; -void rt_hw_uart_init(void) +int rt_hw_uart_init(void) { struct serial_configure config = RT_SERIAL_CONFIG_DEFAULT; @@ -249,5 +250,5 @@ void rt_hw_uart_init(void) #endif /* BSP_USING_UART0 */ } - +INIT_BOARD_EXPORT(rt_hw_uart_init); #endif /* BSP_USING_UART */ diff --git a/bsp/nrf5x/libraries/drivers/drv_uart.h b/bsp/nrf5x/libraries/drivers/drv_uart.h index da37eff016..bdffc4463c 100644 --- a/bsp/nrf5x/libraries/drivers/drv_uart.h +++ b/bsp/nrf5x/libraries/drivers/drv_uart.h @@ -13,7 +13,6 @@ // #define USE_UART0_1 0 -void rt_hw_uart_init(void); #endif diff --git a/bsp/nrf5x/nrf52840/.config b/bsp/nrf5x/nrf52840/.config index 9612d30606..1f53828ede 100644 --- a/bsp/nrf5x/nrf52840/.config +++ b/bsp/nrf5x/nrf52840/.config @@ -3,6 +3,57 @@ # RT-Thread Configuration # +# +# Hardware Drivers Config +# +CONFIG_SOC_NRF52840=y +CONFIG_SOC_NORDIC=y +CONFIG_BSP_BOARD_PCA_10056=y +# CONFIG_BSP_BOARD_ARDUINO_NANO_33_BLE is not set + +# +# Onboard Peripheral Drivers +# +CONFIG_BSP_USING_JLINK_TO_USART=y +CONFIG_RT_BSP_LED_PIN=13 +# CONFIG_BSP_USING_QSPI_FLASH is not set + +# +# On-chip Peripheral Drivers +# +CONFIG_BSP_USING_GPIO=y +CONFIG_BSP_USING_UART=y +CONFIG_NRFX_USING_UART=y +# CONFIG_NRFX_USING_UARTE is not set +CONFIG_BSP_USING_UART0=y +CONFIG_BSP_UART0_RX_PIN=8 +CONFIG_BSP_UART0_TX_PIN=6 +# CONFIG_BSP_USING_SAADC is not set +# CONFIG_BSP_USING_I2C is not set +# CONFIG_BSP_USING_SPI is not set +# CONFIG_BSP_USING_PWM is not set +# CONFIG_BSP_USING_WDT is not set +# CONFIG_BSP_USING_ONCHIP_RTC is not set +# CONFIG_BSP_USING_ON_CHIP_FLASH is not set + +# +# MCU flash config +# +CONFIG_MCU_FLASH_START_ADDRESS=0x00000000 +CONFIG_MCU_FLASH_SIZE_KB=1024 +CONFIG_MCU_SRAM_START_ADDRESS=0x20000000 +CONFIG_MCU_SRAM_SIZE_KB=256 +CONFIG_MCU_FLASH_PAGE_SIZE=0x1000 +CONFIG_BLE_STACK_USING_NULL=y +# CONFIG_BSP_USING_SOFTDEVICE is not set +# CONFIG_BSP_USING_NIMBLE is not set +CONFIG_NRFX_CLOCK_ENABLED=1 +CONFIG_NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY=7 +CONFIG_NRFX_CLOCK_CONFIG_LF_SRC=1 +CONFIG_NRFX_UART_ENABLED=1 +CONFIG_NRFX_UART0_ENABLED=1 +CONFIG_NRFX_GPIOTE_ENABLED=1 + # # RT-Thread Kernel # @@ -541,52 +592,3 @@ CONFIG_PKG_NRFX_VER="latest" # CONFIG_PKG_USING_STATE_MACHINE is not set # CONFIG_PKG_USING_MCURSES is not set # CONFIG_PKG_USING_COWSAY is not set - -# -# Hardware Drivers Config -# -CONFIG_SOC_NRF52840=y -CONFIG_SOC_NORDIC=y -CONFIG_BSP_BOARD_PCA_10056=y - -# -# Onboard Peripheral Drivers -# -CONFIG_BSP_USING_JLINK_TO_USART=y -# CONFIG_BSP_USING_QSPI_FLASH is not set - -# -# On-chip Peripheral Drivers -# -CONFIG_BSP_USING_GPIO=y -CONFIG_BSP_USING_UART=y -CONFIG_NRFX_USING_UART=y -# CONFIG_NRFX_USING_UARTE is not set -CONFIG_BSP_USING_UART0=y -CONFIG_BSP_UART0_RX_PIN=8 -CONFIG_BSP_UART0_TX_PIN=6 -# CONFIG_BSP_USING_SAADC is not set -# CONFIG_BSP_USING_I2C is not set -# CONFIG_BSP_USING_SPI is not set -# CONFIG_BSP_USING_PWM is not set -# CONFIG_BSP_USING_WDT is not set -# CONFIG_BSP_USING_ONCHIP_RTC is not set -# CONFIG_BSP_USING_ON_CHIP_FLASH is not set - -# -# MCU flash config -# -CONFIG_MCU_FLASH_START_ADDRESS=0x00000000 -CONFIG_MCU_FLASH_SIZE_KB=1024 -CONFIG_MCU_SRAM_START_ADDRESS=0x20000000 -CONFIG_MCU_SRAM_SIZE_KB=256 -CONFIG_MCU_FLASH_PAGE_SIZE=0x1000 -CONFIG_BLE_STACK_USING_NULL=y -# CONFIG_BSP_USING_SOFTDEVICE is not set -# CONFIG_BSP_USING_NIMBLE is not set -CONFIG_NRFX_CLOCK_ENABLED=1 -CONFIG_NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY=7 -CONFIG_NRFX_CLOCK_CONFIG_LF_SRC=1 -CONFIG_NRFX_UART_ENABLED=1 -CONFIG_NRFX_UART0_ENABLED=1 -CONFIG_NRFX_GPIOTE_ENABLED=1 diff --git a/bsp/nrf5x/nrf52840/Kconfig b/bsp/nrf5x/nrf52840/Kconfig index 3640eaa0ed..56d486baed 100644 --- a/bsp/nrf5x/nrf52840/Kconfig +++ b/bsp/nrf5x/nrf52840/Kconfig @@ -14,8 +14,9 @@ config PKGS_DIR string option env="PKGS_ROOT" default "packages" - + +source "board/Kconfig" source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" -source "board/Kconfig" + diff --git a/bsp/nrf5x/nrf52840/applications/application.c b/bsp/nrf5x/nrf52840/applications/application.c index f2cae69ed1..791e2af007 100644 --- a/bsp/nrf5x/nrf52840/applications/application.c +++ b/bsp/nrf5x/nrf52840/applications/application.c @@ -6,25 +6,24 @@ * Change Logs: * Date Author Notes * 2020-04-29 supperthomas first version + * 2021-06-26 supperthomas fix led * */ #include #include -#define DK_BOARD_LED_1 13 -#define DK_BOARD_LED_2 14 int main(void) { int count = 1; - rt_pin_mode(DK_BOARD_LED_1, PIN_MODE_OUTPUT); + rt_pin_mode(RT_BSP_LED_PIN, PIN_MODE_OUTPUT); while (count++) { - rt_pin_write(DK_BOARD_LED_1, PIN_HIGH); + rt_pin_write(RT_BSP_LED_PIN, PIN_HIGH); rt_thread_mdelay(500); - rt_pin_write(DK_BOARD_LED_1, PIN_LOW); + rt_pin_write(RT_BSP_LED_PIN, PIN_LOW); rt_thread_mdelay(500); } return RT_EOK; diff --git a/bsp/nrf5x/nrf52840/board/Kconfig b/bsp/nrf5x/nrf52840/board/Kconfig index 8a2fe7d49d..0a332f8bf0 100644 --- a/bsp/nrf5x/nrf52840/board/Kconfig +++ b/bsp/nrf5x/nrf52840/board/Kconfig @@ -15,19 +15,32 @@ choice default BSP_BOARD_PCA_10056 config BSP_BOARD_PCA_10056 + select BSP_USING_UART + select BSP_USING_UART0 bool "NRF52840 pca10056 " - + + config BSP_BOARD_ARDUINO_NANO_33_BLE + bool "Arduino Nano 33 BLE (Sense)" endchoice menu "Onboard Peripheral Drivers" config BSP_USING_JLINK_TO_USART bool "Enable JLINK TO USART (uart0|RX_PIN:8|TX_PIN:6)" default y + depends on BSP_BOARD_PCA_10056 + + config RT_BSP_LED_PIN + int + default 13 if BSP_BOARD_PCA_10056 + default 16 if BSP_BOARD_ARDUINO_NANO_33_BLE + depends on BSP_USING_GPIO + menuconfig BSP_USING_QSPI_FLASH select PKG_USING_FAL bool "Enable QSPI FLASH(MX25R64 8MB)" default n + depends on BSP_BOARD_PCA_10056 if BSP_USING_QSPI_FLASH config NRFX_QSPI_ENABLED @@ -89,8 +102,6 @@ menu "On-chip Peripheral Drivers" endchoice endif if BSP_USING_UART&&NRFX_USING_UART - - config BSP_USING_UART0 bool "Enable UART0" default y diff --git a/bsp/nrf5x/nrf52840/board/board.c b/bsp/nrf5x/nrf52840/board/board.c index 2cb94fb6fa..961a027e95 100644 --- a/bsp/nrf5x/nrf52840/board/board.c +++ b/bsp/nrf5x/nrf52840/board/board.c @@ -6,6 +6,7 @@ * Change Logs: * Date Author Notes * 2020-04-29 supperthomas first version + * 2020-04-29 supperthomas fix component init * */ #include @@ -60,17 +61,14 @@ void rt_hw_board_init(void) rt_system_heap_init((void *)HEAP_BEGIN, (void *)HEAP_END); #endif -#ifdef RT_USING_SERIAL - rt_hw_uart_init(); +#ifdef RT_USING_COMPONENTS_INIT + rt_components_board_init(); #endif #ifdef RT_USING_CONSOLE rt_console_set_device(RT_CONSOLE_DEVICE_NAME); #endif -#ifdef RT_USING_COMPONENTS_INIT - rt_components_board_init(); -#endif #ifdef BSP_USING_SOFTDEVICE extern uint32_t Image$$RW_IRAM1$$Base; diff --git a/bsp/nrf5x/nrf52840/project.uvoptx b/bsp/nrf5x/nrf52840/project.uvoptx index 232521460c..7bc32642ff 100644 --- a/bsp/nrf5x/nrf52840/project.uvoptx +++ b/bsp/nrf5x/nrf52840/project.uvoptx @@ -73,7 +73,7 @@ 0 - 1 + 0 0 1 @@ -183,7 +183,7 @@ Applications - 1 + 0 0 0 0 @@ -214,8 +214,8 @@ 0 0 0 - ..\..\..\libcpu\arm\common\backtrace.c - backtrace.c + ..\..\..\libcpu\arm\common\showmem.c + showmem.c 0 0 @@ -226,8 +226,8 @@ 0 0 0 - ..\..\..\libcpu\arm\common\showmem.c - showmem.c + ..\..\..\libcpu\arm\common\div0.c + div0.c 0 0 @@ -238,32 +238,32 @@ 0 0 0 - ..\..\..\libcpu\arm\common\div0.c - div0.c + ..\..\..\libcpu\arm\common\backtrace.c + backtrace.c 0 0 2 5 - 2 + 1 0 0 0 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S - context_rvds.S + ..\..\..\libcpu\arm\cortex-m4\cpuport.c + cpuport.c 0 0 2 6 - 1 + 2 0 0 0 - ..\..\..\libcpu\arm\cortex-m4\cpuport.c - cpuport.c + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + context_rvds.S 0 0 @@ -306,8 +306,8 @@ 0 0 0 - ..\..\..\components\drivers\src\waitqueue.c - waitqueue.c + ..\..\..\components\drivers\src\workqueue.c + workqueue.c 0 0 @@ -318,8 +318,8 @@ 0 0 0 - ..\..\..\components\drivers\src\workqueue.c - workqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c + ringblk_buf.c 0 0 @@ -342,8 +342,8 @@ 0 0 0 - ..\..\..\components\drivers\src\dataqueue.c - dataqueue.c + ..\..\..\components\drivers\src\waitqueue.c + waitqueue.c 0 0 @@ -354,8 +354,8 @@ 0 0 0 - ..\..\..\components\drivers\src\ringbuffer.c - ringbuffer.c + ..\..\..\components\drivers\src\pipe.c + pipe.c 0 0 @@ -366,8 +366,8 @@ 0 0 0 - ..\..\..\components\drivers\src\ringblk_buf.c - ringblk_buf.c + ..\..\..\components\drivers\src\dataqueue.c + dataqueue.c 0 0 @@ -378,8 +378,8 @@ 0 0 0 - ..\..\..\components\drivers\src\pipe.c - pipe.c + ..\..\..\components\drivers\src\ringbuffer.c + ringbuffer.c 0 0 @@ -387,7 +387,7 @@ Drivers - 1 + 0 0 0 0 @@ -442,8 +442,8 @@ 0 0 0 - ..\..\..\components\finsh\finsh_node.c - finsh_node.c + ..\..\..\components\finsh\finsh_vm.c + finsh_vm.c 0 0 @@ -454,8 +454,8 @@ 0 0 0 - ..\..\..\components\finsh\finsh_parser.c - finsh_parser.c + ..\..\..\components\finsh\msh.c + msh.c 0 0 @@ -466,8 +466,8 @@ 0 0 0 - ..\..\..\components\finsh\cmd.c - cmd.c + ..\..\..\components\finsh\finsh_parser.c + finsh_parser.c 0 0 @@ -478,8 +478,8 @@ 0 0 0 - ..\..\..\components\finsh\msh.c - msh.c + ..\..\..\components\finsh\cmd.c + cmd.c 0 0 @@ -490,8 +490,8 @@ 0 0 0 - ..\..\..\components\finsh\finsh_vm.c - finsh_vm.c + ..\..\..\components\finsh\finsh_node.c + finsh_node.c 0 0 @@ -606,8 +606,8 @@ 0 0 0 - ..\..\..\src\kservice.c - kservice.c + ..\..\..\src\scheduler.c + scheduler.c 0 0 @@ -618,8 +618,8 @@ 0 0 0 - ..\..\..\src\clock.c - clock.c + ..\..\..\src\device.c + device.c 0 0 @@ -630,8 +630,8 @@ 0 0 0 - ..\..\..\src\timer.c - timer.c + ..\..\..\src\kservice.c + kservice.c 0 0 @@ -642,8 +642,8 @@ 0 0 0 - ..\..\..\src\scheduler.c - scheduler.c + ..\..\..\src\mem.c + mem.c 0 0 @@ -654,8 +654,8 @@ 0 0 0 - ..\..\..\src\device.c - device.c + ..\..\..\src\clock.c + clock.c 0 0 @@ -666,8 +666,8 @@ 0 0 0 - ..\..\..\src\ipc.c - ipc.c + ..\..\..\src\timer.c + timer.c 0 0 @@ -690,8 +690,8 @@ 0 0 0 - ..\..\..\src\object.c - object.c + ..\..\..\src\ipc.c + ipc.c 0 0 @@ -714,8 +714,8 @@ 0 0 0 - ..\..\..\src\components.c - components.c + ..\..\..\src\object.c + object.c 0 0 @@ -738,8 +738,8 @@ 0 0 0 - ..\..\..\src\idle.c - idle.c + ..\..\..\src\components.c + components.c 0 0 @@ -750,8 +750,8 @@ 0 0 0 - ..\..\..\src\mem.c - mem.c + ..\..\..\src\idle.c + idle.c 0 0 @@ -770,8 +770,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_qspi.c - nrfx_qspi.c + packages\nrfx-latest\drivers\src\nrfx_qdec.c + nrfx_qdec.c 0 0 @@ -782,8 +782,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_spis.c - nrfx_spis.c + packages\nrfx-latest\drivers\src\nrfx_systick.c + nrfx_systick.c 0 0 @@ -794,8 +794,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_usbd.c - nrfx_usbd.c + packages\nrfx-latest\drivers\src\nrfx_dppi.c + nrfx_dppi.c 0 0 @@ -806,8 +806,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_qdec.c - nrfx_qdec.c + packages\nrfx-latest\drivers\src\nrfx_pdm.c + nrfx_pdm.c 0 0 @@ -818,8 +818,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_adc.c - nrfx_adc.c + packages\nrfx-latest\drivers\src\nrfx_ipc.c + nrfx_ipc.c 0 0 @@ -830,8 +830,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_power.c - nrfx_power.c + packages\nrfx-latest\drivers\src\nrfx_twi_twim.c + nrfx_twi_twim.c 0 0 @@ -854,8 +854,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_twim.c - nrfx_twim.c + packages\nrfx-latest\drivers\src\nrfx_qspi.c + nrfx_qspi.c 0 0 @@ -866,8 +866,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_nvmc.c - nrfx_nvmc.c + packages\nrfx-latest\drivers\src\nrfx_spis.c + nrfx_spis.c 0 0 @@ -878,8 +878,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_temp.c - nrfx_temp.c + packages\nrfx-latest\drivers\src\nrfx_lpcomp.c + nrfx_lpcomp.c 0 0 @@ -890,8 +890,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_comp.c - nrfx_comp.c + packages\nrfx-latest\drivers\src\nrfx_temp.c + nrfx_temp.c 0 0 @@ -902,8 +902,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_dppi.c - nrfx_dppi.c + packages\nrfx-latest\drivers\src\nrfx_wdt.c + nrfx_wdt.c 0 0 @@ -914,20 +914,20 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_uart.c - nrfx_uart.c + packages\nrfx-latest\drivers\src\nrfx_twim.c + nrfx_twim.c 0 0 7 58 - 1 + 2 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_gpiote.c - nrfx_gpiote.c + packages\nrfx-latest\mdk\arm_startup_nrf52840.s + arm_startup_nrf52840.s 0 0 @@ -938,8 +938,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_systick.c - nrfx_systick.c + packages\nrfx-latest\drivers\src\nrfx_power.c + nrfx_power.c 0 0 @@ -950,8 +950,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_ipc.c - nrfx_ipc.c + packages\nrfx-latest\drivers\src\nrfx_timer.c + nrfx_timer.c 0 0 @@ -962,8 +962,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_pwm.c - nrfx_pwm.c + packages\nrfx-latest\drivers\src\nrfx_nvmc.c + nrfx_nvmc.c 0 0 @@ -974,20 +974,20 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_twi.c - nrfx_twi.c + packages\nrfx-latest\drivers\src\nrfx_ppi.c + nrfx_ppi.c 0 0 7 63 - 2 + 1 0 0 0 - packages\nrfx-latest\mdk\arm_startup_nrf52840.s - arm_startup_nrf52840.s + packages\nrfx-latest\drivers\src\nrfx_spim.c + nrfx_spim.c 0 0 @@ -998,8 +998,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_rtc.c - nrfx_rtc.c + packages\nrfx-latest\drivers\src\nrfx_comp.c + nrfx_comp.c 0 0 @@ -1010,8 +1010,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_twis.c - nrfx_twis.c + packages\nrfx-latest\drivers\src\nrfx_rtc.c + nrfx_rtc.c 0 0 @@ -1022,8 +1022,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_nfct.c - nrfx_nfct.c + packages\nrfx-latest\drivers\src\nrfx_twi.c + nrfx_twi.c 0 0 @@ -1046,8 +1046,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_rng.c - nrfx_rng.c + packages\nrfx-latest\drivers\src\nrfx_clock.c + nrfx_clock.c 0 0 @@ -1058,8 +1058,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_wdt.c - nrfx_wdt.c + packages\nrfx-latest\drivers\src\nrfx_i2s.c + nrfx_i2s.c 0 0 @@ -1070,8 +1070,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_ppi.c - nrfx_ppi.c + packages\nrfx-latest\drivers\src\nrfx_twis.c + nrfx_twis.c 0 0 @@ -1082,8 +1082,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_saadc.c - nrfx_saadc.c + packages\nrfx-latest\drivers\src\nrfx_adc.c + nrfx_adc.c 0 0 @@ -1094,8 +1094,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_spi.c - nrfx_spi.c + packages\nrfx-latest\drivers\src\nrfx_rng.c + nrfx_rng.c 0 0 @@ -1106,8 +1106,8 @@ 0 0 0 - packages\nrfx-latest\mdk\system_nrf52840.c - system_nrf52840.c + packages\nrfx-latest\drivers\src\nrfx_usbd.c + nrfx_usbd.c 0 0 @@ -1118,8 +1118,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_lpcomp.c - nrfx_lpcomp.c + packages\nrfx-latest\drivers\src\nrfx_uart.c + nrfx_uart.c 0 0 @@ -1130,8 +1130,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_twi_twim.c - nrfx_twi_twim.c + packages\nrfx-latest\mdk\system_nrf52840.c + system_nrf52840.c 0 0 @@ -1142,8 +1142,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_clock.c - nrfx_clock.c + packages\nrfx-latest\drivers\src\nrfx_saadc.c + nrfx_saadc.c 0 0 @@ -1154,8 +1154,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_spim.c - nrfx_spim.c + packages\nrfx-latest\drivers\src\nrfx_nfct.c + nrfx_nfct.c 0 0 @@ -1166,8 +1166,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_i2s.c - nrfx_i2s.c + packages\nrfx-latest\drivers\src\nrfx_gpiote.c + nrfx_gpiote.c 0 0 @@ -1178,8 +1178,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_uarte.c - nrfx_uarte.c + packages\nrfx-latest\drivers\src\nrfx_spi.c + nrfx_spi.c 0 0 @@ -1190,8 +1190,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_pdm.c - nrfx_pdm.c + packages\nrfx-latest\drivers\src\nrfx_uarte.c + nrfx_uarte.c 0 0 @@ -1202,8 +1202,8 @@ 0 0 0 - packages\nrfx-latest\drivers\src\nrfx_timer.c - nrfx_timer.c + packages\nrfx-latest\drivers\src\nrfx_pwm.c + nrfx_pwm.c 0 0 diff --git a/bsp/nrf5x/nrf52840/project.uvprojx b/bsp/nrf5x/nrf52840/project.uvprojx index 7646c98bf2..69017ec490 100644 --- a/bsp/nrf5x/nrf52840/project.uvprojx +++ b/bsp/nrf5x/nrf52840/project.uvprojx @@ -10,7 +10,7 @@ rtthread 0x4 ARM-ADS - 5060960::V5.06 update 7 (build 960)::ARMCC + 5060422::V5.06 update 4 (build 422)::ARMCC 0 @@ -339,7 +339,7 @@ --reduce_paths NRF52840_XXAA, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND - applications;.;..\libraries\cmsis\include;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;..\libraries\drivers;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\none-gcc;packages\nrfx-latest;packages\nrfx-latest\drivers;packages\nrfx-latest\drivers\include;packages\nrfx-latest\mdk;packages\nrfx-latest\hal;..\..\..\examples\utest\testcases\kernel + applications;.;..\libraries\cmsis\include;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m4;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;..\libraries\drivers;..\..\..\components\finsh;.;..\..\..\include;..\..\..\components\libc\compilers\common;..\..\..\components\libc\compilers\common\none-gcc;packages\nrfx-latest;packages\nrfx-latest\drivers;packages\nrfx-latest\drivers\include;packages\nrfx-latest\mdk;packages\nrfx-latest\hal;packages\SEGGER_RTT-v1.1.0;packages\SEGGER_RTT-v1.1.0\RTT;..\..\..\examples\utest\testcases\kernel @@ -393,11 +393,6 @@ CPU - - backtrace.c - 1 - ..\..\..\libcpu\arm\common\backtrace.c - showmem.c 1 @@ -409,15 +404,20 @@ ..\..\..\libcpu\arm\common\div0.c - context_rvds.S - 2 - ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + backtrace.c + 1 + ..\..\..\libcpu\arm\common\backtrace.c cpuport.c 1 ..\..\..\libcpu\arm\cortex-m4\cpuport.c + + context_rvds.S + 2 + ..\..\..\libcpu\arm\cortex-m4\context_rvds.S + @@ -434,14 +434,14 @@ ..\..\..\components\drivers\serial\serial.c - waitqueue.c + workqueue.c 1 - ..\..\..\components\drivers\src\waitqueue.c + ..\..\..\components\drivers\src\workqueue.c - workqueue.c + ringblk_buf.c 1 - ..\..\..\components\drivers\src\workqueue.c + ..\..\..\components\drivers\src\ringblk_buf.c completion.c @@ -449,24 +449,24 @@ ..\..\..\components\drivers\src\completion.c - dataqueue.c + waitqueue.c 1 - ..\..\..\components\drivers\src\dataqueue.c + ..\..\..\components\drivers\src\waitqueue.c - ringbuffer.c + pipe.c 1 - ..\..\..\components\drivers\src\ringbuffer.c + ..\..\..\components\drivers\src\pipe.c - ringblk_buf.c + dataqueue.c 1 - ..\..\..\components\drivers\src\ringblk_buf.c + ..\..\..\components\drivers\src\dataqueue.c - pipe.c + ringbuffer.c 1 - ..\..\..\components\drivers\src\pipe.c + ..\..\..\components\drivers\src\ringbuffer.c @@ -494,9 +494,14 @@ finsh - finsh_node.c + finsh_vm.c 1 - ..\..\..\components\finsh\finsh_node.c + ..\..\..\components\finsh\finsh_vm.c + + + msh.c + 1 + ..\..\..\components\finsh\msh.c finsh_parser.c @@ -509,14 +514,9 @@ ..\..\..\components\finsh\cmd.c - msh.c - 1 - ..\..\..\components\finsh\msh.c - - - finsh_vm.c + finsh_node.c 1 - ..\..\..\components\finsh\finsh_vm.c + ..\..\..\components\finsh\finsh_node.c shell.c @@ -564,34 +564,34 @@ Kernel - kservice.c + scheduler.c 1 - ..\..\..\src\kservice.c + ..\..\..\src\scheduler.c - clock.c + device.c 1 - ..\..\..\src\clock.c + ..\..\..\src\device.c - timer.c + kservice.c 1 - ..\..\..\src\timer.c + ..\..\..\src\kservice.c - scheduler.c + mem.c 1 - ..\..\..\src\scheduler.c + ..\..\..\src\mem.c - device.c + clock.c 1 - ..\..\..\src\device.c + ..\..\..\src\clock.c - ipc.c + timer.c 1 - ..\..\..\src\ipc.c + ..\..\..\src\timer.c irq.c @@ -599,9 +599,9 @@ ..\..\..\src\irq.c - object.c + ipc.c 1 - ..\..\..\src\object.c + ..\..\..\src\ipc.c mempool.c @@ -609,9 +609,9 @@ ..\..\..\src\mempool.c - components.c + object.c 1 - ..\..\..\src\components.c + ..\..\..\src\object.c thread.c @@ -619,14 +619,14 @@ ..\..\..\src\thread.c - idle.c + components.c 1 - ..\..\..\src\idle.c + ..\..\..\src\components.c - mem.c + idle.c 1 - ..\..\..\src\mem.c + ..\..\..\src\idle.c @@ -634,34 +634,34 @@ nrfx - nrfx_qspi.c + nrfx_qdec.c 1 - packages\nrfx-latest\drivers\src\nrfx_qspi.c + packages\nrfx-latest\drivers\src\nrfx_qdec.c - nrfx_spis.c + nrfx_systick.c 1 - packages\nrfx-latest\drivers\src\nrfx_spis.c + packages\nrfx-latest\drivers\src\nrfx_systick.c - nrfx_usbd.c + nrfx_dppi.c 1 - packages\nrfx-latest\drivers\src\nrfx_usbd.c + packages\nrfx-latest\drivers\src\nrfx_dppi.c - nrfx_qdec.c + nrfx_pdm.c 1 - packages\nrfx-latest\drivers\src\nrfx_qdec.c + packages\nrfx-latest\drivers\src\nrfx_pdm.c - nrfx_adc.c + nrfx_ipc.c 1 - packages\nrfx-latest\drivers\src\nrfx_adc.c + packages\nrfx-latest\drivers\src\nrfx_ipc.c - nrfx_power.c + nrfx_twi_twim.c 1 - packages\nrfx-latest\drivers\src\nrfx_power.c + packages\nrfx-latest\drivers\src\nrfx_twi_twim.c nrfx_egu.c @@ -669,14 +669,19 @@ packages\nrfx-latest\drivers\src\nrfx_egu.c - nrfx_twim.c + nrfx_qspi.c 1 - packages\nrfx-latest\drivers\src\nrfx_twim.c + packages\nrfx-latest\drivers\src\nrfx_qspi.c - nrfx_nvmc.c + nrfx_spis.c 1 - packages\nrfx-latest\drivers\src\nrfx_nvmc.c + packages\nrfx-latest\drivers\src\nrfx_spis.c + + + nrfx_lpcomp.c + 1 + packages\nrfx-latest\drivers\src\nrfx_lpcomp.c nrfx_temp.c @@ -684,49 +689,49 @@ packages\nrfx-latest\drivers\src\nrfx_temp.c - nrfx_comp.c + nrfx_wdt.c 1 - packages\nrfx-latest\drivers\src\nrfx_comp.c + packages\nrfx-latest\drivers\src\nrfx_wdt.c - nrfx_dppi.c + nrfx_twim.c 1 - packages\nrfx-latest\drivers\src\nrfx_dppi.c + packages\nrfx-latest\drivers\src\nrfx_twim.c - nrfx_uart.c - 1 - packages\nrfx-latest\drivers\src\nrfx_uart.c + arm_startup_nrf52840.s + 2 + packages\nrfx-latest\mdk\arm_startup_nrf52840.s - nrfx_gpiote.c + nrfx_power.c 1 - packages\nrfx-latest\drivers\src\nrfx_gpiote.c + packages\nrfx-latest\drivers\src\nrfx_power.c - nrfx_systick.c + nrfx_timer.c 1 - packages\nrfx-latest\drivers\src\nrfx_systick.c + packages\nrfx-latest\drivers\src\nrfx_timer.c - nrfx_ipc.c + nrfx_nvmc.c 1 - packages\nrfx-latest\drivers\src\nrfx_ipc.c + packages\nrfx-latest\drivers\src\nrfx_nvmc.c - nrfx_pwm.c + nrfx_ppi.c 1 - packages\nrfx-latest\drivers\src\nrfx_pwm.c + packages\nrfx-latest\drivers\src\nrfx_ppi.c - nrfx_twi.c + nrfx_spim.c 1 - packages\nrfx-latest\drivers\src\nrfx_twi.c + packages\nrfx-latest\drivers\src\nrfx_spim.c - arm_startup_nrf52840.s - 2 - packages\nrfx-latest\mdk\arm_startup_nrf52840.s + nrfx_comp.c + 1 + packages\nrfx-latest\drivers\src\nrfx_comp.c nrfx_rtc.c @@ -734,14 +739,9 @@ packages\nrfx-latest\drivers\src\nrfx_rtc.c - nrfx_twis.c - 1 - packages\nrfx-latest\drivers\src\nrfx_twis.c - - - nrfx_nfct.c + nrfx_twi.c 1 - packages\nrfx-latest\drivers\src\nrfx_nfct.c + packages\nrfx-latest\drivers\src\nrfx_twi.c nrfx_usbreg.c @@ -749,74 +749,74 @@ packages\nrfx-latest\drivers\src\nrfx_usbreg.c - nrfx_rng.c + nrfx_clock.c 1 - packages\nrfx-latest\drivers\src\nrfx_rng.c + packages\nrfx-latest\drivers\src\nrfx_clock.c - nrfx_wdt.c + nrfx_i2s.c 1 - packages\nrfx-latest\drivers\src\nrfx_wdt.c + packages\nrfx-latest\drivers\src\nrfx_i2s.c - nrfx_ppi.c + nrfx_twis.c 1 - packages\nrfx-latest\drivers\src\nrfx_ppi.c + packages\nrfx-latest\drivers\src\nrfx_twis.c - nrfx_saadc.c + nrfx_adc.c 1 - packages\nrfx-latest\drivers\src\nrfx_saadc.c + packages\nrfx-latest\drivers\src\nrfx_adc.c - nrfx_spi.c + nrfx_rng.c 1 - packages\nrfx-latest\drivers\src\nrfx_spi.c + packages\nrfx-latest\drivers\src\nrfx_rng.c - system_nrf52840.c + nrfx_usbd.c 1 - packages\nrfx-latest\mdk\system_nrf52840.c + packages\nrfx-latest\drivers\src\nrfx_usbd.c - nrfx_lpcomp.c + nrfx_uart.c 1 - packages\nrfx-latest\drivers\src\nrfx_lpcomp.c + packages\nrfx-latest\drivers\src\nrfx_uart.c - nrfx_twi_twim.c + system_nrf52840.c 1 - packages\nrfx-latest\drivers\src\nrfx_twi_twim.c + packages\nrfx-latest\mdk\system_nrf52840.c - nrfx_clock.c + nrfx_saadc.c 1 - packages\nrfx-latest\drivers\src\nrfx_clock.c + packages\nrfx-latest\drivers\src\nrfx_saadc.c - nrfx_spim.c + nrfx_nfct.c 1 - packages\nrfx-latest\drivers\src\nrfx_spim.c + packages\nrfx-latest\drivers\src\nrfx_nfct.c - nrfx_i2s.c + nrfx_gpiote.c 1 - packages\nrfx-latest\drivers\src\nrfx_i2s.c + packages\nrfx-latest\drivers\src\nrfx_gpiote.c - nrfx_uarte.c + nrfx_spi.c 1 - packages\nrfx-latest\drivers\src\nrfx_uarte.c + packages\nrfx-latest\drivers\src\nrfx_spi.c - nrfx_pdm.c + nrfx_uarte.c 1 - packages\nrfx-latest\drivers\src\nrfx_pdm.c + packages\nrfx-latest\drivers\src\nrfx_uarte.c - nrfx_timer.c + nrfx_pwm.c 1 - packages\nrfx-latest\drivers\src\nrfx_timer.c + packages\nrfx-latest\drivers\src\nrfx_pwm.c diff --git a/bsp/nrf5x/nrf52840/rtconfig.h b/bsp/nrf5x/nrf52840/rtconfig.h index 9d269d9391..df606fc98e 100644 --- a/bsp/nrf5x/nrf52840/rtconfig.h +++ b/bsp/nrf5x/nrf52840/rtconfig.h @@ -4,6 +4,41 @@ /* Automatically generated file; DO NOT EDIT. */ /* RT-Thread Configuration */ +/* Hardware Drivers Config */ + +#define SOC_NRF52840 +#define SOC_NORDIC +#define BSP_BOARD_PCA_10056 + +/* Onboard Peripheral Drivers */ + +#define BSP_USING_JLINK_TO_USART +#define RT_BSP_LED_PIN 13 + +/* On-chip Peripheral Drivers */ + +#define BSP_USING_GPIO +#define BSP_USING_UART +#define NRFX_USING_UART +#define BSP_USING_UART0 +#define BSP_UART0_RX_PIN 8 +#define BSP_UART0_TX_PIN 6 + +/* MCU flash config */ + +#define MCU_FLASH_START_ADDRESS 0x00000000 +#define MCU_FLASH_SIZE_KB 1024 +#define MCU_SRAM_START_ADDRESS 0x20000000 +#define MCU_SRAM_SIZE_KB 256 +#define MCU_FLASH_PAGE_SIZE 0x1000 +#define BLE_STACK_USING_NULL +#define NRFX_CLOCK_ENABLED 1 +#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY 7 +#define NRFX_CLOCK_CONFIG_LF_SRC 1 +#define NRFX_UART_ENABLED 1 +#define NRFX_UART0_ENABLED 1 +#define NRFX_GPIOTE_ENABLED 1 + /* RT-Thread Kernel */ #define RT_NAME_MAX 8 @@ -160,38 +195,4 @@ /* entertainment: terminal games and other interesting software packages */ -/* Hardware Drivers Config */ - -#define SOC_NRF52840 -#define SOC_NORDIC -#define BSP_BOARD_PCA_10056 - -/* Onboard Peripheral Drivers */ - -#define BSP_USING_JLINK_TO_USART - -/* On-chip Peripheral Drivers */ - -#define BSP_USING_GPIO -#define BSP_USING_UART -#define NRFX_USING_UART -#define BSP_USING_UART0 -#define BSP_UART0_RX_PIN 8 -#define BSP_UART0_TX_PIN 6 - -/* MCU flash config */ - -#define MCU_FLASH_START_ADDRESS 0x00000000 -#define MCU_FLASH_SIZE_KB 1024 -#define MCU_SRAM_START_ADDRESS 0x20000000 -#define MCU_SRAM_SIZE_KB 256 -#define MCU_FLASH_PAGE_SIZE 0x1000 -#define BLE_STACK_USING_NULL -#define NRFX_CLOCK_ENABLED 1 -#define NRFX_CLOCK_DEFAULT_CONFIG_IRQ_PRIORITY 7 -#define NRFX_CLOCK_CONFIG_LF_SRC 1 -#define NRFX_UART_ENABLED 1 -#define NRFX_UART0_ENABLED 1 -#define NRFX_GPIOTE_ENABLED 1 - #endif -- cgit v1.3.1 From 05e37a17b24fbee0a35193bf02c4671cb352365d Mon Sep 17 00:00:00 2001 From: supperthomas <78900636@qq.com> Date: Sat, 26 Jun 2021 18:59:55 +0800 Subject: add the gcc build --- bsp/nrf5x/nrf52840/.vscode/launch.json | 16 +++ bsp/nrf5x/nrf52840/board/linker_scripts/link.lds | 146 ++++++++++++++++++++++- 2 files changed, 161 insertions(+), 1 deletion(-) create mode 100644 bsp/nrf5x/nrf52840/.vscode/launch.json (limited to 'bsp/nrf5x') diff --git a/bsp/nrf5x/nrf52840/.vscode/launch.json b/bsp/nrf5x/nrf52840/.vscode/launch.json new file mode 100644 index 0000000000..0d61dd7de6 --- /dev/null +++ b/bsp/nrf5x/nrf52840/.vscode/launch.json @@ -0,0 +1,16 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "cwd": "${workspaceRoot}", + "executable": "rt-thread.elf", + "name": "Debug MAX", + "request": "launch", + "type": "cortex-debug", + "servertype": "jlink", + "interface": "swd", + "device": "NRF52840_XXAA", + "runToMain": true + }, + ] +} \ No newline at end of file diff --git a/bsp/nrf5x/nrf52840/board/linker_scripts/link.lds b/bsp/nrf5x/nrf52840/board/linker_scripts/link.lds index f91b8466ca..e699e0079a 100644 --- a/bsp/nrf5x/nrf52840/board/linker_scripts/link.lds +++ b/bsp/nrf5x/nrf52840/board/linker_scripts/link.lds @@ -9,7 +9,151 @@ MEMORY RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x40000 } -INCLUDE "packages/nrfx-v2.1.0/mdk/nrf_common.ld" +ENTRY(Reset_Handler) +SECTIONS +{ + .text : + { + KEEP(*(.isr_vector)) + *(.text*) + + KEEP(*(.init)) + KEEP(*(.fini)) + + /* .ctors */ + *crtbegin.o(.ctors) + *crtbegin?.o(.ctors) + *(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors) + *(SORT(.ctors.*)) + *(.ctors) + + /* .dtors */ + *crtbegin.o(.dtors) + *crtbegin?.o(.dtors) + *(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors) + *(SORT(.dtors.*)) + *(.dtors) + + *(.rodata*) + + KEEP(*(.eh_frame*)) + /* section information for finsh shell */ + . = ALIGN(4); + __fsymtab_start = .; + KEEP(*(FSymTab)) + __fsymtab_end = .; + + . = ALIGN(4); + __vsymtab_start = .; + KEEP(*(VSymTab)) + __vsymtab_end = .; + + /* section information for initial. */ + . = ALIGN(4); + __rt_init_start = .; + KEEP(*(SORT(.rti_fn*))) + __rt_init_end = .; + + . = ALIGN(4); + + PROVIDE(__ctors_start__ = .); + KEEP (*(SORT(.init_array.*))) + KEEP (*(.init_array)) + PROVIDE(__ctors_end__ = .); + + } > FLASH + + .ARM.extab : + { + *(.ARM.extab* .gnu.linkonce.armextab.*) + } > FLASH + + __exidx_start = .; + .ARM.exidx : + { + *(.ARM.exidx* .gnu.linkonce.armexidx.*) + } > FLASH + __exidx_end = .; + + __etext = .; + + .data : AT (__etext) + { + __data_start__ = .; + *(vtable) + *(.data*) + + . = ALIGN(4); + /* preinit data */ + PROVIDE_HIDDEN (__preinit_array_start = .); + KEEP(*(.preinit_array)) + PROVIDE_HIDDEN (__preinit_array_end = .); + + . = ALIGN(4); + /* init data */ + PROVIDE_HIDDEN (__init_array_start = .); + KEEP(*(SORT(.init_array.*))) + KEEP(*(.init_array)) + PROVIDE_HIDDEN (__init_array_end = .); + + + . = ALIGN(4); + /* finit data */ + PROVIDE_HIDDEN (__fini_array_start = .); + KEEP(*(SORT(.fini_array.*))) + KEEP(*(.fini_array)) + PROVIDE_HIDDEN (__fini_array_end = .); + + KEEP(*(.jcr*)) + . = ALIGN(4); + /* All data end */ + __data_end__ = .; + + } > RAM + + .bss : + { + . = ALIGN(4); + __bss_start__ = .; + *(.bss*) + *(COMMON) + . = ALIGN(4); + __bss_end__ = .; + } > RAM + + .heap (COPY): + { + __HeapBase = .; + __end__ = .; + PROVIDE(end = .); + KEEP(*(.heap*)) + __HeapLimit = .; + } > RAM + + /* .stack_dummy section doesn't contains any symbols. It is only + * used for linker to calculate size of stack sections, and assign + * values to stack symbols later */ + .stack_dummy (COPY): + { + KEEP(*(.stack*)) + } > RAM + + /* Set stack top to end of RAM, and stack limit move down by + * size of stack_dummy section */ + __StackTop = ORIGIN(RAM) + LENGTH(RAM); + __StackLimit = __StackTop - SIZEOF(.stack_dummy); + PROVIDE(__stack = __StackTop); + + /* Check if data + heap + stack exceeds RAM limit */ + ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack") + + /* Check if text sections + data exceeds FLASH limit */ + DataInitFlashUsed = __bss_start__ - __data_start__; + CodeFlashUsed = __etext - ORIGIN(FLASH); + TotalFlashUsed = CodeFlashUsed + DataInitFlashUsed; + ASSERT(TotalFlashUsed <= LENGTH(FLASH), "region FLASH overflowed with .data and user data") + +} -- cgit v1.3.1 From d00c3249d47de8e420cf820dd9c7ccf314c7a434 Mon Sep 17 00:00:00 2001 From: supperthomas <78900636@qq.com> Date: Sat, 26 Jun 2021 20:01:20 +0800 Subject: add the readme --- bsp/nrf5x/nrf52840/README.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'bsp/nrf5x') diff --git a/bsp/nrf5x/nrf52840/README.md b/bsp/nrf5x/nrf52840/README.md index c3a4a95f9f..993bf7d7ab 100644 --- a/bsp/nrf5x/nrf52840/README.md +++ b/bsp/nrf5x/nrf52840/README.md @@ -2,7 +2,20 @@ ## 简介 -该文件夹主要存放所有主芯片为nRF52840的板级支持包。目前默认支持的开发板是官方[PCA10056](https://www.nordicsemi.com/Software-and-tools/Development-Kits/nRF52840-DK) +该文件夹主要存放所有主芯片为nRF52840的板级支持包。 + +目前支持的开发板如下 + +| 支持开发板型号 | 开发板上外设 | 备注 | +| ------------------------------------------------------------ | --------------------------- | ----------------------------------- | +| [PCA10056](https://www.nordicsemi.com/Software-and-tools/Development-Kits/nRF52840-DK) | QSPI FLASH, 4 button，4 LED | UART0 | +| [ARDUINO NANO 33 BLE](https://store.arduino.cc/usa/nano-33-ble-sense-with-headers) | 3 LED | 需要连接jlink shell采用RTT 方式交互 | +| | | | + +选择开发板请使用`menuconfig` -> `Hardware Driver Config` -> `Select Bsp board` + +选择对应的开发板 + 本文主要内容如下： - 开发板资源介绍 -- cgit v1.3.1 From f9a07e40195c8ee09fac789216cae762726fd5ca Mon Sep 17 00:00:00 2001 From: supperthomas <78900636@qq.com> Date: Sat, 26 Jun 2021 22:06:42 +0800 Subject: add the link --- bsp/nrf5x/nrf52840/README.md | 2 ++ 1 file changed, 2 insertions(+) (limited to 'bsp/nrf5x') diff --git a/bsp/nrf5x/nrf52840/README.md b/bsp/nrf5x/nrf52840/README.md index 993bf7d7ab..99b6882b2b 100644 --- a/bsp/nrf5x/nrf52840/README.md +++ b/bsp/nrf5x/nrf52840/README.md @@ -12,6 +12,8 @@ | [ARDUINO NANO 33 BLE](https://store.arduino.cc/usa/nano-33-ble-sense-with-headers) | 3 LED | 需要连接jlink shell采用RTT 方式交互 | | | | | +相关开发板资料原理图整理在[BSP_BOARD_NRF52840](https://github.com/supperthomas/BSP_BOARD_NRF52840) + 选择开发板请使用`menuconfig` -> `Hardware Driver Config` -> `Select Bsp board` 选择对应的开发板 -- cgit v1.3.1