From ee0d5aab5ecbbd265660cba45c8a1946005b8f8c Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 18 九月 2024 13:49:17 +0800
Subject: [PATCH] v1.30，把gcom表1搬到表2的时候往后挪，防止保存出错一直重启。
---
Src/main.c | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 9588cc5..9e4e042 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -316,7 +316,7 @@
hardware_pici = STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+2);
hardware_type = STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+4);
//deca_sleep(1000);
- g_com_map[VERSION] = (1<<8)|25;
+ g_com_map[VERSION] = (1<<8)|30;
// g_com_map[DEV_ID]=1158;
// #ifdef DEBUG_MODE
// // g_com_map[GROUP_ID]=21;
@@ -373,7 +373,7 @@
// }
//g_com_map[NOMOVESLEEP_TIME]=5;
printf("固件版本: URT-LORA-GPS版本 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
- memcpy(g_com_map2,g_com_map,COM_MAP_SIZE);
+// memcpy(g_com_map2,g_com_map,COM_MAP_SIZE);
// printf("DEVICE PAIRID: %d .\r\n",g_com_map[PAIR_ID]);
// printf("DEVICE ALARM DISTANCE: 1.%d 2.%d 3.%d .\r\n",g_com_map[ALARM_DISTANCE1],g_com_map[ALARM_DISTANCE2],g_com_map[ALARM_DISTANCE3]);
@@ -452,7 +452,7 @@
// SystemClock_Config();
irq_num++;
lora_irq_flag = 1;
- // RadioIrqProcess();
+ RadioIrqProcess();
}
if(GPIO_Pin == GPIO_PIN_1)//按键
{
@@ -741,6 +741,7 @@
Error_Handler();
}
HAL_TIM_Base_Start_IT(&htim6);
+ memcpy(g_com_map2,g_com_map,COM_MAP_SIZE);
/* USER CODE END 2 */
/* Infinite loop */
@@ -759,13 +760,13 @@
else
{
// HAL_IWDG_Refresh(&hiwdg);
- if(lora_irq_flag)
- {
- lora_irq_flag = 0;
- lora_working_flag = 1;
- RadioIrqProcess();
- lora_working_flag = 0;
- }
+// if(lora_irq_flag)
+// {
+// lora_irq_flag = 0;
+// lora_working_flag = 1;
+// RadioIrqProcess();
+// lora_working_flag = 0;
+// }
// if(uwb_irq_flag)
// {
// MbxTagUwbRec();
--
Gitblit v1.9.3