未验证 提交 fc55785e 编写于 作者: Thomas_Fly's avatar Thomas_Fly 提交者: GitHub

[bsp][nrf52840]Add segger rtt function (#6460)

* fix project to AC6

* add the segger_rtt function

* move Kconfig
上级 714b93cc
...@@ -15,8 +15,7 @@ config PKGS_DIR ...@@ -15,8 +15,7 @@ config PKGS_DIR
option env="PKGS_ROOT" option env="PKGS_ROOT"
default "packages" default "packages"
source "board/Kconfig"
source "$RTT_DIR/Kconfig" source "$RTT_DIR/Kconfig"
source "$PKGS_DIR/Kconfig" source "$PKGS_DIR/Kconfig"
source "board/Kconfig"
...@@ -50,18 +50,18 @@ PCA10056-nrf52840 开发板常用 **板载资源** 如下: ...@@ -50,18 +50,18 @@ PCA10056-nrf52840 开发板常用 **板载资源** 如下:
本 BSP 目前对外设的支持情况如下: 本 BSP 目前对外设的支持情况如下:
| **片上外设** | **支持情况** | **备注** | | **片上外设** | **支持情况** | **备注** |
| :----------- | :----------: | :--------------------: | | :----------- | :----------: | :-------------------------: |
| GPIO | 支持 | GPION | | GPIO | 支持 | GPION |
| UART | 支持 | UART0 | | UART | 支持 | UART0 |
| PWM | 支持 | 支持 | | PWM | 支持 | 支持 |
| SPI | 支持 | 支持 | | SPI | 支持 | 支持 |
| QSPI | 支持 | 支持开发板上QSPI FLASH | | QSPI | 支持 | 支持开发板上QSPI FLASH |
| RTC | 支持 | | | RTC | 支持 | |
| ADC | 支持 | | | ADC | 支持 | |
| | | | | SEGGER_RTT | 支持 | 打开默认segger_rtt为console |
| | | | | | | |
| | | | | | | |
......
...@@ -28,6 +28,11 @@ menu "Onboard Peripheral Drivers" ...@@ -28,6 +28,11 @@ menu "Onboard Peripheral Drivers"
bool "Enable JLINK TO USART (uart0|RX_PIN:8|TX_PIN:6)" bool "Enable JLINK TO USART (uart0|RX_PIN:8|TX_PIN:6)"
default y default y
depends on BSP_BOARD_PCA_10056 depends on BSP_BOARD_PCA_10056
config BSP_USING_SEGGER_RTT_CONSOLE
bool "Enable SEGGER_RTT to console"
select PKG_USING_SEGGER_RTT
default n
config RT_BSP_LED_PIN config RT_BSP_LED_PIN
int int
......
/* /*
* Copyright (c) 2006-2021, RT-Thread Development Team * Copyright (c) 2006-2022, RT-Thread Development Team
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
* *
...@@ -65,9 +65,15 @@ void rt_hw_board_init(void) ...@@ -65,9 +65,15 @@ void rt_hw_board_init(void)
rt_hw_uart_init(); rt_hw_uart_init();
#endif #endif
#if defined(SEGGER_RTT_ENABLE)
extern int rt_hw_jlink_rtt_init(void);
rt_hw_jlink_rtt_init();
rt_console_set_device("jlinkRtt");
#else
#if defined(RT_USING_CONSOLE) && defined(RT_USING_DEVICE) #if defined(RT_USING_CONSOLE) && defined(RT_USING_DEVICE)
rt_console_set_device(RT_CONSOLE_DEVICE_NAME); rt_console_set_device(RT_CONSOLE_DEVICE_NAME);
#endif #endif
#endif
#ifdef RT_USING_COMPONENTS_INIT #ifdef RT_USING_COMPONENTS_INIT
rt_components_board_init(); rt_components_board_init();
......
...@@ -11,12 +11,12 @@ ...@@ -11,12 +11,12 @@
<ToolsetNumber>0x4</ToolsetNumber> <ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName> <ToolsetName>ARM-ADS</ToolsetName>
<pCCUsed>5060422::V5.06 update 4 (build 422)::ARMCC</pCCUsed> <pCCUsed>5060422::V5.06 update 4 (build 422)::ARMCC</pCCUsed>
<uAC6>0</uAC6> <uAC6>1</uAC6>
<TargetOption> <TargetOption>
<TargetCommonOption> <TargetCommonOption>
<Device>nRF52840_xxAA</Device> <Device>nRF52840_xxAA</Device>
<Vendor>Nordic Semiconductor</Vendor> <Vendor>Nordic Semiconductor</Vendor>
<PackID>NordicSemiconductor.nRF_DeviceFamilyPack.8.38.0</PackID> <PackID>NordicSemiconductor.nRF_DeviceFamilyPack.8.35.0</PackID>
<PackURL>http://developer.nordicsemi.com/nRF5_SDK/pieces/nRF_DeviceFamilyPack/</PackURL> <PackURL>http://developer.nordicsemi.com/nRF5_SDK/pieces/nRF_DeviceFamilyPack/</PackURL>
<Cpu>IRAM(0x20000000,0x40000) IROM(0x00000000,0x100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu> <Cpu>IRAM(0x20000000,0x40000) IROM(0x00000000,0x100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec> <FlashUtilSpec></FlashUtilSpec>
...@@ -316,27 +316,27 @@ ...@@ -316,27 +316,27 @@
<Optim>1</Optim> <Optim>1</Optim>
<oTime>0</oTime> <oTime>0</oTime>
<SplitLS>0</SplitLS> <SplitLS>0</SplitLS>
<OneElfS>1</OneElfS> <OneElfS>0</OneElfS>
<Strict>0</Strict> <Strict>0</Strict>
<EnumInt>0</EnumInt> <EnumInt>0</EnumInt>
<PlainCh>0</PlainCh> <PlainCh>0</PlainCh>
<Ropi>0</Ropi> <Ropi>0</Ropi>
<Rwpi>0</Rwpi> <Rwpi>0</Rwpi>
<wLevel>2</wLevel> <wLevel>3</wLevel>
<uThumb>0</uThumb> <uThumb>0</uThumb>
<uSurpInc>0</uSurpInc> <uSurpInc>0</uSurpInc>
<uC99>1</uC99> <uC99>1</uC99>
<uGnu>0</uGnu> <uGnu>0</uGnu>
<useXO>0</useXO> <useXO>0</useXO>
<v6Lang>1</v6Lang> <v6Lang>3</v6Lang>
<v6LangP>1</v6LangP> <v6LangP>3</v6LangP>
<vShortEn>1</vShortEn> <vShortEn>1</vShortEn>
<vShortWch>1</vShortWch> <vShortWch>1</vShortWch>
<v6Lto>0</v6Lto> <v6Lto>0</v6Lto>
<v6WtE>0</v6WtE> <v6WtE>0</v6WtE>
<v6Rtti>0</v6Rtti> <v6Rtti>0</v6Rtti>
<VariousControls> <VariousControls>
<MiscControls>--reduce_paths</MiscControls> <MiscControls></MiscControls>
<Define></Define> <Define></Define>
<Undefine></Undefine> <Undefine></Undefine>
<IncludePath></IncludePath> <IncludePath></IncludePath>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册