From 6e05e12690b25544bc4d678a9b814a864afe0b8d Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期六, 23 五月 2020 18:52:17 +0800 Subject: [PATCH] V1.23 标签没数据2S之后，MODBUS输出0x1ffff --- 源码/核心板/Src/application/global_param.h | 43 +++++++++++++++++++++++++++++++------------ 1 files changed, 31 insertions(+), 12 deletions(-) diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.h" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.h" index dfca262..3ea675a 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.h" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.h" @@ -8,14 +8,15 @@ #define DEFAULT_DEV_ID 5555 //默认设备ID是5555 /*---------------Map Definition-------------------*/ -#define VERSION 0x1 -#define DEV_ID 0x2 //设备的Id -#define COM_INTERVAL 0x3 //通讯间隔 -#define MAX_REPORT_ANC_NUM 0x4 //单次通讯基站上限 -#define MIN_REPORT_ANC_NUM 0x5 //单次通讯基站下限 -#define DIST_OFFSET 0x6 -#define DEV_ROLE 0x7 //该设备是anchor还是tag -#define ANC_POLL 0x8 //基站主动测距 +#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 DIST_OFFSET 0x6 +#define DEV_ROLE 0x7 //该设备是anchor还是tag +#define ANC_POLL 0x8 //基站主动测距 #define ALARM_DEV 0x9 //是哪个设备报警 #define ALARM_DISTANCE1 0xA //小于多少距离报警 @@ -25,10 +26,28 @@ #define HEARTBEAT 0xE #define MODBUS_MODE 0xF +#define NEARBASE_NUM 0x10 +#define NEARBASE_ID1 0x11 +#define NEARBASE_ID2 0x12 +#define NEARBASE_ID3 0x13 +#define NEARBASE_ID4 0x14 +#define NEARBASE_ID5 0x15 +#define NEARBASE_ID6 0x16 +#define NEARBASE_ID7 0x17 +#define NEARBASE_ID8 0x18 +#define NEARBASE_ID9 0x19 +#define NEARBASE_ID10 0x1a -#define CNT_RESTART 0x30 -#define CNT_REBOOT 0x31 -#define CNT_UPDATE 0x32 +#define POWER 0x1B +#define IMU_THRES 0x1C +#define NOMOVESLEEP_TIME 0x1D +#define MOTOR_ENABLE 0x1E +#define IMU_ENABLE 0x1F +#define FILTER_COEFFICIENT 0x20 + +#define CNT_RESTART 0x30 +#define CNT_REBOOT 0x31 +#define CNT_UPDATE 0x32 /*------------END Map Definition-------------------*/ @@ -38,6 +57,6 @@ extern uint32_t save_com_map_to_flash(void); extern void parameter_init(void); - +extern u8 group_id,sync_mainbase,synclost_timer; #endif -- Gitblit v1.9.3