From f8b2fa433d03144490a1e887f3ffb56ca8fad97d Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 09 七月 2020 23:24:34 +0800
Subject: [PATCH] 修改部分bug,华星测试没问题

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

diff --git a/Src/main.c b/Src/main.c
index 1e06eb4..29e6e16 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -97,10 +97,10 @@
 			UART_CheckReceive();
 		UART_CheckSend();
 
-//if(huart1.Instance->ISR&USART_ISR_FE)
-//	{
-//	SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
-//	}	
+if(huart1.Instance->ISR&USART_ISR_FE)
+	{
+	SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
+	}	
 //if(!HAL_GPIO_ReadPin(PWR_ON_GPIO_Port,PWR_ON_Pin))
 //{
 //	LED_TR_ON;
@@ -211,7 +211,7 @@
 	Usart1ParseDataCallback = UsartParseDataHandler;
 	parameter_init();
 	//deca_sleep(1000);
-	g_com_map[VERSION] = 0x010b;
+	g_com_map[VERSION] = 0x010d;
 #ifdef DEBUG_MODE
 //	g_com_map[DEV_ROLE]=1;
 //		g_com_map[DEV_ID]=1;
@@ -240,7 +240,7 @@
   {
     Error_Handler();
   }
-
+//g_com_map[NOMOVESLEEP_TIME]=5;
 	printf("标签ID: %d .\r\n",dev_id);
 	printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]);
 	printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);

--
Gitblit v1.9.3