Skip to content

Commit 9ccb955

Browse files
koudaiNEWkoudaiNEW
committed
[bsp]补充头文件，工程脚本增加dma文件，修改yml
1 parent 89d3879 commit 9ccb955

File tree

4 files changed

+259
-55
lines changed

4 files changed

+259
-55
lines changed

‎bsp/n32/libraries/N32G45x_Firmware_Library/SConscript‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ n32g45x_std_periph_driver/src/misc.c
1717

1818
if GetDepend(['RT_USING_SERIAL']):
1919
src += ['n32g45x_std_periph_driver/src/n32g45x_usart.c']
20+
if GetDepend(['RT_SERIAL_USING_DMA']):
21+
src += ['n32g45x_std_periph_driver/src/n32g45x_dma.c']
2022

2123
if GetDepend(['RT_USING_I2C']):
2224
src += ['n32g45x_std_periph_driver/src/n32g45x_i2c.c']

‎bsp/n32/libraries/n32_drivers/drv_usart_v2.c‎

Lines changed: 50 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
#include <rtthread.h>
1212
#include <rtdevice.h>
1313
#include "board.h"
14+
#include "n32g45x_gpio.h"
15+
#include "n32g45x_dma.h"
1416
#include "drv_usart_v2.h"
1517

1618
#ifdef RT_USING_SERIAL_V2
@@ -141,6 +143,11 @@ static void n32_uart_mode_set(struct n32_uart_config *uart);
141143
static void n32_uart_get_config(void);
142144
static rt_err_t n32_configure(struct rt_serial_device *serial, struct serial_configure *cfg);
143145
static void NVIC_Set(IRQn_Type irq, FunctionalState state);
146+
#ifdef RT_SERIAL_USING_DMA
147+
static void n32_uart_dma_config(struct rt_serial_device *serial, rt_ubase_t flag);
148+
#endif
149+
void HAL_UART_TxCpltCallback(struct UART_HandleTypeDef *huart);
150+
static void GPIOInit(GPIO_Module* GPIOx, GPIO_ModeType mode, GPIO_SpeedType speed, uint16_t Pin);
144151
/********************************************************************************************************************************** */
145152
/******************************** value ******************************************************************************************* */
146153
static struct n32_uart_config uart_config[] =
@@ -238,11 +245,49 @@ static struct n32_uart_config uart_config[] =
238245
static struct n32_uart uart_obj[sizeof(uart_config) / sizeof(struct n32_uart_config)];
239246
/********************************************************************************************************************************** */
240247

241-
#ifdef RT_SERIAL_USING_DMA
242-
static void n32_uart_dma_config(struct rt_serial_device *serial, rt_ubase_t flag);
243-
#endif
244-
245-
void HAL_UART_TxCpltCallback(struct UART_HandleTypeDef *huart);
248+
static void GPIOInit(GPIO_Module* GPIOx, GPIO_ModeType mode, GPIO_SpeedType speed, uint16_t Pin)
249+
{
250+
GPIO_InitType GPIO_InitStructure;
251+
/* Check the parameters */
252+
assert_param(IS_GPIO_ALL_PERIPH(GPIOx));
253+
/* Enable the GPIO Clock */
254+
if (GPIOx == GPIOA)
255+
{
256+
RCC_EnableAPB2PeriphClk(RCC_APB2_PERIPH_GPIOA, ENABLE);
257+
}
258+
else if (GPIOx == GPIOB)
259+
{
260+
RCC_EnableAPB2PeriphClk(RCC_APB2_PERIPH_GPIOB, ENABLE);
261+
}
262+
else if (GPIOx == GPIOC)
263+
{
264+
RCC_EnableAPB2PeriphClk(RCC_APB2_PERIPH_GPIOC, ENABLE);
265+
}
266+
else if (GPIOx == GPIOD)
267+
{
268+
RCC_EnableAPB2PeriphClk(RCC_APB2_PERIPH_GPIOD, ENABLE);
269+
}
270+
else if (GPIOx == GPIOE)
271+
{
272+
RCC_EnableAPB2PeriphClk(RCC_APB2_PERIPH_GPIOE, ENABLE);
273+
}
274+
else if (GPIOx == GPIOF)
275+
{
276+
RCC_EnableAPB2PeriphClk(RCC_APB2_PERIPH_GPIOF, ENABLE);
277+
}
278+
else
279+
{
280+
if (GPIOx == GPIOG)
281+
{
282+
RCC_EnableAPB2PeriphClk(RCC_APB2_PERIPH_GPIOG, ENABLE);
283+
}
284+
}
285+
/* Configure the GPIO pin */
286+
GPIO_InitStructure.Pin = Pin;
287+
GPIO_InitStructure.GPIO_Mode = mode;
288+
GPIO_InitStructure.GPIO_Speed = speed;
289+
GPIO_InitPeripheral(GPIOx, &GPIO_InitStructure);
290+
}
246291

247292
static void n32_uart_mode_set(struct n32_uart_config *uart)
248293
{

‎bsp/n32/n32g45xvl-stb/.ci/attachconfig/ci.attachconfig.yml‎

Lines changed: 207 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,214 @@
1-
peripheral.UARTv2:
1+
scons.args: &scons
2+
scons_arg:
3+
- '--strict'
4+
# ------ nano CI ------
5+
nano:
6+
<<: *scons
7+
kconfig:
8+
- CONFIG_RT_USING_NANO=y
9+
# ------ kernel CI ------
10+
kernel.klibc-stdlib:
11+
<<: *scons
12+
kconfig:
13+
- CONFIG_RT_KLIBC_USING_STDLIB=y
14+
- CONFIG_RT_KLIBC_USING_STDLIB_MEMORY=y
15+
kernel.klibc-tinysize:
16+
<<: *scons
17+
kconfig:
18+
- CONFIG_RT_KLIBC_USING_TINY_SIZE=y
19+
kernel.klibc-vsnprintf-std:
20+
<<: *scons
21+
kconfig:
22+
- CONFIG_RT_KLIBC_USING_VSNPRINTF_STANDARD=y
23+
- CONFIG_RT_KLIBC_USING_PRINTF_LONGLONG=y
24+
- CONFIG_RT_KLIBC_USING_VSNPRINTF_DECIMAL_SPECIFIERS=y
25+
- CONFIG_RT_KLIBC_USING_VSNPRINTF_EXPONENTIAL_SPECIFIERS=y
26+
- CONFIG_RT_KLIBC_USING_VSNPRINTF_WRITEBACK_SPECIFIER=y
27+
- CONFIG_RT_KLIBC_USING_VSNPRINTF_CHECK_NUL_IN_FORMAT_SPECIFIER=y
28+
- CONFIG_RT_KLIBC_USING_VSNPRINTF_MSVC_STYLE_INTEGER_SPECIFIERS=y
29+
# ------ online-packages CI ------
30+
online-packages.iot.at_devices:
31+
<<: *scons
32+
kconfig:
33+
- CONFIG_PKG_USING_AT_DEVICE=y
34+
# Quectel M26/MC20
35+
- CONFIG_AT_DEVICE_USING_M26=y
36+
- CONFIG_AT_DEVICE_M26_INIT_ASYN=y
37+
# Quectel EC20
38+
- CONFIG_AT_DEVICE_USING_EC20=y
39+
- CONFIG_AT_DEVICE_EC20_INIT_ASYN=y
40+
# Espressif ESP32
41+
- CONFIG_AT_DEVICE_USING_ESP32=y
42+
- CONFIG_AT_DEVICE_ESP32_INIT_ASYN=y
43+
# Espressif ESP8266
44+
- CONFIG_AT_DEVICE_USING_ESP8266=y
45+
- CONFIG_AT_DEVICE_ESP8266_INIT_ASYN=y
46+
# Realthread RW007
47+
- CONFIG_AT_DEVICE_USING_RW007=y
48+
- CONFIG_AT_DEVICE_RW007_INIT_ASYN=y
49+
# SIMCom SIM800C
50+
- CONFIG_AT_DEVICE_USING_SIM800C=y
51+
- CONFIG_AT_DEVICE_SIM800C_INIT_ASYN=y
52+
# SIMCom SIM76XX
53+
- CONFIG_AT_DEVICE_USING_SIM76XX=y
54+
- CONFIG_AT_DEVICE_SIM76XX_INIT_ASYN=y
55+
# Notion MW31
56+
- CONFIG_AT_DEVICE_USING_MW31=y
57+
- CONFIG_AT_DEVICE_MW31_INIT_ASYN=y
58+
# WinnerMicro W60X
59+
- CONFIG_AT_DEVICE_USING_W60X=y
60+
- CONFIG_AT_DEVICE_W60X_INIT_ASYN=y
61+
# Ai-Think A9G
62+
- CONFIG_AT_DEVICE_USING_A9G=y
63+
- CONFIG_AT_DEVICE_A9G_INIT_ASYN=y
64+
# Quectel BC26
65+
- CONFIG_AT_DEVICE_USING_BC26=y
66+
- CONFIG_AT_DEVICE_BC26_INIT_ASYN=y
67+
# luat Air720
68+
- CONFIG_AT_DEVICE_USING_AIR720=y
69+
- CONFIG_AT_DEVICE_AIR720_INIT_ASYN=y
70+
# Gosuncn ME3616
71+
- CONFIG_AT_DEVICE_USING_ME3616=y
72+
- CONFIG_AT_DEVICE_ME3616_INIT_ASYN=y
73+
# ChinaMobile M6315
74+
- CONFIG_AT_DEVICE_USING_M6315=y
75+
- CONFIG_AT_DEVICE_M6315_INIT_ASYN=y
76+
# Quectel BC28
77+
- CONFIG_AT_DEVICE_USING_BC28=y
78+
- CONFIG_AT_DEVICE_BC28_INIT_ASYN=y
79+
# Quectel EC200T/EC200S
80+
- CONFIG_AT_DEVICE_USING_EC200X=y
81+
- CONFIG_AT_DEVICE_EC200X_INIT_ASYN=y
82+
# Neoway N21
83+
- CONFIG_AT_DEVICE_USING_N21=y
84+
- CONFIG_AT_DEVICE_N21_INIT_ASYN=y
85+
# Neoway N58
86+
- CONFIG_AT_DEVICE_USING_N58=y
87+
- CONFIG_AT_DEVICE_N58_INIT_ASYN=y
88+
# ChinaMobile M5311
89+
- CONFIG_AT_DEVICE_USING_M5311=y
90+
- CONFIG_AT_DEVICE_M5311_INIT_ASYN=y
91+
# Fibocom L610
92+
- CONFIG_AT_DEVICE_USING_L610=y
93+
- CONFIG_AT_DEVICE_L610_INIT_ASYN=y
94+
# Neoway N720
95+
- CONFIG_AT_DEVICE_USING_N720=y
96+
- CONFIG_AT_DEVICE_N720_INIT_ASYN=y
97+
# Gosuncn ML305
98+
- CONFIG_AT_DEVICE_USING_ML305=y
99+
- CONFIG_AT_DEVICE_ML305_INIT_ASYN=y
100+
online-packages.misc.misc:
101+
<<: *scons
102+
kconfig:
103+
- CONFIG_PKG_USING_MULTIBUTTON=y
104+
online-packages.misc.vi:
105+
<<: *scons
106+
kconfig:
107+
- CONFIG_PKG_USING_VI=y
108+
# - CONFIG_VI_ENABLE_8BIT=y
109+
- CONFIG_VI_ENABLE_COLON=y
110+
- CONFIG_VI_ENABLE_COLON_EXPAND=y
111+
- CONFIG_VI_ENABLE_YANKMARK=y
112+
- CONFIG_VI_ENABLE_SEARCH=y
113+
- CONFIG_VI_ENABLE_DOT_CMD=y
114+
- CONFIG_VI_ENABLE_READONLY=y
115+
- CONFIG_VI_ENABLE_SETOPTS=y
116+
- CONFIG_VI_ENABLE_SET=y
117+
- CONFIG_VI_ENABLE_WIN_RESIZE=y
118+
- CONFIG_VI_ENABLE_VI_ASK_TERMINAL=y
119+
- CONFIG_VI_ENABLE_UNDO=y
120+
- CONFIG_VI_ENABLE_UNDO_QUEUE=y
121+
- CONFIG_VI_ENABLE_VERBOSE_STATUS=y
122+
online-packages.multimedia.lvgl-v8.3-latest:
123+
<<: *scons
124+
kconfig:
125+
- CONFIG_BSP_USING_LVGL=y
126+
- CONFIG_BSP_USING_LVGL_DEMO=y
127+
- CONFIG_PKG_LVGL_USING_V8_3_LATEST=y
128+
online-packages.multimedia.lvgl-v8.3.11:
129+
<<: *scons
130+
kconfig:
131+
- CONFIG_BSP_USING_LVGL=y
132+
- CONFIG_BSP_USING_LVGL_DEMO=y
133+
- CONFIG_PKG_LVGL_USING_V080311=y
134+
online-packages.multimedia.lvgl-v8.4-latest:
135+
<<: *scons
136+
kconfig:
137+
- CONFIG_BSP_USING_LVGL=y
138+
- CONFIG_BSP_USING_LVGL_DEMO=y
139+
- CONFIG_PKG_LVGL_USING_V8_4_LATEST=y
140+
online-packages.system.enhanced-kservice:
141+
<<: *scons
142+
kconfig:
143+
- CONFIG_PKG_USING_RT_KPRINTF_THREADSAFE=y
144+
- CONFIG_PKG_USING_RT_MEMCPY_CM=y
145+
online-packages.system.os-wrappers:
146+
<<: *scons
147+
kconfig:
148+
- CONFIG_PKG_USING_FREERTOS_WRAPPER=y
149+
online-packages.ai.llmchat:
150+
<<: *scons
151+
kconfig:
152+
- CONFIG_BSP_USING_RW007_WLAN=y
153+
- CONFIG_WEBCLIENT_USING_MBED_TLS=y
154+
- CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=6144
155+
- CONFIG_PKG_USING_LLMCHAT=y
156+
- CONFIG_PKG_USING_LLMCHAT_LATEST_VERSION=y
157+
# ------ peripheral CI ------
158+
peripheral.aht21:
159+
kconfig:
160+
- CONFIG_BSP_USING_AHT21=y
161+
peripheral.ap3216c:
162+
kconfig:
163+
- CONFIG_BSP_USING_AP3216C=y
164+
peripheral.ethernet_28j60:
165+
kconfig:
166+
- CONFIG_BSP_USING_ENC28j60=y
167+
peripheral.fal_easyflash:
168+
kconfig:
169+
- CONFIG_BSP_USING_EASYFLASH=y
170+
peripheral.filesystem:
171+
kconfig:
172+
- CONFIG_BSP_USING_FS=y
173+
- CONFIG_BSP_USING_FLASH_FATFS=y
174+
peripheral.icm20608:
175+
kconfig:
176+
- CONFIG_BSP_USING_ICM20608=y
177+
peripheral.lcd_st7787:
178+
kconfig:
179+
- CONFIG_BSP_USING_ONBOARD_LCD=y
180+
peripheral.led_matrix:
181+
kconfig:
182+
- CONFIG_BSP_USING_ONBOARD_LED_MATRIX=y
183+
peripheral.rs485:
184+
kconfig:
185+
- CONFIG_BSP_USING_RS485=y
186+
peripheral.rw007:
187+
kconfig:
188+
- CONFIG_BSP_USING_RW007_WLAN=y
189+
peripheral.spi_flash_w25q64:
190+
kconfig:
191+
- CONFIG_BSP_USING_SPI_FLASH=y
192+
peripheral.sram:
193+
kconfig:
194+
- CONFIG_BSP_USING_SRAM=y
195+
peripheral.usb_mouse:
196+
kconfig:
197+
- CONFIG_BSP_USING_USB_MOUSE=y
198+
peripheral.uartv2:
2199
kconfig:
3200
- CONFIG_RT_USING_SERIAL_V1=n
4201
- CONFIG_RT_USING_SERIAL_V2=y
5202
- CONFIG_RT_SERIAL_USING_DMA=y
6-
- CONFIG_BSP_USART1_AFIO_MODE_PA9_PA10=y
7-
- CONFIG_BSP_UART1_RX_BUFSIZE=1024
8-
- CONFIG_BSP_UART1_TX_BUFSIZE=1024
9-
- CONFIG_BSP_USING_USART2=y
10203
- CONFIG_BSP_USART2_AFIO_MODE_PD5_PD6=y
11204
- CONFIG_BSP_UART2_RX_USING_DMA=y
12205
- CONFIG_BSP_UART2_TX_USING_DMA=y
13-
- CONFIG_BSP_UART2_RX_BUFSIZE=1024
14-
- CONFIG_BSP_UART2_TX_BUFSIZE=1024
15-
- CONFIG_BSP_USING_USART3=y
16-
- CONFIG_BSP_USART3_AFIO_MODE_PB10_PB11=y
17-
- CONFIG_BSP_UART3_RX_USING_DMA=y
18-
- CONFIG_BSP_UART3_TX_USING_DMA=y
19-
- CONFIG_BSP_UART3_RX_BUFSIZE=1024
20-
- CONFIG_BSP_UART3_TX_BUFSIZE=1024
21-
- CONFIG_BSP_USING_UART4=y
22-
- CONFIG_BSP_UART4_AFIO_MODE_PC10_PC11=y
23-
- CONFIG_BSP_UART4_RX_USING_DMA=y
24-
- CONFIG_BSP_UART4_TX_USING_DMA=y
25-
- CONFIG_BSP_UART4_RX_BUFSIZE=1024
26-
- CONFIG_BSP_UART4_TX_BUFSIZE=1024
27-
- CONFIG_BSP_USING_UART5=y
28-
- CONFIG_BSP_UART5_AFIO_MODE_PC12_PD2=y
29-
- CONFIG_BSP_UART5_RX_USING_DMA=y
30-
- CONFIG_BSP_UART5_TX_USING_DMA=y
31-
- CONFIG_BSP_UART5_RX_BUFSIZE=4096
32-
- CONFIG_BSP_UART5_TX_BUFSIZE=4096
33-
- CONFIG_BSP_USING_UART6=y
34-
- CONFIG_BSP_UART6_AFIO_MODE_PB0_PB1=y
35-
- CONFIG_BSP_UART6_RX_USING_DMA=y
36-
- CONFIG_BSP_UART6_TX_USING_DMA=y
37-
- CONFIG_BSP_UART6_RX_BUFSIZE=1024
38-
- CONFIG_BSP_UART6_TX_BUFSIZE=1024
39-
- CONFIG_BSP_USING_UART7=y
40-
- CONFIG_BSP_UART7_AFIO_MODE_PC4_PC5=y
41-
- CONFIG_BSP_UART7_RX_USING_DMA=y
42-
- CONFIG_BSP_UART7_TX_USING_DMA=y
43-
- CONFIG_BSP_UART7_RX_BUFSIZE=2048
44-
- CONFIG_BSP_UART7_TX_BUFSIZE=2048
206+
# ------ component CI ------
207+
component.cherryusb_cdc:
208+
kconfig:
209+
- CONFIG_RT_USING_CHERRYUSB=y
210+
- CONFIG_RT_CHERRYUSB_DEVICE=y
211+
- CONFIG_RT_CHERRYUSB_DEVICE_DWC2_ST=y
212+
- CONFIG_RT_CHERRYUSB_DEVICE_CDC_ACM=y
213+
- CONFIG_RT_CHERRYUSB_DEVICE_TEMPLATE_CDC_ACM=y
214+

‎bsp/n32/n32g45xvl-stb/defconfig‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)