From 30473596c542f4e475b6654bedf63a4cd4e44214 Mon Sep 17 00:00:00 2001 From: yincheng.zhong <634916154@qq.com> Date: 星期三, 29 十一月 2023 16:12:56 +0800 Subject: [PATCH] Merge branch '定位-临近' of http://47.108.70.204:60062/r/XRange_Tag into 定位-临近 --- Src/application/global_param.h | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Src/application/global_param.h b/Src/application/global_param.h index 1fb4f91..f90658f 100644 --- a/Src/application/global_param.h +++ b/Src/application/global_param.h @@ -9,17 +9,17 @@ /*---------------Map Definition-------------------*/ #define MAP_SIGN_INDEX 0x0 -#define VERSION 0x1 +#define VERSION 0x1 #define DEV_ID 0x2 //设备的Id #define COM_INTERVAL 0x3 //通讯间隔 #define MAX_REPORT_ANC_NUM 0x4 //单次通讯基站上限 #define GROUP_ID 0x5 //单次通讯基站下限 -#define DIST_OFFSET 0x6 +#define DIST_OFFSET 0x6 #define DEV_ROLE 0x7 //该设备是anchor还是tag #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 //小于多少距离报警 @@ -27,6 +27,7 @@ #define MODBUS_MODE 0xF #define MOTOR_ONTIME_INDEX 0x10 +#define MOTORBEEPER_INDEX 0x11 #define NEARBASE_ID1 0x11 #define NEARBASE_ID2 0x12 #define NEARBASE_ID3 0x13 @@ -44,8 +45,10 @@ #define MOTOR_ENABLE 0x1E #define IMU_ENABLE 0x1F #define REMOTEPARA_STATE 0x20 - +#define IMU_DUARTION 0x21 #define ACTIVE_INDEX 0x22 +#define UWB_ACTIVE_FLAG_IDX 0x23 +#define HEIGHTOFFEST_INDEX 0x28 #define CNT_RESTART 0x30 #define CNT_REBOOT 0x31 -- Gitblit v1.9.3