From d8a6d069f2a7f2b836c84c5be40abed3dd393297 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 04 十二月 2024 16:26:57 +0800
Subject: [PATCH] V1.33,修复充电重启bug，修复灯充电常量bug，可以跟1.24的lora免布线基站测距
---
Src/application/global_param.c | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/Src/application/global_param.c b/Src/application/global_param.c
index b8dd86a..bec145f 100644
--- a/Src/application/global_param.c
+++ b/Src/application/global_param.c
@@ -14,7 +14,7 @@
if(result)
result = FLASH_Write(0x8004A38, (const uint8_t*)&tmp, 2);
__enable_irq();
- printf("进入升级模式\r\n");
+// printf("进入升级模式\r\n");
g_com_map[CNT_UPDATE]=0;
save_com_map_to_flash();
delay_ms(100);
@@ -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);
@@ -41,9 +46,9 @@
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;
@@ -69,8 +74,9 @@
g_com_map[CNT_REBOOT]=0;
g_com_map[CNT_UPDATE]=0;
g_com_map[MODBUS_MODE]=0;
-
+ g_com_map[LORA_SEND_INDEX] = 1;
g_com_map[NEARBASE_ID1]=0x470;
+ g_com_map[LORA_POWER]=22;
save_com_map_to_flash();
}
}
--
Gitblit v1.9.3