From 2cb63340687ae2ada98c545227ffb247f48f3a9a Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期四, 11 五月 2023 11:05:41 +0800
Subject: [PATCH] V1.9
---
源码/核心板/Src/main.c | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 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 3dcdb27..e3831e5 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)|(70);
+ g_com_map[VERSION] = (1<<8)|(9);
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];
@@ -165,19 +168,9 @@
{
module_power=67;
}
-
- if(g_com_map[DEV_ROLE])
- {
- printf("标签ID: %d .\r\n",dev_id);
- printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]);
- printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
- }else{
-
- anchor_type = dev_id%g_com_map[MAX_REPORT_ANC_NUM];
- printf("基站ID: %x .\r\n",dev_id);
- printf("基站类型: %c .\r\n",anchor_type+0x41);
- printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
- }
+
+ printf("方向性防撞\r\n");
+
OUT485_DISABLE;
// printf("DEVICE PAIRID: %d .\r\n",g_com_map[PAIR_ID]);
// printf("DEVICE ALARM DISTANCE: 1.%d 2.%d 3.%d .\r\n",g_com_map[ALARM_DISTANCE1],g_com_map[ALARM_DISTANCE2],g_com_map[ALARM_DISTANCE3]);
--
Gitblit v1.9.3