From a012ce64e17eda877927b1a0ffca79159ee0e57d Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期五, 28 三月 2025 17:59:21 +0800
Subject: [PATCH] 功耗室外45ma室内20ma，现在5s上传1次GNGGA,55AAuwb测距，室内上传1分钟一次带室内外标志位的心跳包
---
keil/uwb_app.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/keil/uwb_app.c b/keil/uwb_app.c
index dc1aa48..90ab06d 100644
--- a/keil/uwb_app.c
+++ b/keil/uwb_app.c
@@ -12,6 +12,7 @@
#include "lib_aoa.h"
#include "WS2812.h"
#include "PCA9555.h"
+#include "GPS.h"
extern int simple_main(void);
extern int temp_main(void);
void Calibration_Time(void);
@@ -616,8 +617,8 @@
{
// while(!mac_is_busy())
// {
-// flag_temp1=uwb_rx(0, 0,range_timeout_us);//提交接收请求
-// uwb_rx_flag=1;
+ flag_temp1=uwb_rx(0, 0,range_timeout_us);//提交接收请求
+ uwb_rx_flag=1;
// }
//LOG_INFO(TRACE_MODULE_APP,"打开uwb_rx\r\n");
}
@@ -694,7 +695,7 @@
memcpy(&usart_send[17+taglist_num*4],&anchordata_bat,taglist_num);
checksum = Checksum_u16(&usart_send[2],15+5*taglist_num);
memcpy(&usart_send[17+5*taglist_num],&checksum,2);
- if(lounei_flag==0&&heart_upload_time%3==0)
+ if(lounei_flag==0&&heart_upload_time%UPLOAD_4G_TIME==0)
{
HexToAsciiSendUDP(usart_send,19+5*taglist_num);
count_hexupload++;
@@ -736,7 +737,7 @@
case RANGE:
// time_flag=HIDO_TimerGetTick()-wltag_uwbtimer;
- if(HIDO_TimerGetTick()-wltag_uwbtimer>2&&uwb_rx_flag==0)
+ if(HIDO_TimerGetTick()-wltag_uwbtimer>4&&uwb_rx_flag==0)
{
wltag_uwbtimer = HIDO_TimerGetTick();
OpenUWB();
--
Gitblit v1.9.3