From 4691492f913d0730703f8fcdacd0a02d455d65a1 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期一, 29 一月 2024 10:37:32 +0800
Subject: [PATCH] 国新智能V1.7
---
Src/application/global_param.c | 80 ++++++++++++++++++++--------------------
1 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/Src/application/global_param.c b/Src/application/global_param.c
index 68a299b..30f75a3 100644
--- a/Src/application/global_param.c
+++ b/Src/application/global_param.c
@@ -35,57 +35,57 @@
uint32_t save_com_map_to_flash(void)
{
- uint32_t result = 0;
+ uint32_t result = 0;
if(parameter_check()) //参数错误，不保存
{
return 1;
}
- __disable_irq();
- result = FLASH_Prepare(FLASH_IAP_CTRL_MAP, (COM_MAP_SIZE<<1));
- if(result)
- result = FLASH_Write(FLASH_IAP_CTRL_MAP, (const uint8_t*)g_com_map, (COM_MAP_SIZE<<1));
- __enable_irq();
- return result;
+ __disable_irq();
+ result = FLASH_Prepare(FLASH_IAP_CTRL_MAP, (COM_MAP_SIZE<<1));
+ if(result)
+ result = FLASH_Write(FLASH_IAP_CTRL_MAP, (const uint8_t*)g_com_map, (COM_MAP_SIZE<<1));
+ __enable_irq();
+ return result;
}
void parameter_init(void)
{
- FLASH_Read(FLASH_IAP_CTRL_MAP, (uint8_t*)&g_com_map, (COM_MAP_SIZE<<1));
+ 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
+ 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]=500;
- 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; //标签
+ g_com_map[COM_INTERVAL]=500;
+ g_com_map[MAX_REPORT_ANC_NUM]=10;
+ g_com_map[GROUP_ID]=0;
+ g_com_map[DIST_OFFSET]=-31;
- g_com_map[NEARBASE_NUM]=0;
- g_com_map[ANC_POLL]=0;
- g_com_map[ALARM_DEV] = 0;
- g_com_map[ALARM_DISTANCE1] = 0; //默认报警距离50cm
- g_com_map[ALARM_DISTANCE2] = 0; //默认报警距离50cm
- g_com_map[ALARM_DISTANCE3] = 0; //默认报警距离50cm
- g_com_map[HEARTBEAT]=0;
-
- 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]=1;
-
+ g_com_map[DEV_ROLE] =0x1; //标签
+
+ g_com_map[NEARBASE_NUM]=0;
+ g_com_map[ANC_POLL]=0;
+ g_com_map[ALARM_DEV] = 0;
+ g_com_map[ALARM_DISTANCE1] = 0; //默认报警距离50cm
+ g_com_map[ALARM_DISTANCE2] = 0; //默认报警距离50cm
+ g_com_map[ALARM_DISTANCE3] = 0; //默认报警距离50cm
+ g_com_map[HEARTBEAT]=0;
+
+ 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]=1;
+
g_com_map[ANT_LENGTH] = 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;
- save_com_map_to_flash();
- }
+
+ 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;
+ save_com_map_to_flash();
+ }
}
--
Gitblit v1.9.3