From c8c1cf5223f0576d4c378ac627d6eeed6caf04d5 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期三, 07 五月 2025 15:38:06 +0800
Subject: [PATCH] 成功加入log打印和校准逻辑
---
keil/include/main/main.c | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index ad0570f..689e4c9 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -145,7 +145,7 @@
};
void uart_receive_callback(void *dev, uint32_t err_code)
{
- uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
+ uart_receive(UART_ID0,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
}
void mcu_deep_sleep(void)
{
@@ -411,6 +411,7 @@
extern uint16_t ip0,ip1,ip2,ip3,port;
extern uint8_t gps_4g_flag;
extern uint8_t gps_need_data_flag,gps_open_flag;
+extern float pd_offset,offset;
void Program_Init(void)
{
Usart1ParseDataCallback = UsartParseDataHandler;//需改为默认为gps处理，UsartParseDataHandler为升级处理当调试时候改为
@@ -419,6 +420,7 @@
group_id=g_com_map[GROUP_ID];//组ID
// tag_frequency = 1000/g_com_map[COM_INTERVAL];//测距频率这个存的是测距时间
memcpy(&disoffset,&g_com_map[DIST_OFFSET],2);
+ memcpy(&pd_offset,&g_com_map[PDOFFSET],4);
// g_com_map[ALARM_DISTANCE1] = 40;
// g_com_map[ALARM_DISTANCE2] = 40;
warning_distance=g_com_map[ALARM_DISTANCE1];
@@ -455,7 +457,7 @@
}
-
+uint8_t calibration_start;
void IdleTask(void)
{
// if(gpio_pin_get_val(INPUT_5V_Pin))
@@ -484,7 +486,13 @@
// //UartDeinit();
// }
// }
- UART_CheckReceive();
+ UART0_CheckReceive();
+ if(g_com_map[CNT_CALIB])
+ {
+ g_com_map[CNT_CALIB]=0;
+ save_com_map_to_flash();
+ calibration_start=1;
+ }
}
int bind_check(void)
{
@@ -589,7 +597,7 @@
// uart1_change_from_gps_to_debug();
//Uart1GpsRecDebugSend();
- uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
+ uart_receive(UART_ID0,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
// Initialize low power mode
power_init();
--
Gitblit v1.9.3