提交 0acbc36e 编写于 作者: C chenyingchun0312

[bsp/nrf5x] update config file

上级 04a24342
...@@ -250,5 +250,4 @@ int rt_hw_uart_init(void) ...@@ -250,5 +250,4 @@ int rt_hw_uart_init(void)
#endif /* BSP_USING_UART0 */ #endif /* BSP_USING_UART0 */
} }
INIT_BOARD_EXPORT(rt_hw_uart_init);
#endif /* BSP_USING_UART */ #endif /* BSP_USING_UART */
...@@ -11,8 +11,7 @@ ...@@ -11,8 +11,7 @@
#define UART0_RB_SIZE 1024 #define UART0_RB_SIZE 1024
// #define USE_UART0_1 0 int rt_hw_uart_init(void);
#endif #endif
...@@ -383,9 +383,9 @@ CONFIG_RT_LIBC_FIXED_TIMEZONE=8 ...@@ -383,9 +383,9 @@ CONFIG_RT_LIBC_FIXED_TIMEZONE=8
# CONFIG_PKG_USING_NRF5X_SDK is not set # CONFIG_PKG_USING_NRF5X_SDK is not set
CONFIG_PKG_USING_NRFX=y CONFIG_PKG_USING_NRFX=y
CONFIG_PKG_NRFX_PATH="/packages/peripherals/nrfx" CONFIG_PKG_NRFX_PATH="/packages/peripherals/nrfx"
CONFIG_PKG_USING_NRFX_V210=y # CONFIG_PKG_USING_NRFX_V210 is not set
# CONFIG_PKG_USING_NRFX_LATEST_VERSION is not set CONFIG_PKG_USING_NRFX_LATEST_VERSION=y
CONFIG_PKG_NRFX_VER="v2.1.0" CONFIG_PKG_NRFX_VER="latest"
# CONFIG_PKG_USING_WM_LIBRARIES is not set # CONFIG_PKG_USING_WM_LIBRARIES is not set
# CONFIG_PKG_USING_KENDRYTE_SDK is not set # CONFIG_PKG_USING_KENDRYTE_SDK is not set
# CONFIG_PKG_USING_INFRARED is not set # CONFIG_PKG_USING_INFRARED is not set
......
...@@ -2,14 +2,15 @@ ...@@ -2,14 +2,15 @@
"version": "0.2.0", "version": "0.2.0",
"configurations": [ "configurations": [
{ {
"type": "cortex-debug",
"request": "launch",
"servertype": "jlink",
"cwd": "${workspaceRoot}", "cwd": "${workspaceRoot}",
"executable": "rt-thread.elf", "executable": "rt-thread.elf",
"name": "Cortex Debug", "name": "Debug MAX",
"device": "nrf52", "request": "launch",
"interface": "swd" "type": "cortex-debug",
} "servertype": "jlink",
"interface": "swd",
"device": "NRF52832_XXAA",
"runToMain": true
},
] ]
} }
\ No newline at end of file
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
/* peripheral libraries and drivers */ /* peripheral libraries and drivers */
#define PKG_USING_NRFX #define PKG_USING_NRFX
#define PKG_USING_NRFX_V210 #define PKG_USING_NRFX_LATEST_VERSION
/* miscellaneous packages */ /* miscellaneous packages */
......
...@@ -13,7 +13,7 @@ if os.getenv('RTT_CC'): ...@@ -13,7 +13,7 @@ if os.getenv('RTT_CC'):
if CROSS_TOOL == 'gcc': if CROSS_TOOL == 'gcc':
PLATFORM = 'gcc' PLATFORM = 'gcc'
EXEC_PATH = r'D:\RT-ThreadStudio\repo\Extract\ToolChain_Support_Packages\ARM\GNU_Tools_for_ARM_Embedded_Processors\5.4.1\bin' EXEC_PATH = 'D:/SourceryGCC/bin'
elif CROSS_TOOL == 'keil': elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = 'C:/Keil_v5' EXEC_PATH = 'C:/Keil_v5'
......
...@@ -61,14 +61,18 @@ void rt_hw_board_init(void) ...@@ -61,14 +61,18 @@ void rt_hw_board_init(void)
rt_system_heap_init((void *)HEAP_BEGIN, (void *)HEAP_END); rt_system_heap_init((void *)HEAP_BEGIN, (void *)HEAP_END);
#endif #endif
#ifdef RT_USING_COMPONENTS_INIT #ifdef RT_USING_SERIAL
rt_components_board_init(); rt_hw_uart_init();
#endif #endif
#ifdef RT_USING_CONSOLE #ifdef RT_USING_CONSOLE
rt_console_set_device(RT_CONSOLE_DEVICE_NAME); rt_console_set_device(RT_CONSOLE_DEVICE_NAME);
#endif #endif
#ifdef RT_USING_COMPONENTS_INIT
rt_components_board_init();
#endif
#ifdef BSP_USING_SOFTDEVICE #ifdef BSP_USING_SOFTDEVICE
extern uint32_t Image$$RW_IRAM1$$Base; extern uint32_t Image$$RW_IRAM1$$Base;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册