From fad1b368e3d987d753d3424c0144f574c6e44d2c Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期四, 11 四月 2024 11:14:06 +0800
Subject: [PATCH] Merge branch '免布线URT-LORA-L071' of http://47.108.70.204:60062/r/XRange_Tag into 免布线URT-LORA-L071
---
Src/main.c | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 0de9c9a..a33f031 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -125,7 +125,7 @@
uint8_t anjian_flag;
uint8_t stationary_flag;
uint16_t stationary_num;
-uint8_t recv_end_time;
+uint16_t recv_end_time;
u16 GetLPTime(void)
{
u16 count=HAL_LPTIM_ReadCounter(&hlptim1);
@@ -245,7 +245,7 @@
{
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
- if(memcmp(g_com_map2,g_com_map,200)!=0)
+ if(memcmp(g_com_map2,g_com_map,COM_MAP_SIZE)!=0)
{
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04;
}
@@ -306,7 +306,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)|10;
+ g_com_map[VERSION] = (1<<8)|15;
// g_com_map[DEV_ID]=1158;
// #ifdef DEBUG_MODE
// // g_com_map[GROUP_ID]=21;
@@ -346,6 +346,10 @@
{
g_com_map[COM_INTERVAL]=1000;
}
+ if(g_com_map[LORA_POWER]>22)
+ {
+ g_com_map[LORA_POWER] = 22;
+ }
if(module_power>67)
{module_power=67;}
if(module_power<0)
@@ -705,12 +709,12 @@
if(gotosleep_flag==1)
{
Jingzhi_Poll();
- HAL_IWDG_Refresh(&hiwdg);
+// HAL_IWDG_Refresh(&hiwdg);
HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
}
else
{
- HAL_IWDG_Refresh(&hiwdg);
+// HAL_IWDG_Refresh(&hiwdg);
Lpuart_rx_Poll();
OneSecondTask();
IdleTask();
@@ -1119,8 +1123,8 @@
/*Configure GPIO pin Output Level */
HAL_GPIO_WritePin(GPIOC, GPIO_PIN_13|GPIO_PIN_7|GPIO_PIN_8, GPIO_PIN_RESET);
-
- /*Configure GPIO pin Output Level */
+
+ /*Configure GPIO pin O__set_MSPutput Level */
HAL_GPIO_WritePin(GPIOC, RADIO_NSS_Pin|RADIO_nRESET_Pin|GPIO_PIN_4, GPIO_PIN_SET);
/*Configure GPIO pin Output Level */
@@ -1275,6 +1279,7 @@
yuyin_no_sleep_flag=0;
}
}
+#define NOGPS_RESET_TIME 300
void HAL_LPTIM_CompareMatchCallback(LPTIM_HandleTypeDef *hlptim)
{
if(chongqi_flag==0&&shengji_flag==0)
@@ -1287,8 +1292,8 @@
if(yuyin_no_sleep_flag==0)
{
recv_end_time++;
-// if(recv_end_time>3)
-// {HAL_NVIC_SystemReset();}
+ if(recv_end_time>NOGPS_RESET_TIME)
+ {HAL_NVIC_SystemReset();}
}
Yuying_Poll();
Lora_send_flag=1;
--
Gitblit v1.9.3