From 25c460c9da82215badc40a3ee917670263669f8e Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 25 三月 2021 17:48:40 +0800
Subject: [PATCH] V1.43 去掉滤波 单基站输出

---
 源码/核心板/Src/main.c |    4 ++++
 1 files changed, 4 insertions(+), 0 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 003a31c..770bdd5 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,7 +72,11 @@
 	{
 	  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