From d7ae88de69a07630a40dbea7fb3bf36fc7f9445b Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 08 四月 2021 14:49:04 +0800
Subject: [PATCH] V2.24 修改未激活模式UWB不休眠BUG
---
Src/main.c | 48 ++++++++++++++++++++++++++++--------------------
1 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 466e2ed..5bf4ea3 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -255,7 +255,7 @@
uint8_t fix_slotpos =FIXSLOTPOS;
int32_t lpcount,lptime,target_time;
extern u16 tagslotpos;
-void SetNextPollTime(u16 slotpos)
+void SetNextPollTime(u16 slotpos) //时间片逻辑：上来默认计算一个时间，时间同步之后，就近选择时间片。SetNextPollTime会调整下次发送
{
#ifdef FIXSLOT
@@ -286,8 +286,20 @@
__HAL_LPTIM_COMPARE_SET(&hlptim1, lpcount);
}
}
+void ErrorConfig_Handler(void)
+{
+ if(g_com_map[COM_INTERVAL]==0||g_com_map[COM_INTERVAL]>1000)
+ {
+ g_com_map[COM_INTERVAL]=100;
+ }
+ if(g_com_map[IMU_THRES]>10)
+ {g_com_map[IMU_THRES]=2;}
+ if(g_com_map[POWER]>MAX_RFPOWER)
+ {g_com_map[POWER]=MAX_RFPOWER;}
+ if(g_com_map[POWER]<0)
+ {g_com_map[POWER]=0;}
+}
u8 active_flag=0;
-
void Program_Init(void)
{ float temp;
uint16_t temp2;
@@ -298,16 +310,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] = 0x0214;
-// g_com_map[DEV_ID]=0x11;
+ g_com_map[VERSION] = 0x0218;
+// g_com_map[DEV_ID]=0x7;
#ifdef DEBUG_MODE
// g_com_map[DEV_ROLE]=1;
- g_com_map[DEV_ID]=0x10;
+ g_com_map[DEV_ID]=0x4008;
+ 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;
- g_com_map[COM_INTERVAL]=50;
+// g_com_map[IMU_ENABLE]=0;
+// g_com_map[COM_INTERVAL]=50;
#endif
//g_com_map[NOMOVESLEEP_TIME]=10;
// g_com_map[IMU_ENABLE]=0;
@@ -319,16 +332,7 @@
g_com_map[NOMOVESLEEP_TIME]=10;
g_com_map[MOTOR_ENABLE]=0;
}
- if(g_com_map[COM_INTERVAL]==0)
- {
- g_com_map[COM_INTERVAL]=100;
- }
- if(g_com_map[IMU_THRES]>10)
- {g_com_map[IMU_THRES]=2;}
- if(g_com_map[POWER]>MAX_RFPOWER)
- {g_com_map[POWER]=MAX_RFPOWER;}
- if(g_com_map[POWER]<0)
- {g_com_map[POWER]=0;}
+
module_power = g_com_map[POWER];
imu_enable=g_com_map[IMU_ENABLE];
motor_enable=g_com_map[MOTOR_ENABLE];
@@ -377,8 +381,11 @@
{
GPIO_InitTypeDef GPIO_InitStruct = {0};
//hardware_type=2;
+if(hardware_type == 0)
+ hardware_type = 1;
switch(hardware_type)
- {case 1:
+ {
+ case 1:
HAL_GPIO_WritePin(GPIOB, MOTOR_Pin, GPIO_PIN_SET);
GPIO_InitStruct.Pin = MOTOR_Pin;
@@ -441,7 +448,7 @@
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))
@@ -949,6 +956,7 @@
{
static uint8_t i=0;
i++;
+
g_start_send_flag=1;
current_slotnum++;
SetNextPollTime(tagslotpos);
@@ -1032,7 +1040,7 @@
/* USER CODE BEGIN Error_Handler_Debug */
/* User can add his own implementation to report the HAL error return state */
// while (1)
-// {
+// {}
// /* USER CODE BEGIN W1_HardFault_IRQn 0 */
// //SCB->AIRCR = 0X05FA0000|(unsigned int)0x04;
// /* USER CODE END W1_HardFault_IRQn 0 */
--
Gitblit v1.9.3