From 1b83e716601b4c7ba981a00be6ecf24a9d549d52 Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期三, 20 一月 2021 10:18:56 +0800 Subject: [PATCH] V2.20 1.增加静止时间判定参数,测距有BUG抖动较大 --- Src/application/global_param.h | 19 +++++-------------- 1 files changed, 5 insertions(+), 14 deletions(-) diff --git a/Src/application/global_param.h b/Src/application/global_param.h index 2ea6906..7fbe68c 100644 --- a/Src/application/global_param.h +++ b/Src/application/global_param.h @@ -19,14 +19,14 @@ #define ANC_POLL 0x8 //基站主动测距 #define ALARM_DEV 0x9 //是哪个设备报警 -#define ALARM_DISTANCE1 0xA //小于多少距离报警 +#define STATIONARY_TIME 0xA //小于多少距离报警 #define ALARM_DISTANCE2 0xB //小于多少距离报警 #define ALARM_DISTANCE3 0xC //小于多少距离报警 #define PAIR_ID 0xD //小于多少距离报警 #define HEARTBEAT 0xE #define MODBUS_MODE 0xF -#define NEARBASE_NUM 0x10 +#define MOTOR_ONTIME_INDEX 0x10 #define NEARBASE_ID1 0x11 #define NEARBASE_ID2 0x12 #define NEARBASE_ID3 0x13 @@ -44,7 +44,8 @@ #define MOTOR_ENABLE 0x1E #define IMU_ENABLE 0x1F #define REMOTEPARA_STATE 0x20 -#define MOTOR_ONTIME 0x21 + +#define ACTIVE_INDEX 0x22 #define CNT_RESTART 0x30 #define CNT_REBOOT 0x31 @@ -52,17 +53,7 @@ /*------------END Map Definition-------------------*/ -#define RT_COM_INTERVAL 0x0 //通讯间隔 -#define RT_MAX_REPORT_ANC_NUM 0x1 //单次通讯基站上限 -#define RT_GROUP_ID 0x2 //单次通讯基站下限 -#define RT_DIST_OFFSET 0x3 -#define POWER 0x4 -#define IMU_THRES 0x5 -#define NOMOVESLEEP_TIME 0x6 -#define MOTOR_ENABLE 0x7 -#define IMU_ENABLE 0x8 -#define REMOTEPARA_STATE 0x9 -#define MOTOR_ONTIME 0xa + extern uint16_t g_com_map[COM_MAP_SIZE]; extern uint16_t rtag_com_map[30]; -- Gitblit v1.9.3