From 7411f11aa0e680f982e50bd3343d25b05e6ccec1 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期五, 29 十一月 2024 18:00:50 +0800
Subject: [PATCH] 2.60,临近配置1  可以配置物资还是手环。

---
 Src/main.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Src/main.c b/Src/main.c
index d7b6c90..e271287 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -288,7 +288,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)|58;
+	g_com_map[VERSION] = (2<<8)|60;
     
 //	g_com_map[DEV_ID]=0x7;
 #ifdef DEBUG_MODE
@@ -369,7 +369,7 @@
 	{
 			g_com_map[MOTORBEEPER_INDEX] = 1;
 	}
-	hardware_type	= NSH1;//g_com_map[MOTORBEEPER_INDEX];
+	hardware_type	= /*NSH1;//*/g_com_map[MOTORBEEPER_INDEX];
 	switch(hardware_type)
 		{
         case 1:	  
@@ -487,7 +487,7 @@
 				HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);  
 #endif
 			}
-		if(g_start_send_flag&&active_flag&&uwb_active_flag)
+		if(g_start_send_flag&&active_flag/*&&uwb_active_flag*/)
 	{ static uint16_t blink_count=0;
 		g_start_send_flag = 0;	
 	//	GetPressAndTemp();

--
Gitblit v1.9.3