From a2cae4f3385f728da201750ea304f362d8ad85a9 Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期六, 11 七月 2020 13:25:07 +0800 Subject: [PATCH] 修改输出格式，和标签ID BUG。华星测试没问题 --- 源码/核心板/Src/application/global_param.h | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 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 317c3fe..c1ba1ec 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" @@ -3,11 +3,12 @@ #include "stm32f10x.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 - +#define SYNCLOST_TIME 10000 //多久收不到信号变成同步基站 /*---------------Map Definition-------------------*/ +#define MAP_SIGN_INDEX 0x0 #define VERSION 0x1 #define DEV_ID 0x2 //设备的Id #define COM_INTERVAL 0x3 //通讯间隔 @@ -24,11 +25,32 @@ #define PAIR_ID 0xD //小于多少距离报警 #define HEARTBEAT 0xE +#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 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 +#define ANC_FLAG 0x100 + /*------------END Map Definition-------------------*/ -- Gitblit v1.9.3