From 7faf6491ec75a8e2bf2386e70f2805562aa39e50 Mon Sep 17 00:00:00 2001
From: a1012112796 <1012112796@qq.com>
Date: Mon, 29 Jul 2024 09:51:17 +0800
Subject: [PATCH] =?UTF-8?q?405:=20=E8=B0=83=E6=95=B4=E9=BB=98=E8=AE=A4?=
=?UTF-8?q?=E6=B3=A2=E7=89=B9=E7=8E=87=E4=B8=BA=20460800?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
部分适配小改
Signed-off-by: a1012112796 <1012112796@qq.com>
---
MDK_405_dr/board/board.c | 2 +-
MDK_405_dr/project.uvprojx | 3 ++-
MDK_405_iap/project.uvprojx | 2 +-
libraries/HAL_Drivers/drv_common.c | 6 ------
rt-thread/components/drivers/include/drivers/serial.h | 2 +-
5 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/MDK_405_dr/board/board.c b/MDK_405_dr/board/board.c
index 7cfba22..c1906b5 100644
--- a/MDK_405_dr/board/board.c
+++ b/MDK_405_dr/board/board.c
@@ -92,7 +92,7 @@ int rt_hw_sdio_init(void);
INIT_DEVICE_EXPORT(rt_hw_sdio_init);
int stm_usbd_register(void);
-INIT_DEVICE_EXPORT(stm_usbd_register);
+INIT_COMPONENT_EXPORT(stm_usbd_register);
int rt_soft_rtc_init(void);
INIT_DEVICE_EXPORT(rt_soft_rtc_init);
diff --git a/MDK_405_dr/project.uvprojx b/MDK_405_dr/project.uvprojx
index eea5274..2564873 100644
--- a/MDK_405_dr/project.uvprojx
+++ b/MDK_405_dr/project.uvprojx
@@ -10,6 +10,7 @@
rt-thread
0x4
ARM-ADS
+ 5060960::V5.06 update 7 (build 960)::.\ARMCC
0
@@ -182,7 +183,7 @@
1
0
0
- 1
+ 2
0
0
1
diff --git a/MDK_405_iap/project.uvprojx b/MDK_405_iap/project.uvprojx
index 286a6dc..d1a71a7 100644
--- a/MDK_405_iap/project.uvprojx
+++ b/MDK_405_iap/project.uvprojx
@@ -183,7 +183,7 @@
1
0
0
- 1
+ 2
0
0
1
diff --git a/libraries/HAL_Drivers/drv_common.c b/libraries/HAL_Drivers/drv_common.c
index 81dd44c..40a688a 100644
--- a/libraries/HAL_Drivers/drv_common.c
+++ b/libraries/HAL_Drivers/drv_common.c
@@ -197,12 +197,6 @@ void rt_hw_board_init(void)
rt_hw_usart_init();
#endif
- struct serial_configure config = RT_SERIAL_CONFIG_DEFAULT;
- config.baud_rate = BAUD_RATE_460800;
- rt_device_t dev = rt_device_find(RT_CONSOLE_DEVICE_NAME);
- RT_ASSERT(dev);
- rt_device_control(dev, RT_DEVICE_CTRL_CONFIG, &config);
-
/* Set the shell console output device */
#if defined(RT_USING_CONSOLE) && defined(RT_USING_DEVICE)
rt_console_set_device(RT_CONSOLE_DEVICE_NAME);
diff --git a/rt-thread/components/drivers/include/drivers/serial.h b/rt-thread/components/drivers/include/drivers/serial.h
index 57d9920..f16c907 100644
--- a/rt-thread/components/drivers/include/drivers/serial.h
+++ b/rt-thread/components/drivers/include/drivers/serial.h
@@ -84,7 +84,7 @@
/* Default config for serial_configure structure */
#define RT_SERIAL_CONFIG_DEFAULT \
{ \
- BAUD_RATE_115200, /* 115200 bits/s */ \
+ BAUD_RATE_460800, /* 460800 bits/s */ \
DATA_BITS_8, /* 8 databits */ \
STOP_BITS_1, /* 1 stopbit */ \
PARITY_NONE, /* No parity */ \