From b4a3dfd45831f0db1e19f74beb685027e8dbc564 Mon Sep 17 00:00:00 2001 From: yincheng.zhong <634916154@qq.com> Date: 星期四, 29 八月 2024 12:04:09 +0800 Subject: [PATCH] 修改部分状态逻辑判断 --- keil/include/drivers/global_param.h | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/keil/include/drivers/global_param.h b/keil/include/drivers/global_param.h index e842940..f664074 100644 --- a/keil/include/drivers/global_param.h +++ b/keil/include/drivers/global_param.h @@ -8,23 +8,24 @@ #define DEFAULT_DEV_ID 5555 //默认设备ID是5555 /*---------------Map Definition-------------------*/ -#define MAP_SIGN_INDEX 0x0 -#define VERSION 0x1 -#define DEV_ID 0x2 //设备的Id +#define MAP_SIGN_INDEX 0x0 +#define VERSION 0x1 +#define DEV_ID 0x2 //设备的Id #define COM_INTERVAL 0x3 //通讯间隔 -#define MAX_REPORT_ANC_NUM 0x4 //单次通讯基站上限 -#define GROUP_ID 0x5 //单次通讯基站下限 + +#define MAX_REPORT_ANC_NUM 0x4 //单次通讯基站上限 +#define GROUP_ID 0x5 //单次通讯基站下限 #define DIST_OFFSET 0x6 -#define DEV_ROLE 0x7 //该设备是anchor还是tag -#define ANC_POLL 0x8 //基站主动测距 +#define DEV_ROLE 0x7 //该设备是anchor还是tag +#define ANC_POLL 0x8 //基站主动测距 #define ALARM_DEV 0x9 //是哪个设备报警 -#define ALARM_DISTANCE1 0xB //小于多少距离报警 +#define ALARM_DISTANCE1 0xA //小于多少距离报警 #define ALARM_DISTANCE2 0xB //小于多少距离报警 #define ALARM_DISTANCE3 0xC //小于多少距离报警 #define PAIR_ID 0xD //小于多少距离报警 -#define BIND_DEV_ID 0xD //绑定的设备ID + #define HEARTBEAT 0xE #define SEND_4G_SECOND 0xE //4G上报频率 #define MODBUS_MODE 0xF @@ -36,13 +37,14 @@ #define TCP_IP_1 0x12 #define TCP_IP_2 0x13 #define TCP_IP_3 0x14 -#define TCP_PORT 0x15 +#define TCP_PORT ALARM_DISTANCE3 #define NEARBASE_ID1 0x11 #define NEARBASE_ID2 0x12 #define NEARBASE_ID3 0x13 #define NEARBASE_ID4 0x14 #define NEARBASE_ID5 0x15 +#define BIND_DEV_ID 0x16//绑定的设备ID #define NEARBASE_ID6 0x16 #define NEARBASE_ID7 0x17 #define NEARBASE_ID8 0x18 -- Gitblit v1.9.3