From b3a401224cebaa7e938df4295841f8d2f702b11c Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期三, 27 十一月 2024 10:15:32 +0800
Subject: [PATCH] 修改UART设置和配置，和添加PA配置，注释IdTask
---
keil/include/main/main.c | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 9a5a7c1..3dfc7b5 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -370,6 +370,7 @@
green_charge_state=0;
charge_red_on();
}
+ UWBPoll();
charge_state_change();//充电状态判断
if(secondtask_count++%2==0)
{
@@ -379,7 +380,7 @@
}
if(enbale_blink_flag)
{
- delay_us(5000);
+ //delay_us(5000);
green_charge_state=0;
charge_red_off();
}
@@ -456,28 +457,28 @@
if(gpio_pin_get_val(INPUT_5V_Pin))
{
- if(state5v==0)
- {
- state5v=1;
- state5V_prase_flag=state5v;
- gps_prase_flag=0;//解除gps解析
- uart1_change_from_gps_to_debug();//测试
- // uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);//开启dma
- //UartInit();
- }
+// if(state5v==0)
+// {
+// state5v=1;
+// state5V_prase_flag=state5v;
+// gps_prase_flag=0;//解除gps解析
+// uart1_change_from_gps_to_debug();//测试
+// // uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);//开启dma
+// //UartInit();
+// }
- //UART_CheckSend();
- } else {
- if(state5v==1)
- {
- g_com_map[MODBUS_MODE] = 0;
- state5v=0;
- state5V_prase_flag=state5v;
- gps_prase_flag=1;//恢复gps解析
- uart1_change_from_debug_to_gps();//测试
- // uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);//开启dma
- //UartDeinit();
- }
+// //UART_CheckSend();
+// } else {
+// if(state5v==1)
+// {
+// g_com_map[MODBUS_MODE] = 0;
+// state5v=0;
+// state5V_prase_flag=state5v;
+// gps_prase_flag=1;//恢复gps解析
+// uart1_change_from_debug_to_gps();//测试
+// // uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);//开启dma
+// //UartDeinit();
+// }
}
UART_CheckReceive();
}
--
Gitblit v1.9.3