From 666fcae60bab1abab0c5c4733c1b163f0353b08b Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期三, 11 九月 2024 10:17:18 +0800
Subject: [PATCH] V1.11版本，有对测距错误逻辑计数有更改和上报心跳更改为用户上报心跳一分钟
---
keil/include/main/main.c | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 62527ee..03f68fe 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -361,10 +361,10 @@
ip2 = (g_com_map[TCP_IP_2]>>12&0xf)*1000+(g_com_map[TCP_IP_2]>>8&0xf)*100+(g_com_map[TCP_IP_2]>>4&0xf)*10+(g_com_map[TCP_IP_2]&0xf);
ip3 = (g_com_map[TCP_IP_3]>>12&0xf)*1000+(g_com_map[TCP_IP_3]>>8&0xf)*100+(g_com_map[TCP_IP_3]>>4&0xf)*10+(g_com_map[TCP_IP_3]&0xf);
port = g_com_map[TCP_PORT];
- g_com_map[VERSION] = (1<<8)|7;
- LOG_INFO("设备ID: %x .\r\n",dev_id);
- LOG_INFO("固件版本:UWB-4G手环 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
- LOG_INFO("服务器地址: %d.%d.%d.%d:%d.\r\n",ip0,ip1,ip2,ip3,port);
+ g_com_map[VERSION] = (1<<8)|11;
+ LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
+ LOG_INFO(TRACE_MODULE_APP,"固件版本:UWB-4G手环 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
+ LOG_INFO(TRACE_MODULE_APP,"服务器地址: %d.%d.%d.%d:%d.\r\n",ip0,ip1,ip2,ip3,port);
}
@@ -485,8 +485,9 @@
gps_air780_power_change(0,1);//开启gps，4G
//加速度计初始化必须在IO_control_init之前因为复用SDA引脚
adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
- uart_open(UART_ID1, &test_uart_cfg);
- Program_Init();
+ Program_Init();
+ //uart_open(UART_ID1, &test_uart_cfg);
+
// uart1_change_from_gps_to_debug();
//Uart1GpsRecDebugSend();
uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
@@ -533,10 +534,6 @@
//blink_led(&air780_success_state);//成功测距闪烁4G状态灯
//air780_success_state=0;
//}
- input_5v_flag=!gpio_pin_get_val(INPUT_5V_Pin);
- air780e_flag2,air780e_flag3,air780e_flag4;
- air780e_flag1=((IfTCPConnected()&&Socket_IsSendQueueEmpty(0))||!flag_TCP_reconnectting&&!IfTCPConnected());
-
#ifndef DEBUG_MODE
//if(flag_sleeptimer)
if(!gpio_pin_get_val(INPUT_5V_Pin)&&((IfTCPConnected()&&Socket_IsSendQueueEmpty(0))||!flag_TCP_reconnectting&&!IfTCPConnected())) //进入休眠条件（与关系，全满足才进）：1.没有5V输入 2 TCP已连接时发送队列为空||TCP无连接时不在重连状态。
--
Gitblit v1.9.3