From abb80bb7ac0048e9bd26c122afca32c00d7be237 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 10 十二月 2021 14:50:06 +0800
Subject: [PATCH] V1.58 增加信号强度输出
---
源码/核心板/Src/main.c | 68 +++++++++++++++++-----------------
1 files changed, 34 insertions(+), 34 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 0883c2c..b592840 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"
@@ -119,33 +119,33 @@
g_com_map[ANC_FLAG]=1;
save_com_map_to_flash();
#endif
-
- g_com_map[COM_INTERVAL]=100;
- g_com_map[MAX_REPORT_ANC_NUM]=10;
- g_com_map[GROUP_ID]=0;
- g_com_map[DIST_OFFSET]=-116;
+//
+// g_com_map[COM_INTERVAL]=100;
+// g_com_map[MAX_REPORT_ANC_NUM]=10;
+// g_com_map[GROUP_ID]=0;
+// g_com_map[DIST_OFFSET]=-116;
- g_com_map[DEV_ROLE] =0x0; //基站
-
- g_com_map[ANC_POLL]=1;
- g_com_map[ALARM_DEV] = 0;
- g_com_map[ALARM_DISTANCE1] = 0; //默认报警距离50cm
- g_com_map[ALARM_DISTANCE2] = 900; //默认报警距离50cm
- g_com_map[ALARM_DISTANCE3] = 1400; //默认报警距离50cm
- g_com_map[RELAY2_DISTANCE1] = 0; //默认报警距离50cm
- g_com_map[RELAY2_DISTANCE2] = 900; //默认报警距离50cm
- g_com_map[RELAY2_DISTANCE3] = 1400; //默认报警距离50cm
- g_com_map[WAR_JDQ_TIME] = 1; //1秒
- g_com_map[POWER]=30;
- g_com_map[SPEEDFILTER_THRES]=10000;
- g_com_map[FILTER_COEFFICIENT]=40;
- g_com_map[ANT_LENGTH]=0;
- g_com_map[NOMOVESLEEP_TIME]=728;
+// g_com_map[DEV_ROLE] =0x0; //基站
+//
+// g_com_map[ANC_POLL]=1;
+// g_com_map[ALARM_DEV] = 0;
+// g_com_map[ALARM_DISTANCE1] = 0; //默认报警距离50cm
+// g_com_map[ALARM_DISTANCE2] = 900; //默认报警距离50cm
+// g_com_map[ALARM_DISTANCE3] = 1400; //默认报警距离50cm
+// g_com_map[RELAY2_DISTANCE1] = 0; //默认报警距离50cm
+// g_com_map[RELAY2_DISTANCE2] = 900; //默认报警距离50cm
+// g_com_map[RELAY2_DISTANCE3] = 1400; //默认报警距离50cm
+// g_com_map[WAR_JDQ_TIME] = 1; //1秒
+// g_com_map[POWER]=30;
+// g_com_map[SPEEDFILTER_THRES]=10000;
+// g_com_map[FILTER_COEFFICIENT]=40;
+// g_com_map[ANT_LENGTH]=0;
+// g_com_map[NOMOVESLEEP_TIME]=728;
OUT485_ENABLE;
ComMapCheck();
- g_com_map[VERSION] = 0x0139;
+ 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];
@@ -166,18 +166,18 @@
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]);
-// }
+ 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]);
+ }
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