From ae3ae39f3e61c067f392ec75348ec9ba0ac7506a Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期日, 13 三月 2022 19:53:54 +0800
Subject: [PATCH] 去报警距离=1标签才输出

---
 源码/核心板/Src/main.c |    4 +++-
 1 files changed, 3 insertions(+), 1 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 1c48faa..a95452d 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"
@@ -142,7 +142,7 @@
         
 	OUT485_ENABLE;
 	ComMapCheck();	
-	g_com_map[VERSION] = 1<<8|64;
+	g_com_map[VERSION] = 1<<8|66;
     FLASH_Read(FLASH_HARDWARE_FLAG, (uint8_t*)&g_com_map[HARDWAREFLAG_INDEX], 16);
     dist_threshold = (g_com_map[SPEEDFILTER_THRES]*10)/(1000/g_com_map[COM_INTERVAL]);
      if(dist_threshold<300)
@@ -304,6 +304,8 @@
 		{
 				SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
 		}
+        g_com_map[RELAY1_STATE_INDEX] = READ_RELAY1;
+		g_com_map[RELAY2_STATE_INDEX] = READ_RELAY2;
 
 	}
     

--
Gitblit v1.9.3