From 8eb8eba7ff14bab0754b0ec187f6c169112cd7a2 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 08 七月 2021 16:25:52 +0800
Subject: [PATCH] 修改单包模式发送气压BUG
---
Src/main.c | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 921b709..2831a86 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -184,6 +184,7 @@
break;
}
}
+ bat_percent=Get_Battary();
if(HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
{
nomove_count = 0;
@@ -260,7 +261,7 @@
#ifdef FIXSLOT
fix_slotpos =FIXSLOTPOS;
- //fix_slotpos = g_com_map[ALARM_DISTANCE1];
+ fix_slotpos = g_com_map[ALARM_DISTANCE2];
slotpos = fix_slotpos;
tagslotpos = fix_slotpos;
#endif
@@ -310,13 +311,13 @@
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] = 0x0217;
- g_com_map[DEV_ID]=0x6;
+ g_com_map[VERSION] = 0x0002;
+// g_com_map[DEV_ID]=0x7;
#ifdef DEBUG_MODE
// g_com_map[DEV_ROLE]=1;
- g_com_map[DEV_ID]=0x4008;
- g_com_map[ACTIVE_INDEX]=1;
-// g_com_map[COM_INTERVAL]=100;
+// g_com_map[DEV_ID]=0x4009;
+// g_com_map[ACTIVE_INDEX]=1;
+ g_com_map[COM_INTERVAL]=100;
// g_com_map[MAX_REPORT_ANC_NUM]=1;
// g_com_map[NOMOVESLEEP_TIME]=10;
// g_com_map[IMU_ENABLE]=0;
@@ -327,12 +328,13 @@
// g_com_map[COM_INTERVAL]=1000;
active_flag = g_com_map[ACTIVE_INDEX];
if(active_flag==0)
- { g_com_map[COM_INTERVAL]=1000;
+ {
+ g_com_map[COM_INTERVAL]=1000;
g_com_map[IMU_ENABLE]=1;
g_com_map[NOMOVESLEEP_TIME]=10;
g_com_map[MOTOR_ENABLE]=0;
}
-
+g_com_map[HEIGHTOFFEST_INDEX]=g_com_map[MAX_REPORT_ANC_NUM];
module_power = g_com_map[POWER];
imu_enable=g_com_map[IMU_ENABLE];
motor_enable=g_com_map[MOTOR_ENABLE];
@@ -382,7 +384,7 @@
GPIO_InitTypeDef GPIO_InitStruct = {0};
//hardware_type=2;
if(hardware_type == 0)
- hardware_type = 1;
+ hardware_type = 2;
switch(hardware_type)
{
case 1:
@@ -396,7 +398,7 @@
break;
case 2:
MX_TIM2_Init();
- //BarInit();
+ BarInit();
break;
}
}
@@ -444,17 +446,19 @@
LED_LG_ON;
Program_Init();
LIS3DH_Data_Init();
+ // BarInit();
Dw1000_Init();
Dw1000_App_Init();
HardWareTypeDiffConfig();
dwt_configuresleep(DWT_PRESRV_SLEEP | DWT_CONFIG, DWT_WAKE_CS | DWT_WAKE_WK| DWT_SLP_EN);
- //dwt_entersleep();
+ dwt_entersleep();
waitusart_timer=tag_frequency*USART_KEEPWAKE_TIME;;
DW_DISABLE;
if(HAL_UART_Receive_DMA(&huart1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE))
{
Error_Handler();
}
+
// HAL_Delay(2000);
// mcu_sleep();
//LED0_BLINK;
@@ -485,8 +489,6 @@
// HAL_GPIO_WritePin(LED0_GPIO, GPIO_PIN_9, GPIO_PIN_RESET);
// }
// LED_TR_BLINK;
-
- bat_percent=Get_Battary();
if(bat_percent>15)
{ LED_TB_ON;
Tag_App();
@@ -960,10 +962,10 @@
g_start_send_flag=1;
current_slotnum++;
SetNextPollTime(tagslotpos);
- nomove_count+=(float)g_com_map[COM_INTERVAL]/1000;
+ nomove_count+=1/(float)tag_frequency;
if(motor_keeptime>0)
{
- motor_keeptime-=(float)g_com_map[COM_INTERVAL]/1000;
+ motor_keeptime-=1/(float)tag_frequency;
}
if(motor_keeptime<0)
{motor_keeptime = 0;}
@@ -972,7 +974,7 @@
if(!GET_USERKEY)
{
LED_LG_ON;
- key_keeptime+=(float)g_com_map[COM_INTERVAL]/1000;
+ key_keeptime+=1/(float)tag_frequency;
if(key_keeptime>3)
{
u8 i=250,keystate=1;
@@ -1004,7 +1006,7 @@
if(!GET_USERKEY)
{
- key_keeptime+=(float)g_com_map[COM_INTERVAL]/1000;
+ key_keeptime+=1/(float)tag_frequency;
if(key_keeptime>=KEY_KEEPRESET_TIME)
{
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04;
@@ -1024,10 +1026,12 @@
}else{
gotosleep_flag=0;
}
+#ifndef DEBUG_MODE
if(nomove_count>g_com_map[NOMOVESLEEP_TIME]&&imu_enable)
{
mcu_sleep();
}
+#endif
}
/* USER CODE END 4 */
--
Gitblit v1.9.3