From b45fe21c1ae4689bb551efea21cee6e46a780380 Mon Sep 17 00:00:00 2001 From: chen <15335560115@163.com> Date: 星期四, 31 十月 2024 17:11:41 +0800 Subject: [PATCH] 修复充电灯指示休眠状态下不亮和闪烁问题，增加充电电量过低4Ggps关闭机制，增加充电到安全阈值后恢复4G，GPS工作逻辑，增加充电灯指示，增加静止休眠唤醒逻辑 --- keil/include/drivers/global_param.h | 51 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 30 insertions(+), 21 deletions(-) diff --git a/keil/include/drivers/global_param.h b/keil/include/drivers/global_param.h index eddccaf..19f745e 100644 --- a/keil/include/drivers/global_param.h +++ b/keil/include/drivers/global_param.h @@ -8,45 +8,58 @@ #define DEFAULT_DEV_ID 5555 //默认设备ID是5555 /*---------------Map Definition-------------------*/ -#define MAP_SIGN_INDEX 0x0 -#define VERSION 0x1 -#define DEV_ID 0x2 //设备的Id +#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 OFFSET_AS_TAG 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 DEV_ROLE 0x7 //该设备是anchor还是tag +#define ANC_POLL 0x8 //基站主动测距 #define ALARM_DEV 0x9 //是哪个设备报警 -#define ALARM_DISTANCE1 0xB //小于多少距离报警 +#define ALARM_DISTANCE1 0xA //小于多少距离报警 #define ALARM_DISTANCE2 0xB //小于多少距离报警 #define ALARM_DISTANCE3 0xC //小于多少距离报警 #define PAIR_ID 0xD //小于多少距离报警 -#define BIND_DEV_ID 0xD //绑定的设备ID + #define HEARTBEAT 0xE -#define SEND_4G_FREQUENCY 0xE //4G上报频率 + #define MODBUS_MODE 0xF +#define QUIT_SLOT_TIME 10 #define MOTOR_ONTIME_INDEX 0x10 -#define MOTORBEEPER_INDEX 0x11 + +#define TCP_IP_0 0x11 +#define TCP_IP_1 0x12 +#define TCP_IP_2 0x13 +#define TCP_IP_3 0x14 +#define TCP_PORT ALARM_DISTANCE3 + #define NEARBASE_ID1 0x11 #define NEARBASE_ID2 0x12 #define NEARBASE_ID3 0x13 #define NEARBASE_ID4 0x14 #define NEARBASE_ID5 0x15 +#define BIND_DEV_ID 0x16//绑定的设备ID #define NEARBASE_ID6 0x16 #define NEARBASE_ID7 0x17 #define NEARBASE_ID8 0x18 #define NEARBASE_ID9 0x19 +#define LOG_4G_ENABLE 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 SEND_4G_SECOND 0x1B //4G上报频率 +#define POWER 0x1B +#define IMU_THRES 0x1C +#define NOMOVESLEEP_TIME 0x1D +#define MOTOR_ENABLE 0x1E +#define IMU_ENABLE 0x1F #define REMOTEPARA_STATE 0x20 #define IMU_DUARTION 0x21 #define ACTIVE_INDEX 0x22 @@ -57,11 +70,7 @@ #define CNT_REBOOT 0x31 #define CNT_UPDATE 0x32 -#define TCP_IP_0 0x39 -#define TCP_IP_1 0x3a -#define TCP_IP_2 0x3b -#define TCP_IP_3 0x3c -#define TCP_PORT 0x3d + /*------------END Map Definition-------------------*/ -- Gitblit v1.9.3