From 737a981dc473a1e6018bd7e0db35fee69e5b3b01 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期五, 05 五月 2023 15:37:53 +0800
Subject: [PATCH] 初步测试完成
---
源码/核心板/Src/main.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 f5fc24f..7553ad5 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"
@@ -100,7 +100,8 @@
{dist_threshold = 15000;}
}
u16 JDQ_time;
-int16_t g_commap_antdelay;
+int16_t g_commap_antdelay,alarm_angle;
+extern uint16_t samegroup_ancid,anc_mount_dist;
void Program_Init(void)
{ float temp;
u16 temp2;
@@ -141,11 +142,13 @@
// g_com_map[FILTER_COEFFICIENT]=40;
// g_com_map[ANT_LENGTH]=0;
// g_com_map[NOMOVESLEEP_TIME]=728;
-
+ samegroup_ancid = g_com_map[MODBUS_ID2]; //同组基站ID
+ anc_mount_dist = g_com_map[MODBUS_ID3]; //基站安装距离
+ alarm_angle = g_com_map[MODBUS_ID4]; //基站报警角度
OUT485_ENABLE;
- g_com_map[VERSION] = (1<<8)|(69);
+ g_com_map[VERSION] = (1<<8)|(71);
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]);
g_commap_antdelay = g_com_map[ANT_LENGTH];
--
Gitblit v1.9.3