From 1bd0743ea0e8783f11dd0b3c373617201ae9ffbf Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期六, 05 三月 2022 21:48:55 +0800 Subject: [PATCH] V1.65 修复继电器状态BUG --- 源码/核心板/Src/application/global_param.h | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 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 c2cd41e..9fc3f23 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" @@ -16,7 +16,7 @@ #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 //该设备是anchor还是tag @@ -27,18 +27,10 @@ #define ALARM_DISTANCE3 0xC //小于多少距离报警 #define PAIR_ID 0xD //小于多少距离报警 #define HEARTBEAT 0xE +#define MODBUS_MODE 0xF //MOBUS模式 -#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 RELAY1_STATE_INDEX 0x10 +#define RELAY2_STATE_INDEX 0x11 #define POWER 0x1B #define IMU_THRES 0x1C @@ -46,18 +38,26 @@ #define MOTOR_ENABLE 0x1E #define IMU_ENABLE 0x1F #define FILTER_COEFFICIENT 0x20 +#define SPEEDFILTER_THRES 0x24 //滤波参数 #define WHITELIST1_START 0x25 #define WHITELIST1_END 0x26 #define SW_TYPE 0x27 +#define WAR_JDQ_TIME 0x28 +#define ANT_LENGTH 0x2A #define CNT_RESTART 0x30 #define CNT_REBOOT 0x31 #define CNT_UPDATE 0x32 - -#define BOARD_TYPE 0x40 //板子类型 +#define CNT_UPDATE 0x32 +#define HARDWAREFLAG_INDEX 0x33 +#define BOARD_TYPE 0x40 //板子类型 #define ANC_FLAG 0x100 - +#define RELAY1ON_INDEX 0x78 +#define RELAY2ON_INDEX 0x79 +#define RELAY2_DISTANCE1 0x7A +#define RELAY2_DISTANCE2 0x7B +#define RELAY2_DISTANCE3 0x7C /*------------END Map Definition-------------------*/ @@ -65,6 +65,6 @@ extern uint32_t save_com_map_to_flash(void); extern void parameter_init(void); - +void FactorySettings(void); #endif -- Gitblit v1.9.3