From 652158f9e454819fc17364f90d727706e298d4f1 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期三, 02 四月 2025 14:32:19 +0800
Subject: [PATCH] 修改室内外判断逻辑现在的根据卫星强度，卫星数量以及是否有固定解判断在室内还是在室外
---
keil/include/drivers/global_param.c | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/keil/include/drivers/global_param.c b/keil/include/drivers/global_param.c
index c87e2cd..13f298c 100644
--- a/keil/include/drivers/global_param.c
+++ b/keil/include/drivers/global_param.c
@@ -63,9 +63,9 @@
if(g_com_map[0] != 0x55AA)//第一次没有任何数据的话就默认这个
{
g_com_map[0] = 0x55AA;
- g_com_map[DEV_ID] =0x1234;//DEFAULT_DEV_ID; //默认设备ID
+ g_com_map[DEV_ID] =0x1235;//DEFAULT_DEV_ID; //默认设备ID
- g_com_map[COM_INTERVAL]=500; //频率2HZ
+ g_com_map[COM_INTERVAL]=200; //频率2HZ
g_com_map[MAX_REPORT_ANC_NUM]=10;
g_com_map[GROUP_ID]=0;
g_com_map[DIST_OFFSET]=-31;
@@ -89,10 +89,10 @@
g_com_map[TCP_IP_0]=0x111;
g_com_map[TCP_IP_0]=0x198;
- g_com_map[TCP_IP_0]=0x60;
+ g_com_map[TCP_IP_0]=0x60;
g_com_map[TCP_IP_0]=0x6;
g_com_map[TCP_IP_0]=1234;
-
+
g_com_map[HEIGHTOFFEST_INDEX]=0;
save_com_map_to_flash();
}
@@ -106,14 +106,14 @@
if(g_com_map[0] != 0x55AA)//第一次没有任何数据的话就默认这个
{
g_com_map[0] = 0x55AA;
- g_com_map[DEV_ID] =0x1234;//DEFAULT_DEV_ID; //默认设备ID
+ g_com_map[DEV_ID] =0x1235;//DEFAULT_DEV_ID; //默认设备ID
- g_com_map[COM_INTERVAL]=500; //频率2HZ
+ g_com_map[COM_INTERVAL]=1000; //频率2HZ
g_com_map[MAX_REPORT_ANC_NUM]=10;
g_com_map[GROUP_ID]=0;
g_com_map[DIST_OFFSET]=-31;
- g_com_map[DEV_ROLE] =0x0; //基站
+ g_com_map[DEV_ROLE] =0x1; //标签
g_com_map[HEARTBEAT]=0;
@@ -123,20 +123,28 @@
g_com_map[NOMOVESLEEP_TIME]=120; //静止休眠2分钟
g_com_map[MOTOR_ENABLE]=1; //震动电机使能
g_com_map[IMU_ENABLE]=1; //静止休眠使能
-
+ g_com_map[RTCMMODE_INDEX] = 0;
g_com_map[CNT_RESTART]=0;
g_com_map[CNT_REBOOT]=0;
g_com_map[CNT_UPDATE]=0;
g_com_map[MODBUS_MODE]=0;
g_com_map[ACTIVE_INDEX]=0;
-
- g_com_map[TCP_IP_0]=0x111;
- g_com_map[TCP_IP_1]=0x198;
- g_com_map[TCP_IP_2]=0x60;
- g_com_map[TCP_IP_3]=0x6;
- g_com_map[TCP_PORT]=0x1234;
-
+
+ g_com_map[IP_0]=111;
+ g_com_map[IP_1]=198;
+ g_com_map[IP_2]=60;
+ g_com_map[IP_3]=6;
+ g_com_map[PORT]=1102;
+
+ g_com_map[TCP_IP_0]=121;
+ g_com_map[TCP_IP_1]=33;
+ g_com_map[TCP_IP_2]=226;
+ g_com_map[TCP_IP_3]=42;
+ g_com_map[TCP_PORT]=9039;
+
g_com_map[HEIGHTOFFEST_INDEX]=0;
+ g_com_map[GPS_HZ]=1;
+// g_com_map[STATIONARY_TIME] = 10;
save_com_map_to_flash();
}
}
\ No newline at end of file
--
Gitblit v1.9.3