From ab16ddec95bf2abfed4a7b19ef59444b1a75f126 Mon Sep 17 00:00:00 2001 From: yincheng.zhong <634916154@qq.com> Date: 星期三, 04 一月 2023 11:26:46 +0800 Subject: [PATCH] 1.自动时间片标签,修改升级触发逻辑,修改参数增加校验 --- Src/application/global_param.h | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Src/application/global_param.h b/Src/application/global_param.h index ba486d7..faeff3c 100644 --- a/Src/application/global_param.h +++ b/Src/application/global_param.h @@ -3,7 +3,7 @@ #include "main.h" -#define COM_MAP_SIZE 1024 //MAP表的最大空间 +#define COM_MAP_SIZE 512 //MAP表的最大空间 #define DEFAULT_DISTANCE 1000 //初始测距距离为10米 #define DEFAULT_DEV_ID 5555 //默认设备ID是5555 @@ -19,14 +19,15 @@ #define ANC_POLL 0x8 //基站主动测距 #define ALARM_DEV 0x9 //是哪个设备报警 -#define ALARM_DISTANCE1 0xA //小于多少距离报警 +#define STATIONARY_TIME 0xA //小于多少距离报警 #define ALARM_DISTANCE2 0xB //小于多少距离报警 #define ALARM_DISTANCE3 0xC //小于多少距离报警 #define PAIR_ID 0xD //小于多少距离报警 #define HEARTBEAT 0xE #define MODBUS_MODE 0xF -#define NEARBASE_NUM 0x10 +#define MOTOR_ONTIME_INDEX 0x10 +#define MOTORBEEPER_INDEX 0x11 #define NEARBASE_ID1 0x11 #define NEARBASE_ID2 0x12 #define NEARBASE_ID3 0x13 @@ -43,8 +44,11 @@ #define NOMOVESLEEP_TIME 0x1D #define MOTOR_ENABLE 0x1E #define IMU_ENABLE 0x1F -#define FILTER_COEFFICIENT 0x20 +#define REMOTEPARA_STATE 0x20 +#define IMU_DUARTION 0x21 +#define ACTIVE_INDEX 0x22 +#define HEIGHTOFFEST_INDEX 0x28 #define CNT_RESTART 0x30 #define CNT_REBOOT 0x31 @@ -55,9 +59,10 @@ extern uint16_t g_com_map[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 ReturnFactorySettings(void); #endif -- Gitblit v1.9.3