From 0817c03a55b444ff4958723476f807486439e107 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期四, 24 七月 2025 17:43:29 +0800
Subject: [PATCH] 4G升级待详细测试，基本功能开发完成
---
keil/include/drivers/global_param.c | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/keil/include/drivers/global_param.c b/keil/include/drivers/global_param.c
index c3e86d8..a7ce497 100644
--- a/keil/include/drivers/global_param.c
+++ b/keil/include/drivers/global_param.c
@@ -58,6 +58,7 @@
void parameter_init(void)//注意看前面有没有关闭flash如果有则打开flash在读取，否则会出错
{ flash_open(FLASH_ID0,NULL);
+ int32_t preinstall_gpsbaudrate;
//FLASH_Read(FLASH_IAP_CTRL_MAP, (uint8_t*)&g_com_map, (COM_MAP_SIZE<<1));MK8000修改
flash_read(FLASH_ID0, FLASH_IAP_CTRL_MAP, (uint8_t*)&g_com_map, sizeof(g_com_map));
if(g_com_map[0] != 0x55AA)//第一次没有任何数据的话就默认这个
@@ -89,13 +90,16 @@
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[OTA_FLAG]=0;
-
- g_com_map[HEIGHTOFFEST_INDEX]=0;
+
+// g_com_map[OTA_FLAG]=0;
+ g_com_map[URT_BQ]=0;
+
+ preinstall_gpsbaudrate=115200;
+ g_com_map[GPSBAUDRATE1_INDEX] = preinstall_gpsbaudrate>>16;
+ g_com_map[GPSBAUDRATE2_INDEX] = preinstall_gpsbaudrate;
save_com_map_to_flash();
}
}
@@ -131,24 +135,24 @@
g_com_map[CNT_UPDATE]=0;
g_com_map[MODBUS_MODE]=0;
g_com_map[ACTIVE_INDEX]=0;
-
- g_com_map[IP_0]=39;
- g_com_map[IP_1]=106;
- g_com_map[IP_2]=210;
- g_com_map[IP_3]=13;
- g_com_map[PORT]=7000;
-
+
+ g_com_map[IP_0]=117;
+ g_com_map[IP_1]=72;
+ g_com_map[IP_2]=111;
+ g_com_map[IP_3]=237;
+ 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[GPSENBLE]=1;
g_com_map[UWBENBLE]=1;
g_com_map[GPSFrequency]=1;
g_com_map[UWBFrequency]=1;
-
+
g_com_map[HEIGHTOFFEST_INDEX]=0;
g_com_map[GPS_HZ]=1;
// g_com_map[STATIONARY_TIME] = 10;
--
Gitblit v1.9.3