From 70c51212fc82fa8026d1295697be5f150aed7dce Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期三, 08 一月 2025 17:58:48 +0800
Subject: [PATCH] 手环V1.4，增加10包逻辑，修改灯按钮按下常亮问题，修改上传包格式适配轨迹定位，未修改全部无无效数据时无上报逻辑
---
keil/include/main/main.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 9a5a7c1..01bcdd6 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -331,6 +331,7 @@
gps_wait_count2=0;
gps_wait_count=0;
}
+
//UWB状态检测
if(!power_low_flag)//低供电下不需要检测重连
{
@@ -443,7 +444,7 @@
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)|1;
+ g_com_map[VERSION] = (1<<8)|4;
LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
LOG_INFO(TRACE_MODULE_APP,"固件版本:4G-GPS定位手环 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);
@@ -520,7 +521,7 @@
int tt2;
int test1,test3;
uint32_t test4;
-
+uint32_t time_count;
int main(void)
{
board_clock_run();
@@ -629,7 +630,7 @@
{
flag_secondtask = 0;
SecondTask();
-
+ // time_count++;
}
UserKeyTask();
IMUTask();
--
Gitblit v1.9.3