From 936f83f498976ac64276d2f9000189589a079d9a Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期二, 22 四月 2025 14:29:47 +0800
Subject: [PATCH] 3.6，加入静止标志位上传
---
APL/App.c | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/APL/App.c b/APL/App.c
index c1470eb..29122af 100644
--- a/APL/App.c
+++ b/APL/App.c
@@ -288,7 +288,7 @@
//deca_sleep(1000);
g_com_map[GROUP_ID]=3;
- g_com_map[VERSION] = (3<<8)|4;
+ g_com_map[VERSION] = (3<<8)|6;
if (g_com_map[COM_INTERVAL] <50)
{
@@ -388,13 +388,36 @@
}
}
-
+extern uint8_t jingzhiflag;
extern uint16_t testlorarecve;
void Uwb_Zubao_Poll()
{
+
+ for(u16 i=0;i<taglist_num-1;i++)
+ {
+ for(u16 j=0;j<taglist_num-1-i;j++)
+ {
+ if(tagdist_list[j]>tagdist_list[j+1])
+ {
+ u16 id,dist;
+ u8 bat;
+ id = tagid_list[j];
+ dist = tagdist_list[j];
+ bat = tagbat_list[j];
+ tagid_list[j] = tagid_list[j+1];
+ tagdist_list[j] = tagdist_list[j+1];
+ tagbat_list[j] = tagbat_list[j+1];
+ tagid_list[j+1] = id;
+ tagdist_list[j+1] = dist;
+ tagbat_list[j+1] = bat;
+ }
+ }
+
+ }
+
uint16_t state_flag;
u16 uwbchecksum;
- state_flag=fangchai_flag<<4;
+ state_flag=fangchai_flag<<4|jingzhiflag<<1;
if(taglist_num>8)
{taglist_num=8;}
uwb_send[2] = 0x12;//正常模式
--
Gitblit v1.9.3