From c6338b964effd7b5283ce74097dd84eabbd884d0 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期二, 20 十二月 2022 11:34:02 +0800
Subject: [PATCH] V2.60
---
Src/main.c | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 00b189d..652a76f 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -281,7 +281,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] = (2<<8)|54;
+ g_com_map[VERSION] = (2<<8)|60;
// g_com_map[DEV_ID]=0x7;
#ifdef DEBUG_MODE
@@ -318,7 +318,7 @@
tyncpoll_time=(g_com_map[DEV_ID]%max_slotpos)*slottime;
slot_startcount=tyncpoll_time*1000/LPTIMER_LSB;
lastpoll_time=tyncpoll_time;
- tag_frequency = 1000/g_com_map[COM_INTERVAL];
+ tag_frequency = 1;
bigslot_num = TOTAL_SLOTNUM/tag_frequency;
current_slotnum=1;
current_time=GetLPTime();
@@ -353,7 +353,7 @@
void HardWareTypeDiffConfig(void)
{
GPIO_InitTypeDef GPIO_InitStruct = {0};
- //if(g_com_map[MOTORBEEPER_INDEX]!=1&&g_com_map[MOTORBEEPER_INDEX]!=2)
+ if(g_com_map[MOTORBEEPER_INDEX]!=1&&g_com_map[MOTORBEEPER_INDEX]!=2)
{
g_com_map[MOTORBEEPER_INDEX] = 2;
}
@@ -924,17 +924,39 @@
/*Enter the Standby mode*/
HAL_PWR_EnterSTANDBYMode();
}
-extern u16 tagslotpos;
-extern uint8_t tx_near_msg[80],stationary_flag,gotosleep_flag;
+
+extern u16 tagslotpos,current_slotpos;
+extern uint8_t tx_near_msg[80],stationary_flag,gotosleep_flag,current_sync_sec,tagpoll_sync_sec,flag_tagnewpos;
float key_keeptime;
extern float motor_ontime;
+extern uint16_t rec_tagperiod;
+void GetRandomPos(void)
+{
+ current_slotpos = HAL_LPTIM_ReadCounter(&hlptim1)%max_slotpos; //如果丢失连接超过5次就随机换个时间片
+ tagpoll_sync_sec = current_slotpos/200;
+ tagslotpos = current_slotpos%200;
+ flag_tagnewpos = 0;
+}
void HAL_LPTIM_CompareMatchCallback(LPTIM_HandleTypeDef *hlptim)
{
static uint8_t i=0;
SystemClock_Config();
- g_start_send_flag=1;
+
// current_slotnum++;
// SetNextPollTime(tagslotpos);
+ if(current_slotpos>=max_slotpos)
+ {
+ GetRandomPos();
+ }
+ if(current_sync_sec==tagpoll_sync_sec)
+ {
+ g_start_send_flag=1;
+ }
+ current_sync_sec++;
+ if(current_sync_sec>=(rec_tagperiod)/10||current_sync_sec>10)
+ {
+ current_sync_sec=0;
+ }
nomove_count+=1/(float)tag_frequency;
if(motor_keeptime>0)
{
--
Gitblit v1.9.3