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 | 43 +++++++++++++++++++++++++++++++++++--------
1 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/Src/application/global_param.c b/Src/application/global_param.c
index 55fc1f2..15acfcc 100644
--- a/Src/application/global_param.c
+++ b/Src/application/global_param.c
@@ -3,33 +3,54 @@
#include "dw_app.h"
#include <string.h>
-uint16_t g_com_map[COM_MAP_SIZE];
+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);
return result;
}
void parameter_init(void)
{
FLASH_Read(FLASH_IAP_CTRL_MAP, (uint8_t*)&g_com_map, (COM_MAP_SIZE<<1));
-
if(g_com_map[0] != 0x55AA)
{
g_com_map[0] = 0x55AA;
g_com_map[DEV_ID] =0x04;//DEFAULT_DEV_ID; //默认设备ID
g_com_map[COM_INTERVAL]=1000;
- g_com_map[MAX_REPORT_ANC_NUM]=1;
- g_com_map[MIN_REPORT_ANC_NUM]=1;
+ 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] =0x1; //标签
@@ -42,14 +63,20 @@
g_com_map[ALARM_DISTANCE3] = 0; //默认报警距离50cm
g_com_map[HEARTBEAT]=0;
- g_com_map[IMU_THRES]=1;
+ g_com_map[POWER]=67;
+ g_com_map[IMU_THRES]=2;
g_com_map[NOMOVESLEEP_TIME]=120;
g_com_map[MOTOR_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