From dbe010cbc556a3f07136b7eac67e62f115285db8 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期日, 24 三月 2024 19:00:15 +0800
Subject: [PATCH] Merge branch '免布线URT-LORA-L071' of http://47.108.70.204:60062/r/XRange_Tag into 免布线URT-LORA-L071
---
Src/application/global_param.c | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Src/application/global_param.c b/Src/application/global_param.c
index 45ab9ea..15acfcc 100644
--- a/Src/application/global_param.c
+++ b/Src/application/global_param.c
@@ -28,7 +28,12 @@
__disable_irq();
result = FLASH_Prepare(FLASH_IAP_CTRL_MAP, (COM_MAP_SIZE<<1));
- if(result)
+ while(!result)
+ {
+ result = FLASH_Prepare(FLASH_IAP_CTRL_MAP, (COM_MAP_SIZE<<1));
+ delay_ms(200);
+ }
+ if(result)
result = FLASH_Write(FLASH_IAP_CTRL_MAP, (const uint8_t*)g_com_map, (COM_MAP_SIZE<<1));
__enable_irq();
memcpy(g_com_map2,g_com_map,COM_MAP_SIZE);
@@ -43,7 +48,7 @@
g_com_map[0] = 0x55AA;
g_com_map[DEV_ID] =0x04;//DEFAULT_DEV_ID; //默认设备ID
- g_com_map[COM_INTERVAL]=500;
+ g_com_map[COM_INTERVAL]=1000;
g_com_map[MAX_REPORT_ANC_NUM]=10;
g_com_map[GROUP_ID]=0;
g_com_map[DIST_OFFSET]=-31;
@@ -69,6 +74,9 @@
g_com_map[CNT_REBOOT]=0;
g_com_map[CNT_UPDATE]=0;
g_com_map[MODBUS_MODE]=0;
+
+ g_com_map[NEARBASE_ID1]=0x470;
+ g_com_map[LORA_POWER]=22;
save_com_map_to_flash();
}
}
--
Gitblit v1.9.3