From c55cbf17bd4960c9cd343e2c72ee49d1947f9fc1 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期二, 09 五月 2023 12:28:00 +0800
Subject: [PATCH] 1

---
 Src/application/dw_app.c |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Src/application/dw_app.c b/Src/application/dw_app.c
index b0eb720..fd3aa5c 100644
--- a/Src/application/dw_app.c
+++ b/Src/application/dw_app.c
@@ -471,7 +471,7 @@
 u8 nearbase_num=0,last_nearbase_num,next_nearbase_num,last_slotnum, para_update,para_len,stationary_flag=0;
 u32 rec_tagpos_binary;
 int16_t offset=4700,temptimer;
-u8 motor_state,rec_remotepara_state,rec_remotepara[80];
+static u8 motor_state,rec_remotepara_state,rec_remotepara[80];
 
 
 #define SINGLEPOLL_BASENUM 5
@@ -763,6 +763,7 @@
             tagpoll_sync_sec = current_slotpos/200;
             tagslotpos = current_slotpos%200;
             max_slotpos = rec_tagperiod*20;
+            tag_frequency = 10/rec_tagperiod;
 			tag_state=NEARPOLL;
 		}
 	}else{
@@ -1159,7 +1160,7 @@
 {
 	static u8 regpoll_count=0;
 	mainbase_lost_count = 0;
-		tag_frequency = REGISTER_FREQUENCY;
+		//tag_frequency = REGISTER_FREQUENCY;
 		bigslot_num = TOTAL_SLOTNUM/tag_frequency;
 		regpoll_count++;
 		if(regpoll_count%2)
@@ -1227,17 +1228,17 @@
 								}
 							}
 }
+extern void FZNearPoll(void);
 u32 id,error_times=0;
-
+u8 ttt = 1;
 extern float Height;
-void Tag_App(void)//发送模式(TAG标签)
+void UWBWkWp(void)
 {
-	static uint8_t diccount = 0;
-	//LED0_ON;
 	SPIx_CS_GPIO->BRR = SPIx_CS;
 	delay_us(700);
 	SPIx_CS_GPIO->BSRR = SPIx_CS;
 	id =  dwt_readdevid() ;
+    
 	    while (DWT_DEVICE_ID != id) 
     {
 		//	Dw1000_Init();
@@ -1250,6 +1251,13 @@
         }
     }
     error_times = 0;
+}
+
+void Tag_App(void)//发送模式(TAG标签)
+{
+	static uint8_t diccount = 0,diccount2;
+	//LED0_ON;
+    UWBWkWp();
 	switch(tag_state)
 	{
 		case REGPOLL:
@@ -1293,8 +1301,9 @@
         case SINGLEPOLL:
           //  Poll();
             break;
-	}
+	}       
     FZNearPoll();
-     userkey_state = !GET_USERKEY;
+    dwt_forcetrxoff();
+    userkey_state = !GET_USERKEY;
 	dwt_entersleep();
 }

--
Gitblit v1.9.3