From 58bf13b0569714d03afe101a3abb4d2419ec9e30 Mon Sep 17 00:00:00 2001 From: yincheng.zhong <634916154@qq.com> Date: 星期日, 25 二月 2024 19:04:38 +0800 Subject: [PATCH] Merge branch '免布线基站-lora' of http://47.108.70.204:60062/r/XRange_Tag into 免布线基站-lora --- Src/application/dw_mbx_anc.h | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 deletions(-) diff --git a/Src/application/dw_mbx_anc.h b/Src/application/dw_mbx_anc.h index 51100d2..9532178 100644 --- a/Src/application/dw_mbx_anc.h +++ b/Src/application/dw_mbx_anc.h @@ -20,14 +20,21 @@ #define LORA_MSGTYPE_RANGEPOLL 4//基站发起测距同步信号 #define LORA_MSGTYPE_UPDATEFILE_REQUEST 5//基站发送给网关升级文件请求 #define LORA_MSGTYPE_UPDATEFILE_RESP 6//网关回复基站升级文件内容 -#define LORA_MSGTYPE_ANCHEARTBEAT_POLL 7//网关回复基站升级文件内容 + +#define LORA_MSGTYPE_WGRESPTAG 8//网关回复标签测距定位报文 +#define LORA_MSGTYPE_TAG_HEARTBEAT 0x33//标签心跳包上传 +#define LORA_MSGTYPE_ANC_HEARTBEAT 0x32//基站心跳包上传 +#define LORA_MSGTYPE_WG_RESPONSE_TAG 11//网关回复标签测距报文 + +#define LORA_MSGTYPE_TAGMSGTOWG 0x22//标签距离信息发给网关 +#define LORA_MSGTYPE_TAGMSGTOWG_GPS 0x23//标签距离信息发给网关带GPS #define LORA_MSGTYPE_READPARARESP 0x39 //标签基站回复网关读取配置指令 //SYNC消息下 子消息类型定义 #define SUBMSG_NONE 0//无其他消息 只是同步信号 #define SUBMSG_READ_ANCPARA 0x12//子消息类型：读取基站配置 #define SUBMSG_WRITE_ANCPARA 0x11//子消息类型：写基站配置 #define SUBMSG_UPDATE_TAG 5//子消息类型：升级标签 -#define SUBMSG_UPDATE_ANC 6//子消息类型：升级基站 +#define SUBMSG_UPDATE_ANC 0x16//子消息类型：升级基站 //SYNC消息类型格式 #define MSG_TYPE_IDX 0 //LORA MSG TYPE 定义 #define MSG_LENGTH 1 //报文长度 @@ -50,8 +57,16 @@ #define ANC_UWBPOLLTIME_IDX 7 #define ANC_RESERVE_IDX 8 //保留5个字节 //基站心跳包消息类型格式（基站->网关） -#define MSG_TYPE_IDX 0 //LORA MSG TYPE 定义 -#define ANC_ID_IDX 1 +#define MSG_TYPE_IDX 0 //LORA MSG TYPE 定义 +#define MSG_LENGTH 1 //报文长度 +#define SOURCE_ID_IDX 2 //网关ID 占用2个字节 +#define DEST_ID_IDX 4 //标签或者基站的设备ID 2个字节 +#define ANC_HB_VERSION_IDX 6 //版本号 +#define ANC_HB_UWBPOLLTIME_IDX 8 //UWB发送时间 +#define ANC_HB_UWBPOWER_IDX 10 //UWB功率 +#define ANC_HB_LORAPOWER_IDX 11 //lora功率 +#define ANC_HB_BATTARY_IDX 12 //电量 +#define ANC_HB_RESERVE 13 //保留 4个字节 #define WGRSP_RWTAG_NONE 0//网关回复标签，无读写 #define WGRSP_RWTAG_READ 2//网关回复标签，无读写 @@ -67,10 +82,10 @@ #define RP_LEN_IDX 8 //标签或者基站的设备ID 2个字节 -#define WANGGUAN_ID 1 -#define JIZHAN_ID 3 -#define MUQIAN_BAG 5 -#define DATA_IDX 6 +//#define WANGGUAN_ID 1 +//#define JIZHAN_ID 3 +#define MUQIAN_BAG 6 +#define DATA_IDX 7 #define ONE_BAG_DAXIAO 220 #define RX_BEFORE_SYNCTIME_US 12000 -- Gitblit v1.9.3