From 003aff1766ffd3ccfe9df6096ef137340ebfeabf Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 18 十二月 2020 16:57:26 +0800
Subject: [PATCH] Merge branch '调试' into 定位-临近
---
Src/application/global_param.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Src/application/global_param.c b/Src/application/global_param.c
index c0c0d96..910f9ba 100644
--- a/Src/application/global_param.c
+++ b/Src/application/global_param.c
@@ -25,7 +25,7 @@
if(g_com_map[0] != 0x55AA)
{
g_com_map[0] = 0x55AA;
- g_com_map[DEV_ID] =0x04;//DEFAULT_DEV_ID; //默认设备ID
+ g_com_map[DEV_ID] =1000;//DEFAULT_DEV_ID; //默认设备ID
g_com_map[COM_INTERVAL]=500;
g_com_map[MAX_REPORT_ANC_NUM]=10;
@@ -42,7 +42,7 @@
g_com_map[ALARM_DISTANCE3] = 0; //默认报警距离50cm
g_com_map[HEARTBEAT]=0;
- g_com_map[POWER]=67;
+ g_com_map[POWER]=DEFAULT_RFPOWER;
g_com_map[IMU_THRES]=2;
g_com_map[NOMOVESLEEP_TIME]=120;
g_com_map[MOTOR_ENABLE]=1;
@@ -52,6 +52,7 @@
g_com_map[CNT_REBOOT]=0;
g_com_map[CNT_UPDATE]=0;
g_com_map[MODBUS_MODE]=0;
+ g_com_map[ACTIVE_INDEX]=0;
save_com_map_to_flash();
}
}
--
Gitblit v1.9.3