From 398a9412436a844e443a31eb0e55d5cd108eac5f Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 04 六月 2021 09:58:23 +0800
Subject: [PATCH] 测试临近切换模式

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

diff --git a/Src/main.c b/Src/main.c
index 9785627..57b3d76 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -184,6 +184,7 @@
 			break;	
 	}
 }
+    bat_percent=Get_Battary();
 	if(HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
 	{
 		nomove_count = 0;
@@ -260,7 +261,7 @@
 
 #ifdef FIXSLOT
 	fix_slotpos =FIXSLOTPOS;
-	//fix_slotpos = g_com_map[ALARM_DISTANCE1];
+	fix_slotpos = g_com_map[ALARM_DISTANCE2];
 	slotpos = fix_slotpos;
 	tagslotpos = fix_slotpos;
 #endif
@@ -310,7 +311,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] = 0x021b;
+	g_com_map[VERSION] = 0x021e;
 //	g_com_map[DEV_ID]=0x7;
 #ifdef DEBUG_MODE
 //	g_com_map[DEV_ROLE]=1;
@@ -487,8 +488,6 @@
 //		HAL_GPIO_WritePin(LED0_GPIO, GPIO_PIN_9, GPIO_PIN_RESET);
 //		}
 //		LED_TR_BLINK;
-		
-			bat_percent=Get_Battary();
 		if(bat_percent>15)
 		{	LED_TB_ON;
 			Tag_App();

--
Gitblit v1.9.3