From 07691209317d73ebe7b89bce522cd43fa4bcadc0 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 11 六月 2021 17:25:47 +0800
Subject: [PATCH] V1.47 增加NLOS模式
---
源码/核心板/Src/main.c | 6 +-----
1 files changed, 1 insertions(+), 5 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..281dcec 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[VERSION] = 0x012f;
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