From 3203b700d2d66b316843f310b135c916a74fafe6 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期二, 28 三月 2023 10:26:43 +0800
Subject: [PATCH] 1

---
 Src/main.c |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/Src/main.c b/Src/main.c
index 612786c..3eabb11 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -133,12 +133,12 @@
 if(g_com_map[MOTOR_ENABLE])
 {
     
-		if(motor_keeptime>0)
-		{
-			motor_state = 2;
-		}else{
-			motor_state = 0;
-		}
+//		if(motor_keeptime>0)
+//		{
+//			motor_state = 2;
+//		}else{
+//			motor_state = 0;
+//		}
 		//motor_state=2;
 	switch(motor_state)
 		{case 0:
@@ -257,7 +257,7 @@
 	hardware_pici= STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+2);
 	hardware_type= STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+4);
 	//deca_sleep(1000);
-	g_com_map[VERSION] = (2<<8)|62;
+	g_com_map[VERSION] = (2<<8)|1;
     
 //	g_com_map[DEV_ID]=0x7;
 #ifdef DEBUG_MODE
@@ -307,7 +307,7 @@
 //	printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]);
 //	printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
 	
-
+    printf("固件版本:标签-定位防撞-青岛 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
 //	printf("DEVICE PAIRID: %d .\r\n",g_com_map[PAIR_ID]);
 //	printf("DEVICE ALARM DISTANCE: 1.%d 2.%d 3.%d .\r\n",g_com_map[ALARM_DISTANCE1],g_com_map[ALARM_DISTANCE2],g_com_map[ALARM_DISTANCE3]);
 
@@ -333,7 +333,7 @@
 	{
 			g_com_map[MOTORBEEPER_INDEX] = 2;
 	}
-	hardware_type	= g_com_map[MOTORBEEPER_INDEX];
+	hardware_type	= 1;//g_com_map[MOTORBEEPER_INDEX];;
 	switch(hardware_type)
 		{
         case 1:	  
@@ -435,6 +435,7 @@
 		if(g_start_send_flag&&active_flag)
 	{ static uint16_t blink_count=0;
 		g_start_send_flag = 0;	
+        static u8 uwbcount =0;
 	//	GetPressAndTemp();
 //		if(current_count>slot_startcount&&current_count<slot_startcount+interval_count)
 //		{
@@ -453,6 +454,7 @@
 			Tag_App();
 			LED_TR_OFF;		
 		}
+    
 			__enable_irq();
 		//LED0_BLINK;		
 		IdleTask();	
@@ -917,9 +919,10 @@
 {
 	static uint8_t i=0;
 	SystemClock_Config();
-	
-//	current_slotnum++;
-//	SetNextPollTime(tagslotpos);
+if(tag_frequency>1)
+{	
+    g_start_send_flag=1;
+}else{
    if(current_slotpos>=max_slotpos)
    {
     GetRandomPos();
@@ -933,6 +936,7 @@
     {
         current_sync_sec=0;
     } 
+}
 	nomove_count+=1/(float)tag_frequency;
 	if(motor_keeptime>0)
 	{	

--
Gitblit v1.9.3