From a222376377bf1c5da0782e42814f953b3189a002 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期三, 25 九月 2024 16:35:00 +0800
Subject: [PATCH] 车载手环版本V1.4，修改帧间隔达到标签和基站测距稳定，和车载测距加入作为标签时的校正值
---
keil/include/main/main.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index b2bf72e..873a5ef 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -274,12 +274,15 @@
HIDO_TimerTick();
nomove_count++;
}
+uint8_t tt=1;
uint8_t flag_sleeptimer,flag_secondtask,secondtask_count;
static void sleep_timer_callback(void *dev, uint32_t time)
{
IO_control_init();
+ if(tt)
UWBPoll();
-
+ //车载poll
+ UWB_Tag_Poll();
MotorPoll();
@@ -336,7 +339,7 @@
parameter_init_anchor();//g_com_map表初始化角色默认为基站
dev_id=g_com_map[DEV_ID];//这里不太对
group_id=g_com_map[GROUP_ID];//组ID
- tag_frequency = 1000/g_com_map[COM_INTERVAL];//测距频率这个存的是测距时间
+// tag_frequency = 1000/g_com_map[COM_INTERVAL];//测距频率这个存的是测距时间
memcpy(&disoffset,&g_com_map[DIST_OFFSET],2);
// g_com_map[ALARM_DISTANCE1] = 40;
// g_com_map[ALARM_DISTANCE2] = 40;
@@ -361,9 +364,9 @@
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;
+ g_com_map[VERSION] = (1<<8)|4;
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,"固件版本: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);
}
@@ -482,7 +485,7 @@
io_pin_mux_set(SCL_PIN, IO_FUNC0);//测试测距波形
gpio_pin_set_dir(SCL_PIN , GPIO_DIR_OUT, 0);
io_pull_set(SCL_PIN , IO_PULL_DOWN, IO_PULL_UP_LEVEL4);
- gps_air780_power_change(0,1);//开启gps，4G
+ gps_air780_power_change(1,1);//开启gps，4G
//加速度计初始化必须在IO_control_init之前因为复用SDA引脚
adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
Program_Init();
@@ -524,6 +527,7 @@
{
flag_secondtask = 0;
SecondTask();
+
}
IdleTask();
//3种情况后都要发包和休眠
@@ -534,10 +538,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