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 | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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 b592840..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,18 +142,20 @@
// 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;
- ComMapCheck();
- g_com_map[VERSION] = 0x013a;
- 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];
- JDQ_time = g_com_map[WAR_JDQ_TIME]*10;
+
+ 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];
+ JDQ_time = g_com_map[WAR_JDQ_TIME]*10;
g_com_map[SW_TYPE] = SW_FANGZHUANG;
dev_id = g_com_map[DEV_ID];
- group_id=g_com_map[GROUP_ID];
+ group_id=g_com_map[GROUP_ID];
slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3;
max_slotpos=g_com_map[COM_INTERVAL]/slottime;
tyncpoll_time=(g_com_map[DEV_ID]%max_slotpos)*slottime;
@@ -160,7 +163,7 @@
total_slotnum = 1000/g_com_map[COM_INTERVAL];
vel_factor=g_com_map[FILTER_COEFFICIENT];
pos_factor=g_com_map[FILTER_COEFFICIENT];
-
+ComMapCheck();
if(module_power>67)
{
module_power=67;
--
Gitblit v1.9.3