From b20cee9a3445b3ea3c4f0a1aafec0ba202dc77b5 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期四, 12 六月 2025 14:00:43 +0800
Subject: [PATCH] 修改合并错误
---
pin_config.c | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/pin_config.c b/pin_config.c
index 9938039..4b67731 100644
--- a/pin_config.c
+++ b/pin_config.c
@@ -41,6 +41,7 @@
#include "mk_io.h"
#include "board.h"
#include "Usart.h"
+#include <global_param.h>
extern struct UART_CFG_T test_uart_cfg;
extern void uart_receive_callback(void *dev, uint32_t err_code);
void board_pins_config(void)
@@ -52,7 +53,7 @@
// // UART1 TX/RX已修改复用引脚为ADC留出空间调试串口
io_pin_mux_set(IO_PIN_1, IO_FUNC4);
io_pin_mux_set(IO_PIN_14, IO_FUNC4);
-
+
//开启pca中断输入
io_pin_mux_set(IO_PIN_17, IO_FUNC0);
// // UART1 RX/TX GPS端口
@@ -71,9 +72,13 @@
io_pin_mux_set(IO_PIN_0, IO_FUNC1);
io_pull_set(IO_PIN_0, IO_HIGH_Z, IO_PULL_UP_NONE);
- //5V输入检测，下拉GPIO
- gpio_pin_set_dir(INPUT_5V_Pin , GPIO_DIR_IN, 0);
- io_pull_set(INPUT_5V_Pin , IO_HIGH_Z, IO_PULL_UP_NONE);
+ //PA控制引脚开启
+ io_pin_mux_set(IO_PIN_9, IO_FUNC6);
+ io_pin_mux_set(IO_PIN_10, IO_FUNC6);
+
+// //5V输入检测，下拉GPIO
+// gpio_pin_set_dir(INPUT_5V_Pin , GPIO_DIR_IN, 0);
+// io_pull_set(INPUT_5V_Pin , IO_HIGH_Z, IO_PULL_UP_NONE);
}
void Uart1GpsRecDebugSend(void)
{
@@ -93,9 +98,11 @@
board_debug_console_open_baud(TRACE_PORT_UART1,BAUD_115200);
uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);//开启dma
}
+extern uint32_t gpsbaudrate;
void uart1_change_from_debug_to_gps(void)
{
- io_pin_mux_set(IO_PIN_1,IO_FUNC0);//不要给GPS发数据
+ io_pin_mux_set(IO_PIN_1,IO_FUNC4);//不要给GPS发数据
+ test_uart_cfg.baud=gpsbaudrate;
uart_open(UART_ID1, &test_uart_cfg);
uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);//开启dma
}
--
Gitblit v1.9.3