From 58a5ac20c0d2c00ef4d497626371754b9a8fb014 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期四, 10 十月 2024 15:24:17 +0800
Subject: [PATCH] 解决2分钟或更长同步不上问题临时版本，修改search模式sleeptimer时间，调4G低功耗唤醒前稳定版本，配合标签临时版本使用，多设备有干扰测距
---
keil/include/main/main.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index b643be4..4adb349 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -62,7 +62,7 @@
#include "HIDO_Timer.h"
#include "TCPClient.h"
-#define DEBUG_MODE
+//#define DEBUG_MODE
extern int simple_main(void);
extern int temp_main(void);
#define TEST_UART_POLL_MODE 0
@@ -271,8 +271,8 @@
}
//UWB更新列表
TagListUpdate();
- //GPS_Poll();
- gps_power_state=1;//测试gps长开
+ GPS_Poll();
+ //gps_power_state=1;//测试gps长开
//UWB状态检测
if(IfTCPConnected())
@@ -296,7 +296,8 @@
nomove_count++;
}
uint8_t tt=1;
-uint8_t flag_sleeptimer,flag_secondtask,secondtask_count;
+uint8_t flag_sleeptimer,flag_secondtask,secondtask_count,log_4g_enable_flag;
+
static void sleep_timer_callback(void *dev, uint32_t time)
{
IO_control_init();
@@ -354,6 +355,7 @@
}
extern uint16_t ip0,ip1,ip2,ip3,port;
extern uint8_t gps_4g_flag;
+extern uint8_t gps_need_data_flag;
void Program_Init(void)
{
Usart1ParseDataCallback = UsartParseDataHandler;//需改为默认为gps处理，UsartParseDataHandler为升级处理当调试时候改为
@@ -380,6 +382,7 @@
if(g_com_map[SEND_4G_SECOND]<60)
g_com_map[SEND_4G_SECOND]=60;
g_com_map[MODBUS_MODE] = 0;
+ log_4g_enable_flag=g_com_map[LOG_4G_ENABLE];
ip0 = (g_com_map[TCP_IP_0]>>12&0xf)*1000+(g_com_map[TCP_IP_0]>>8&0xf)*100+(g_com_map[TCP_IP_0]>>4&0xf)*10+(g_com_map[TCP_IP_0]&0xf);
ip1 = (g_com_map[TCP_IP_1]>>12&0xf)*1000+(g_com_map[TCP_IP_1]>>8&0xf)*100+(g_com_map[TCP_IP_1]>>4&0xf)*10+(g_com_map[TCP_IP_1]&0xf);
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);
@@ -530,7 +533,6 @@
{
if(flag_TCP_reconnectting||IfTCPConnected())
{
-
// LOG_INFO(TRACE_MODULE_APP, "处理4G任务\r\n");
air780_led_on();
if(flag_4guart_needinit)
@@ -561,7 +563,7 @@
//}
#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无连接时不在重连状态。
+ if(!gps_need_data_flag&&!gpio_pin_get_val(INPUT_5V_Pin)&&((IfTCPConnected()&&Socket_IsSendQueueEmpty(0))||!flag_TCP_reconnectting&&!IfTCPConnected())) //进入休眠条件（与关系，全满足才进）：1.没有5V输入 2 TCP已连接时发送队列为空||TCP无连接时不在重连状态。
{
if(!flag_4guart_needinit)
{
--
Gitblit v1.9.3