Skip to content

Commit bae1be0

Browse files
authored
完善串口 V2 框架 (#5720)
* [stm32] fix h7 uart V2 driver unused code. * [DeviceDriver][serialv2] fix the serialv2 when using for console device on DMA mode. * [stm32][art-pi] using serial v2 by default
1 parent 961fe7d commit bae1be0

File tree

5 files changed

+69
-88
lines changed

5 files changed

+69
-88
lines changed

bsp/stm32/libraries/HAL_Drivers/drv_usart_v2.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,6 @@ static rt_err_t stm32_configure(struct rt_serial_device *serial, struct serial_c
123123
uart->handle.Init.Mode = UART_MODE_TX_RX;
124124
uart->handle.Init.OverSampling = UART_OVERSAMPLING_16;
125125

126-
if(uart->handle.Instance == USART3)
127-
{
128-
uart->handle.Init.HwFlowCtl = UART_HWCONTROL_RTS_CTS;
129-
}
130-
131126
switch (cfg->data_bits)
132127
{
133128
case DATA_BITS_8:

bsp/stm32/stm32h750-artpi-h750/.config

Lines changed: 41 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -93,17 +93,8 @@ CONFIG_RT_USING_USER_MAIN=y
9393
CONFIG_RT_MAIN_THREAD_STACK_SIZE=2048
9494
CONFIG_RT_MAIN_THREAD_PRIORITY=10
9595
# CONFIG_RT_USING_LEGACY is not set
96-
97-
#
98-
# C++ features
99-
#
100-
# CONFIG_RT_USING_CPLUSPLUS is not set
101-
102-
#
103-
# Command shell
104-
#
105-
CONFIG_RT_USING_FINSH=y
10696
CONFIG_RT_USING_MSH=y
97+
CONFIG_RT_USING_FINSH=y
10798
CONFIG_FINSH_USING_MSH=y
10899
CONFIG_FINSH_THREAD_NAME="tshell"
109100
CONFIG_FINSH_THREAD_PRIORITY=20
@@ -117,22 +108,19 @@ CONFIG_FINSH_USING_DESCRIPTION=y
117108
# CONFIG_FINSH_ECHO_DISABLE_DEFAULT is not set
118109
# CONFIG_FINSH_USING_AUTH is not set
119110
CONFIG_FINSH_ARG_MAX=10
120-
121-
#
122-
# Device virtual file system
123-
#
124111
# CONFIG_RT_USING_DFS is not set
112+
# CONFIG_RT_USING_FAL is not set
113+
# CONFIG_RT_USING_LWP is not set
125114

126115
#
127116
# Device Drivers
128117
#
129118
CONFIG_RT_USING_DEVICE_IPC=y
130119
# CONFIG_RT_USING_SYSTEM_WORKQUEUE is not set
131120
CONFIG_RT_USING_SERIAL=y
132-
CONFIG_RT_USING_SERIAL_V1=y
133-
# CONFIG_RT_USING_SERIAL_V2 is not set
121+
# CONFIG_RT_USING_SERIAL_V1 is not set
122+
CONFIG_RT_USING_SERIAL_V2=y
134123
CONFIG_RT_SERIAL_USING_DMA=y
135-
CONFIG_RT_SERIAL_RB_BUFSZ=64
136124
# CONFIG_RT_USING_CAN is not set
137125
# CONFIG_RT_USING_HWTIMER is not set
138126
# CONFIG_RT_USING_CPUTIME is not set
@@ -151,6 +139,7 @@ CONFIG_RT_USING_PIN=y
151139
# CONFIG_RT_USING_RTC is not set
152140
# CONFIG_RT_USING_SDIO is not set
153141
CONFIG_RT_USING_SPI=y
142+
# CONFIG_RT_USING_SPI_BITOPS is not set
154143
# CONFIG_RT_USING_QSPI is not set
155144
# CONFIG_RT_USING_SPI_MSD is not set
156145
# CONFIG_RT_USING_SFUD is not set
@@ -174,7 +163,7 @@ CONFIG_RT_USING_TOUCH=y
174163
# CONFIG_RT_USING_USB_DEVICE is not set
175164

176165
#
177-
# POSIX layer and C standard library
166+
# C/C++ and POSIX layer
178167
#
179168
CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
180169

@@ -198,36 +187,16 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
198187
#
199188
# Socket is in the 'Network' category
200189
#
190+
# CONFIG_RT_USING_CPLUSPLUS is not set
201191

202192
#
203193
# Network
204194
#
205-
206-
#
207-
# Socket abstraction layer
208-
#
209195
# CONFIG_RT_USING_SAL is not set
210-
211-
#
212-
# Network interface device
213-
#
214196
# CONFIG_RT_USING_NETDEV is not set
215-
216-
#
217-
# light weight TCP/IP stack
218-
#
219197
# CONFIG_RT_USING_LWIP is not set
220-
221-
#
222-
# AT commands
223-
#
224198
# CONFIG_RT_USING_AT is not set
225199

226-
#
227-
# VBUS(Virtual Software BUS)
228-
#
229-
# CONFIG_RT_USING_VBUS is not set
230-
231200
#
232201
# Utilities
233202
#
@@ -236,7 +205,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
236205
# CONFIG_RT_USING_UTEST is not set
237206
# CONFIG_RT_USING_VAR_EXPORT is not set
238207
# CONFIG_RT_USING_RT_LINK is not set
239-
# CONFIG_RT_USING_LWP is not set
208+
# CONFIG_RT_USING_VBUS is not set
240209

241210
#
242211
# RT-Thread Utestcases
@@ -250,6 +219,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
250219
#
251220
# IoT - internet of things
252221
#
222+
# CONFIG_PKG_USING_LWIP is not set
253223
# CONFIG_PKG_USING_LORAWAN_DRIVER is not set
254224
# CONFIG_PKG_USING_PAHOMQTT is not set
255225
# CONFIG_PKG_USING_UMQTT is not set
@@ -260,12 +230,8 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
260230
# CONFIG_PKG_USING_KAWAII_MQTT is not set
261231
# CONFIG_PKG_USING_BC28_MQTT is not set
262232
# CONFIG_PKG_USING_WEBTERMINAL is not set
263-
# CONFIG_PKG_USING_CJSON is not set
264-
# CONFIG_PKG_USING_JSMN is not set
265233
# CONFIG_PKG_USING_LIBMODBUS is not set
266234
# CONFIG_PKG_USING_FREEMODBUS is not set
267-
# CONFIG_PKG_USING_LJSON is not set
268-
# CONFIG_PKG_USING_EZXML is not set
269235
# CONFIG_PKG_USING_NANOPB is not set
270236

271237
#
@@ -305,6 +271,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
305271
# CONFIG_PKG_USING_JOYLINK is not set
306272
# CONFIG_PKG_USING_EZ_IOT_OS is not set
307273
# CONFIG_PKG_USING_NIMBLE is not set
274+
# CONFIG_PKG_USING_LLSYNC_SDK_ADAPTER is not set
308275
# CONFIG_PKG_USING_OTA_DOWNLOADER is not set
309276
# CONFIG_PKG_USING_IPMSG is not set
310277
# CONFIG_PKG_USING_LSSDP is not set
@@ -318,16 +285,13 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
318285
# CONFIG_PKG_USING_ABUP_FOTA is not set
319286
# CONFIG_PKG_USING_LIBCURL2RTT is not set
320287
# CONFIG_PKG_USING_CAPNP is not set
321-
# CONFIG_PKG_USING_RT_CJSON_TOOLS is not set
322288
# CONFIG_PKG_USING_AGILE_TELNET is not set
323289
# CONFIG_PKG_USING_NMEALIB is not set
324-
# CONFIG_PKG_USING_AGILE_JSMN is not set
325290
# CONFIG_PKG_USING_PDULIB is not set
326291
# CONFIG_PKG_USING_BTSTACK is not set
327292
# CONFIG_PKG_USING_LORAWAN_ED_STACK is not set
328293
# CONFIG_PKG_USING_WAYZ_IOTKIT is not set
329294
# CONFIG_PKG_USING_MAVLINK is not set
330-
# CONFIG_PKG_USING_RAPIDJSON is not set
331295
# CONFIG_PKG_USING_BSAL is not set
332296
# CONFIG_PKG_USING_AGILE_MODBUS is not set
333297
# CONFIG_PKG_USING_AGILE_FTP is not set
@@ -352,6 +316,22 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
352316
#
353317
# language packages
354318
#
319+
320+
#
321+
# JSON: JavaScript Object Notation, a lightweight data-interchange format
322+
#
323+
# CONFIG_PKG_USING_CJSON is not set
324+
# CONFIG_PKG_USING_LJSON is not set
325+
# CONFIG_PKG_USING_RT_CJSON_TOOLS is not set
326+
# CONFIG_PKG_USING_RAPIDJSON is not set
327+
# CONFIG_PKG_USING_JSMN is not set
328+
# CONFIG_PKG_USING_AGILE_JSMN is not set
329+
330+
#
331+
# XML: Extensible Markup Language
332+
#
333+
# CONFIG_PKG_USING_SIMPLE_XML is not set
334+
# CONFIG_PKG_USING_EZXML is not set
355335
# CONFIG_PKG_USING_LUATOS_SOC is not set
356336
# CONFIG_PKG_USING_LUA is not set
357337
# CONFIG_PKG_USING_JERRYSCRIPT is not set
@@ -366,8 +346,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
366346
# LVGL: powerful and easy-to-use embedded GUI library
367347
#
368348
# CONFIG_PKG_USING_LVGL is not set
369-
# CONFIG_PKG_USING_LVGL_V810 is not set
370-
# CONFIG_PKG_USING_LVGL_LATEST_VERSION is not set
371349
# CONFIG_PKG_USING_LITTLEVGL2RTT is not set
372350
# CONFIG_PKG_USING_LV_MUSIC_DEMO is not set
373351

@@ -441,6 +419,8 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
441419
# CONFIG_PKG_USING_SOLAR_TERMS is not set
442420
# CONFIG_PKG_USING_GAN_ZHI is not set
443421
# CONFIG_PKG_USING_FDT is not set
422+
# CONFIG_PKG_USING_CBOX is not set
423+
# CONFIG_PKG_USING_SNOWFLAKE is not set
444424

445425
#
446426
# system packages
@@ -483,13 +463,12 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
483463
# CONFIG_PKG_USING_UC_CLK is not set
484464
# CONFIG_PKG_USING_UC_COMMON is not set
485465
# CONFIG_PKG_USING_UC_MODBUS is not set
486-
# CONFIG_RT_USING_ARDUINO is not set
466+
# CONFIG_PKG_USING_RTDUINO is not set
487467
# CONFIG_PKG_USING_GUIENGINE is not set
488468
# CONFIG_PKG_USING_PERSIMMON is not set
489469
# CONFIG_PKG_USING_CAIRO is not set
490470
# CONFIG_PKG_USING_PIXMAN is not set
491471
# CONFIG_PKG_USING_PARTITION is not set
492-
# CONFIG_PKG_USING_FAL is not set
493472
# CONFIG_PKG_USING_FLASHDB is not set
494473
# CONFIG_PKG_USING_SQLITE is not set
495474
# CONFIG_PKG_USING_RTI is not set
@@ -515,7 +494,8 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
515494
# CONFIG_PKG_USING_ARM_2D is not set
516495
# CONFIG_PKG_USING_MCUBOOT is not set
517496
# CONFIG_PKG_USING_TINYUSB is not set
518-
# CONFIG_PKG_USING_USB_STACK is not set
497+
# CONFIG_PKG_USING_CHERRYUSB is not set
498+
# CONFIG_PKG_USING_KMULTI_RTIMER is not set
519499

520500
#
521501
# peripheral libraries and drivers
@@ -539,6 +519,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
539519
# CONFIG_PKG_USING_WM_LIBRARIES is not set
540520
# CONFIG_PKG_USING_KENDRYTE_SDK is not set
541521
# CONFIG_PKG_USING_INFRARED is not set
522+
# CONFIG_PKG_USING_MULTI_INFRARED is not set
542523
# CONFIG_PKG_USING_AGILE_BUTTON is not set
543524
# CONFIG_PKG_USING_AGILE_LED is not set
544525
# CONFIG_PKG_USING_AT24CXX is not set
@@ -595,6 +576,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
595576
# CONFIG_PKG_USING_SOFT_SERIAL is not set
596577
# CONFIG_PKG_USING_MB85RS16 is not set
597578
# CONFIG_PKG_USING_CW2015 is not set
579+
# CONFIG_PKG_USING_RFM300 is not set
598580

599581
#
600582
# AI packages
@@ -613,6 +595,10 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
613595
# miscellaneous packages
614596
#
615597

598+
#
599+
# project laboratory
600+
#
601+
616602
#
617603
# samples: kernel and components samples
618604
#
@@ -645,6 +631,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
645631
# CONFIG_PKG_USING_CANFESTIVAL is not set
646632
# CONFIG_PKG_USING_ZLIB is not set
647633
# CONFIG_PKG_USING_MINIZIP is not set
634+
# CONFIG_PKG_USING_HEATSHRINK is not set
648635
# CONFIG_PKG_USING_DSTR is not set
649636
# CONFIG_PKG_USING_TINYFRAME is not set
650637
# CONFIG_PKG_USING_KENDRYTE_DEMO is not set
@@ -662,13 +649,15 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
662649
# CONFIG_PKG_USING_DESIGN_PATTERN is not set
663650
# CONFIG_PKG_USING_CONTROLLER is not set
664651
# CONFIG_PKG_USING_PHASE_LOCKED_LOOP is not set
652+
# CONFIG_PKG_USING_MFBD is not set
665653
CONFIG_SOC_FAMILY_STM32=y
666654
CONFIG_SOC_SERIES_STM32H7=y
667655

668656
#
669657
# Hardware Drivers Config
670658
#
671659
CONFIG_SOC_STM32H750XB=y
660+
CONFIG_BOARD_STM32H750_ARTPI=y
672661

673662
#
674663
# Board extended module

bsp/stm32/stm32h750-artpi-h750/board/board.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,12 @@ extern "C" {
6565
* such as #define BSP_UART1_RX_USING_DMA
6666
*
6767
*/
68+
69+
#define BSP_UART3_RX_BUFSIZE 256
70+
#define BSP_UART3_TX_BUFSIZE 256
71+
#define BSP_UART4_RX_BUFSIZE 256
72+
#define BSP_UART4_TX_BUFSIZE 256
73+
6874
#define STM32_FLASH_START_ADRESS ROM_START
6975
#define STM32_FLASH_SIZE ROM_SIZE
7076
#define STM32_FLASH_END_ADDRESS ROM_END

bsp/stm32/stm32h750-artpi-h750/rtconfig.h

Lines changed: 12 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,8 @@
5555
#define RT_USING_USER_MAIN
5656
#define RT_MAIN_THREAD_STACK_SIZE 2048
5757
#define RT_MAIN_THREAD_PRIORITY 10
58-
59-
/* C++ features */
60-
61-
62-
/* Command shell */
63-
64-
#define RT_USING_FINSH
6558
#define RT_USING_MSH
59+
#define RT_USING_FINSH
6660
#define FINSH_USING_MSH
6761
#define FINSH_THREAD_NAME "tshell"
6862
#define FINSH_THREAD_PRIORITY 20
@@ -75,16 +69,12 @@
7569
#define FINSH_USING_DESCRIPTION
7670
#define FINSH_ARG_MAX 10
7771

78-
/* Device virtual file system */
79-
80-
8172
/* Device Drivers */
8273

8374
#define RT_USING_DEVICE_IPC
8475
#define RT_USING_SERIAL
85-
#define RT_USING_SERIAL_V1
76+
#define RT_USING_SERIAL_V2
8677
#define RT_SERIAL_USING_DMA
87-
#define RT_SERIAL_RB_BUFSZ 64
8878
#define RT_USING_I2C
8979
#define RT_USING_I2C_BITOPS
9080
#define RT_USING_PIN
@@ -94,7 +84,7 @@
9484
/* Using USB */
9585

9686

97-
/* POSIX layer and C standard library */
87+
/* C/C++ and POSIX layer */
9888

9989
#define RT_LIBC_DEFAULT_TIMEZONE 8
10090

@@ -106,21 +96,8 @@
10696

10797
/* Socket is in the 'Network' category */
10898

109-
/* Network */
110-
111-
/* Socket abstraction layer */
112-
11399

114-
/* Network interface device */
115-
116-
117-
/* light weight TCP/IP stack */
118-
119-
120-
/* AT commands */
121-
122-
123-
/* VBUS(Virtual Software BUS) */
100+
/* Network */
124101

125102

126103
/* Utilities */
@@ -150,6 +127,11 @@
150127

151128
/* language packages */
152129

130+
/* JSON: JavaScript Object Notation, a lightweight data-interchange format */
131+
132+
133+
/* XML: Extensible Markup Language */
134+
153135

154136
/* multimedia packages */
155137

@@ -190,6 +172,8 @@
190172

191173
/* miscellaneous packages */
192174

175+
/* project laboratory */
176+
193177
/* samples: kernel and components samples */
194178

195179

@@ -201,6 +185,7 @@
201185
/* Hardware Drivers Config */
202186

203187
#define SOC_STM32H750XB
188+
#define BOARD_STM32H750_ARTPI
204189

205190
/* Board extended module */
206191

0 commit comments

Comments
 (0)