From ae0b42614c7f3de6f13c2ebacd3c1b46662ed9e9 Mon Sep 17 00:00:00 2001 From: zhangbo <zhangbo@qq.com> Date: 星期一, 23 六月 2025 17:26:33 +0800 Subject: [PATCH] 现场试用版 --- keil/lora_1268.h | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/keil/lora_1268.h b/keil/lora_1268.h index dad39b1..112f72b 100644 --- a/keil/lora_1268.h +++ b/keil/lora_1268.h @@ -157,7 +157,7 @@ #define HB_RESERVE_IDX 10//标签或者基站的设备ID 2个字节 -//#define LORA_MSGTYPE_TAGBTMSGTOWG +//#define LORA_MSGTYPE_TAGBTMSGTOWG——BT #define MSG_TYPE_IDX 0 //LORA MSG TYPE 定义 #define MSG_LENGTH 1 //报文长度 #define SOURCE_ID_IDX 2 //网关ID 占用2个字节 @@ -166,15 +166,17 @@ #define BAT_IDX 7 //标签电量 #define STATE_IDX 8 //按键/静止 #define BAR_HEIGHT_IDX 9 //气压高度 - #define STEP_COUNT 16 + #define STEP_COUNT 15 + #define EXERCISE_STATE 16 + #define RESERVED_POSITION 17 // #define GETWG_CHANL 11 //网关通道 // #define GETCHANL_NUM 12 //通道序号 // #define SIGNAL_STRENGTH 13 //信号强度 // #define ERROR_TIME 14 //误差时间 - #define STATION_NUM_UWB 16 //基站数量-蓝牙 + #define STATION_NUM_UWB 18 //基站数量-蓝牙 // #define STATION_NUM_UWB - #define BT_ANCID_IDX 15 //校验在4*ancnum+ANCID_IDX 位置 + #define BT_ANCID_IDX 18 //校验在4*ancnum+ANCID_IDX 位置 typedef enum{ WG_Lost, //上报丢失 失去和网关通讯 WG_Connected,// 上报中 和网关通讯正常 }wg_state_enum; -- Gitblit v1.9.3