From 0f740df1a59278f05b8fb28e92be5075dbc8aa86 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 16 八月 2021 16:52:27 +0800
Subject: [PATCH] 去掉继电器，修改标签输出和其他基站测距信息，以及MODBUS
---
源码/核心板/Src/main.c | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 509aec6..a1bab41 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"
@@ -14,7 +14,6 @@
#include "deca_device_api.h"
#include "Flash.h"
//#define DEBUG_MODE
-
void Device_Init(void)
{
RCC_Configuration();
@@ -80,9 +79,9 @@
group_id=g_com_map[GROUP_ID];
vel_factor=g_com_map[FILTER_COEFFICIENT];
pos_factor=g_com_map[FILTER_COEFFICIENT];
- dist_threshold = g_com_map[SPEEDFILTER_THRES]/(1000/g_com_map[COM_INTERVAL]);
- if(dist_threshold<30)
- {dist_threshold = 30;}
+ dist_threshold = (g_com_map[SPEEDFILTER_THRES]*10)/(1000/g_com_map[COM_INTERVAL]);
+ if(dist_threshold<300)
+ {dist_threshold = 300;}
if(dist_threshold>15000)
{dist_threshold = 15000;}
if(dev_id==0)
@@ -92,7 +91,8 @@
{
module_power=67;
}
- g_com_map[VERSION] = 0x0123;
+ g_com_map[VERSION] = 0x012c;
+ g_com_map[SW_TYPE] = SW_MODBUS;
temp=(float)g_com_map[MAX_REPORT_ANC_NUM]*4/3;
temp2=g_com_map[MAX_REPORT_ANC_NUM]*4/3;
if(temp2<temp)
@@ -203,6 +203,11 @@
Modbus_RegMap();
while(1)
{
+ if(g_com_map[0] != 0x55AA)
+ {
+ while(1)
+ IdleTask();
+ }
if(g_start_send_flag)
{
g_start_send_flag = 0;
--
Gitblit v1.9.3