From 7e864f1d0b26f0e5dd4c073f8fe764eb286fe961 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 06 五月 2021 12:59:59 +0800
Subject: [PATCH] 回退V1.41 无滤波

---
 源码/核心板/Src/main.c |    4 ----
 1 files changed, 0 insertions(+), 4 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 770bdd5..003a31c 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"
@@ -72,11 +72,7 @@
 	{
 	  g_com_map[COM_INTERVAL]=100;
 	}
-<<<<<<< HEAD
 	g_com_map[VERSION] = 0x012a;
-=======
-	g_com_map[VERSION] = 0x0127;
->>>>>>> parent of 47d2701 (V1.41  璐熸暟涓嶈緭鍑� 淇敼鍥炲485鏃犳樉绀築UG)
 	g_com_map[SW_TYPE] = 	SW_FANGZHUANG;
 	dev_id = g_com_map[DEV_ID];
 	slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3;

--
Gitblit v1.9.3