From ba8b4881ef45267603fd56e167769664b9edd566 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期日, 28 五月 2023 15:15:02 +0800
Subject: [PATCH] V1.62 10标签对25基站测试通过，香港L4测试没问题
---
Src/main.c | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index f8259cb..e04679c 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -145,9 +145,9 @@
LED_LG_OFF;
// }
}
- if(g_com_map[MAP_SIGN_INDEX]!=0x55AA||g_com_map[COM_INTERVAL]==0)
+ if(g_com_map[MAP_SIGN_INDEX]!=0x55AA||g_com_map[COM_INTERVAL]==0)
{
- SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
+ SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
}
@@ -174,7 +174,7 @@
// {
// lpcount+=LPTIMER_1S_COUNT;
// }
- lpcount = last_lpcount+32768/tag_frequency;
+ lpcount = last_lpcount+32768/tag_frequency-time*LPTIMER_LSB;
while(lpcount>LPTIMER_1S_COUNT)
{
lpcount-=LPTIMER_1S_COUNT;
@@ -186,20 +186,20 @@
void HardWareTypeDiffConfig(void)
{
-GPIO_InitTypeDef GPIO_InitStruct = {0};
-//hardware_type=2;
-if(hardware_type == 0)
- hardware_type = 1;
+ GPIO_InitTypeDef GPIO_InitStruct = {0};
+ //hardware_type=2;
+ if(hardware_type == 0)
+ hardware_type = 1;
switch(hardware_type)
{
case 1:
HAL_GPIO_WritePin(GPIOB, MOTOR_Pin, GPIO_PIN_SET);
- GPIO_InitStruct.Pin = MOTOR_Pin;
- GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
- GPIO_InitStruct.Pull = GPIO_NOPULL;
- GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
- HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+ GPIO_InitStruct.Pin = MOTOR_Pin;
+ GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+ GPIO_InitStruct.Pull = GPIO_NOPULL;
+ GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+ HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
break;
case 2:
MX_TIM2_Init();
@@ -218,16 +218,17 @@
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)|54;
+ g_com_map[VERSION] = (1<<8)|62;
#ifdef DEBUG_MODE
-// g_com_map[GROUP_ID]=21;
+ // g_com_map[GROUP_ID]=21;
// g_com_map[DEV_ID]=4;
// g_com_map[COM_INTERVAL]=100;
// g_com_map[MAX_REPORT_ANC_NUM]=1;
// g_com_map[NOMOVESLEEP_TIME]=10;
#endif
-
+ g_com_map[GROUP_ID]=2;
+ g_com_map[COM_INTERVAL] = 1000;
active_flag = g_com_map[ACTIVE_INDEX];
module_power = g_com_map[POWER];
g_com_map[IMU_ENABLE] = 0;
@@ -881,7 +882,7 @@
}
extern uint8_t tx_near_msg[80],stationary_flag;
float key_keeptime;
-extern float freqlost_count;
+extern float freqlost_count,range_lost_time;
void HAL_LPTIM_CompareMatchCallback(LPTIM_HandleTypeDef *hlptim)
{
static uint8_t i=0;
@@ -889,11 +890,18 @@
g_start_send_flag=1;
current_slotnum++;
freqlost_count+=1/(float)tag_frequency;
+ range_lost_time +=1/(float)tag_frequency;
+
if(freqlost_count>FREQ_LOST_TIME)
{
tag_frequency = NOTAG_FREQ;
}
- SetNextPollTime(tyncpoll_time);
+ if(range_lost_time<1||freqlost_count>FREQ_LOST_TIME)
+ {
+ SetNextPollTime(0);
+ }else{
+ SetNextPollTime(5);
+ }
nomove_count+=1/(float)tag_frequency;
if(motor_keeptime>0)
{
--
Gitblit v1.9.3