From 5f2e06850028e286bd95cfd003dd0682af267be3 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期日, 29 三月 2020 11:29:07 +0800
Subject: [PATCH] 增加组ID模式
---
源码/核心板/Src/main.c | 10 +++++++---
1 files changed, 7 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 78c42c8..fe0e32d 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"
@@ -10,7 +10,7 @@
#include "serial_at_cmd_app.h"
#include "global_param.h"
#include "ADC.h"
-
+#include "modbus.h"
//#define DEBUG_MODE
void Device_Init(void)
@@ -45,6 +45,8 @@
memcpy(&hbsend[14],&checksum,2);
}
u16 tyncpoll_time;
+TrackingDiffClass *pUWBDistanceTrackingDiff;
+u8 group_id;
void Program_Init(void)
{uint16_t i;
float temp;
@@ -57,7 +59,7 @@
// g_com_map[DEV_ID]=1;
// g_com_map[COM_INTERVAL]=10;
OUT485_ENABLE;
-
+
#ifdef DEBUG_MODE
g_com_map[COM_INTERVAL]=50;
@@ -66,8 +68,10 @@
g_com_map[ANC_POLL]=0;
g_com_map[ALARM_DISTANCE1]=100;
#endif
+ //pUWBDistanceTrackingDiff = NewTrackingDiffClass(2, 4, 0.03);
dev_id = g_com_map[DEV_ID];
- g_com_map[VERSION] = 0x010b;
+ group_id=g_com_map[GROUP_ID];
+ g_com_map[VERSION] = 0x0113;
temp=(float)g_com_map[MAX_REPORT_ANC_NUM]*4/3;
temp2=g_com_map[DEV_ID]*g_com_map[MAX_REPORT_ANC_NUM]*4/3;
if(temp2<temp)
--
Gitblit v1.9.3