From b20cee9a3445b3ea3c4f0a1aafec0ba202dc77b5 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期四, 12 六月 2025 14:00:43 +0800
Subject: [PATCH] 修改合并错误
---
keil/include/board/board.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/keil/include/board/board.c b/keil/include/board/board.c
index b0fada6..48be017 100644
--- a/keil/include/board/board.c
+++ b/keil/include/board/board.c
@@ -44,6 +44,7 @@
#include "mk_calib.h"
#include "mk_misc.h"
#include "mk_uwb.h"
+#include <global_param.h>
#ifdef WSF_EN
#include "wsf_nvm.h"
#endif
@@ -481,11 +482,13 @@
board_led_off(BOARD_LED_1);
#endif
}
-
+extern uint32_t gpsbaudrate;
void board_restore_from_power_down(void)
-{
+{
+ test_uart_cfg.baud=gpsbaudrate;
uart_open(UART_ID1, &test_uart_cfg);
AIR780EUartInit();
+
adc_open(&usr_adc_cfg);
m_EUART_DMA_RXPtr = 0;//清空上次缓存器避免重复发
--
Gitblit v1.9.3