From 1f703ab0c4761e3260b68481bf9f8626f08e7c98 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期五, 16 十二月 2022 14:09:12 +0800
Subject: [PATCH] V2.60
---
Src/main.c | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 5740eb0..e613194 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -281,14 +281,14 @@
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] = 0x022e;
+ g_com_map[VERSION] = (2<<8)|60;
// g_com_map[DEV_ID]=0x7;
#ifdef DEBUG_MODE
// g_com_map[DEV_ROLE]=1;
-// g_com_map[DEV_ID]=0x4009;
+ // g_com_map[DEV_ID]=0x4009;
// g_com_map[ACTIVE_INDEX]=1;
- g_com_map[COM_INTERVAL]=50;
+// g_com_map[COM_INTERVAL]=50;
// g_com_map[MAX_REPORT_ANC_NUM]=1;
// g_com_map[NOMOVESLEEP_TIME]=10;
// g_com_map[IMU_ENABLE]=0;
@@ -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;
}
@@ -416,8 +416,8 @@
/* USER CODE BEGIN 2 */
LED_LG_ON;
Program_Init();
- LIS3DH_Data_Init();
- BarInit();
+ Accelerometer_Init();
+ BarInit();
Dw1000_Init();
Dw1000_App_Init();
HardWareTypeDiffConfig();
@@ -429,7 +429,7 @@
{
Error_Handler();
}
- LIS3DH_Check();
+
// HAL_Delay(2000);
// mcu_sleep();
@@ -913,7 +913,7 @@
HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
- LIS3DH_Check();
+
HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
HAL_PWR_DisableWakeUpPin(PWR_WAKEUP_PIN1);
@@ -925,20 +925,31 @@
HAL_PWR_EnterSTANDBYMode();
}
extern u16 tagslotpos;
-extern uint8_t tx_near_msg[80],stationary_flag,gotosleep_flag;
+extern uint8_t tx_near_msg[80],stationary_flag,gotosleep_flag,current_sync_sec,tagpoll_sync_sec;
float key_keeptime;
extern float motor_ontime;
+extern uint16_t rec_tagperiod;
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_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)
{
- motor_keeptime-=1/(float)tag_frequency;
+ motor_keeptime-=1/(float)tag_frequency;
}
if(motor_keeptime<0)
{motor_keeptime = 0;}
--
Gitblit v1.9.3