From 1b4876fa8c75d9a0f3ffbfdc515a59a776f9dd65 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期五, 19 四月 2024 14:42:27 +0800
Subject: [PATCH] 增加数据上传秒延迟模式，增加远距离通道，测试网关通讯能力模式
---
Src/application/global_param.c | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/Src/application/global_param.c b/Src/application/global_param.c
index 3c41564..0ece85d 100644
--- a/Src/application/global_param.c
+++ b/Src/application/global_param.c
@@ -5,14 +5,35 @@
uint16_t g_com_map[COM_MAP_SIZE],g_com_map2[COM_MAP_SIZE];
-
+void EnterUWBUpdateMode(void)
+{
+ uint32_t result = 0;
+ uint16_t tmp = 0xCCCC;
+ __disable_irq();
+ result = FLASH_Prepare(0x8004A38, 128);
+ if(result)
+ result = FLASH_Write(0x8004A38, (const uint8_t*)&tmp, 2);
+ __enable_irq();
+// printf("进入升级模式\r\n");
+ g_com_map[CNT_UPDATE]=0;
+ save_com_map_to_flash();
+ delay_ms(100);
+ // STMFLASH_Write_NoCheck(0x8004A38,0xAAAA);
+ // Delay_ms(100);
+ SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
+}
uint32_t save_com_map_to_flash(void)
{
uint32_t result = 0;
__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);
@@ -22,13 +43,12 @@
void parameter_init(void)
{
FLASH_Read(FLASH_IAP_CTRL_MAP, (uint8_t*)&g_com_map, (COM_MAP_SIZE<<1));
- memcpy(g_com_map2,g_com_map,COM_MAP_SIZE);
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] =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;
@@ -47,13 +67,16 @@
g_com_map[IMU_THRES]=2;
g_com_map[NOMOVESLEEP_TIME]=120;
g_com_map[MOTOR_ENABLE]=1;
- g_com_map[IMU_ENABLE]=1;
+ g_com_map[IMU_ENABLE]=0;
g_com_map[ACTIVE_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[NEARBASE_ID1]=0x470;
+ g_com_map[LORA_POWER]=22;
save_com_map_to_flash();
}
}
--
Gitblit v1.9.3