From ec7fcd2c0c52ca05f5347bcf76fb5bd708d809a3 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 24 十一月 2020 11:10:39 +0800
Subject: [PATCH] 串口回复出厂设置

---
 源码/核心板/Src/main.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c"
index 58ab4fb..f341743 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c"
@@ -87,7 +87,7 @@
 		{
 			module_power=67;
 		}
-		g_com_map[VERSION] = 0x011f;	
+		g_com_map[VERSION] = 0x0123;	
 	temp=(float)g_com_map[MAX_REPORT_ANC_NUM]*4/3;	
 	temp2=g_com_map[MAX_REPORT_ANC_NUM]*4/3;
 	if(temp2<temp)
@@ -164,14 +164,14 @@
 			//	Delay_ms(100);
 				SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
 	}
-		if(g_com_map[CNT_REBOOT]==1)
-		{
-			g_com_map[CNT_REBOOT]=0;
-			g_com_map[MAP_SIGN_INDEX]=0;
-			save_com_map_to_flash();
-			delay_ms(100);
-			SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
-		}
+//		if(g_com_map[CNT_REBOOT]==1)
+//		{
+//			g_com_map[CNT_REBOOT]=0;
+//			g_com_map[MAP_SIGN_INDEX]=0;
+//			save_com_map_to_flash();
+//			delay_ms(100);
+//			SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
+//		}
 		if(g_com_map[CNT_RESTART]==1)
 		{
 			g_com_map[CNT_RESTART]=0;

--
Gitblit v1.9.3