Merge pull request #12 from RT-Thread/master

update
This commit is contained in:
Meco Man 2021-01-17 16:44:44 +08:00 committed by GitHub
commit 7405618eaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions

View File

@ -206,7 +206,7 @@ static void uart_get_dma_config(void)
uarts[LPUART2_INDEX].dma_flag |= RT_DEVICE_FLAG_DMA_RX; uarts[LPUART2_INDEX].dma_flag |= RT_DEVICE_FLAG_DMA_RX;
#endif #endif
#ifdef BSP_LPUART2_TX_USING_DMA #ifdef BSP_LPUART2_TX_USING_DMA
static struct dma_tx_config uart2_dma_tx = {.request = kDmaRequestMuxLPUART4Tx, .channel = BSP_LPUART2_TX_DMA_CHANNEL}; static struct dma_tx_config uart2_dma_tx = {.request = kDmaRequestMuxLPUART2Tx, .channel = BSP_LPUART2_TX_DMA_CHANNEL};
uarts[LPUART2_INDEX].dma_tx = &uart2_dma_tx; uarts[LPUART2_INDEX].dma_tx = &uart2_dma_tx;
uarts[LPUART2_INDEX].dma_flag |= RT_DEVICE_FLAG_DMA_TX; uarts[LPUART2_INDEX].dma_flag |= RT_DEVICE_FLAG_DMA_TX;
#endif #endif

View File

@ -325,6 +325,9 @@ menu "On-chip Peripheral Drivers"
bool "Enable SPI0 bus" bool "Enable SPI0 bus"
default y default y
if BSP_USING_SPI0 if BSP_USING_SPI0
config NRFX_SPI0_ENABLED
int "Enable SPI0 instance"
default 1
config BSP_SPI0_SCK_PIN config BSP_SPI0_SCK_PIN
int "SPI0 sck pin number set" int "SPI0 sck pin number set"
range 0 47 range 0 47
@ -347,6 +350,9 @@ menu "On-chip Peripheral Drivers"
bool "Enable SPI1 bus" bool "Enable SPI1 bus"
default n default n
if BSP_USING_SPI1 if BSP_USING_SPI1
config NRFX_SPI1_ENABLED
int "Enable SPI1 instance"
default 1
config BSP_SPI1_SCK_PIN config BSP_SPI1_SCK_PIN
int "SPI0 sck pin number set" int "SPI0 sck pin number set"
range 0 47 range 0 47
@ -369,6 +375,9 @@ menu "On-chip Peripheral Drivers"
bool "Enable SPI2 bus" bool "Enable SPI2 bus"
default n default n
if BSP_USING_SPI2 if BSP_USING_SPI2
config NRFX_SPI2_ENABLED
int "Enable SPI2 instance"
default 1
config BSP_SPI2_SCK_PIN config BSP_SPI2_SCK_PIN
int "SPI0 sck pin number set" int "SPI0 sck pin number set"
range 0 47 range 0 47