From 1b783d20cd9c53fada9c7855ed2b903399285de7 Mon Sep 17 00:00:00 2001 From: yincheng.zhong <634916154@qq.com> Date: 星期四, 21 三月 2024 14:52:30 +0800 Subject: [PATCH] V1.11尝试解决标签回复出厂设置BUG 1.去掉开机判断55AA标志位 2.map表2校验,不对就重启 --- Src/application/global_param.h | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Src/application/global_param.h b/Src/application/global_param.h index f9bd33d..24ea9f6 100644 --- a/Src/application/global_param.h +++ b/Src/application/global_param.h @@ -3,22 +3,24 @@ #include "main.h" -#define COM_MAP_SIZE 1024 //MAP表的最大空间 +#define COM_MAP_SIZE 150 //MAP表的最大空间 #define DEFAULT_DISTANCE 1000 //初始测距距离为10米 #define DEFAULT_DEV_ID 5555 //默认设备ID是5555 /*---------------Map Definition-------------------*/ +#define MAP_SIGN_INDEX 0x0 #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 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 //小于多少距离报警 +#define LORA_POWER 0xA #define ALARM_DISTANCE2 0xB //小于多少距离报警 #define ALARM_DISTANCE3 0xC //小于多少距离报警 #define PAIR_ID 0xD //小于多少距离报警 @@ -37,6 +39,18 @@ #define NEARBASE_ID9 0x19 #define NEARBASE_ID10 0x1a +#define POWER 0x1B +#define IMU_THRES 0x1C +#define NOMOVESLEEP_TIME 0x1D +#define MOTOR_ENABLE 0x1E +#define IMU_ENABLE 0x1F +#define REMOTEPARA_STATE 0x20 +#define ACTIVE_INDEX 0x22 +#define HEIGHTOFFEST_INDEX 0x28 + +#define MOTOR_ONTIME 500 +#define MOTOR_OFFTIME 500 + #define CNT_RESTART 0x30 #define CNT_REBOOT 0x31 #define CNT_UPDATE 0x32 @@ -45,10 +59,11 @@ /*------------END Map Definition-------------------*/ -extern uint16_t g_com_map[COM_MAP_SIZE]; +extern uint16_t g_com_map[COM_MAP_SIZE],g_com_map2[COM_MAP_SIZE]; +extern uint16_t rtag_com_map[30]; extern uint32_t save_com_map_to_flash(void); extern void parameter_init(void); - +void EnterUWBUpdateMode(void); #endif -- Gitblit v1.9.3