From ed02ba669c5898bec4abb01843bb480beaec33a0 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 17 一月 2024 10:40:02 +0800
Subject: [PATCH] 版本V1.3，修复lora接收丢包的bug。
---
Core/Src/main.c | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/Core/Src/main.c b/Core/Src/main.c
index 8073793..a1d8d50 100644
--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@@ -126,15 +126,20 @@
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)|2;
+ g_com_map[VERSION] = (1<<8)|3;
if(g_com_map[GPS_ONTIME]==0/*||g_com_map[GPS_ONTIME]>10000*/)
{
g_com_map[GPS_ONTIME]=3600;
}
if(g_com_map[NOMOVESLEEP_TIME]==0||g_com_map[NOMOVESLEEP_TIME]>10000)
{
- g_com_map[NOMOVESLEEP_TIME]=3600;
+ g_com_map[NOMOVESLEEP_TIME]=3900;
}
+ if(g_com_map[NOMOVESLEEP_TIME]<g_com_map[GPS_ONTIME])
+ {
+ g_com_map[NOMOVESLEEP_TIME]=g_com_map[GPS_ONTIME]+300;
+ }
+// g_com_map[GPS_ONTIME]=60;
// g_com_map[DEV_ID]=0x7;
#ifdef DEBUG_MODE
// g_com_map[DEV_ROLE]=1;
@@ -276,7 +281,7 @@
}
void Time_to_restart_Poll (void)
{
- if(lp_time>=2000000000)
+ if(lp_time>=864000)//10天
{
delay_ms(100);
NVIC_SystemReset();
@@ -344,6 +349,10 @@
/* Infinite loop */
/* USER CODE BEGIN WHILE */
+// if(g_com_map[ACTIVE_INDEX]==0)
+// {
+// NOWAKEUP_Poll();
+// }
while (1)
{
// HAL_IWDG_Refresh(&hiwdg);
@@ -839,6 +848,7 @@
}
extern uint32_t lora_sendfinal_rx_time;
extern uint8_t lora_sendfinal_rx_bag_flag;
+extern uint8_t fengming_time,fengming_flag;
void HAL_LPTIM_CompareMatchCallback(LPTIM_HandleTypeDef *hlptim)
{
lp_time++;
@@ -857,6 +867,16 @@
lora_sendfinal_rx_bag_flag=0;
}
}
+ if(fengming_flag==1)
+ {
+ fengming_time--;
+ if(fengming_time<=0)
+ {
+ fengming_flag=0;
+ Beep_Off();
+ }
+ }
+
}
/* USER CODE END 4 */
--
Gitblit v1.9.3