From 810560554f3be7c23dabd7d484ef2b2822c2ae46 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 15 十二月 2020 10:43:57 +0800
Subject: [PATCH] 同步稳定性
---
Src/main.c | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 2ad2b87..b4cea85 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -29,7 +29,7 @@
#include "global_param.h"
#include "TrackingDiff.h"
#include "dw_app.h"
-#define DEBUG_MODE
+//#define DEBUG_MODE
/* USER CODE END Includes */
/* Private typedef -----------------------------------------------------------*/
@@ -210,17 +210,20 @@
u16 current_slotnum;
extern int32_t offsettimeus;
-//#define FIXSLOT
-#define FIXSLOTPOS 0
+#define FIXSLOT
+#define FIXSLOTPOS 1
u16 slotpos_intoatl;
uint16_t bigslot_num;
uint8_t fix_slotpos =FIXSLOTPOS;
int32_t lpcount,lptime,target_time;
+extern u16 tagslotpos;
void SetNextPollTime(u16 slotpos)
{
#ifdef FIXSLOT
+ fix_slotpos =0;// g_com_map[ALARM_DISTANCE1];
slotpos = fix_slotpos;
+ tagslotpos = fix_slotpos;
#endif
if(current_slotnum>=tag_frequency)
@@ -252,14 +255,14 @@
Usart1ParseDataCallback = UsartParseDataHandler;
parameter_init();
//deca_sleep(1000);
- g_com_map[VERSION] = 0x020b;
+ g_com_map[VERSION] = 0x020f;
#ifdef DEBUG_MODE
// g_com_map[DEV_ROLE]=1;
- g_com_map[DEV_ID]=0x11;
+ // g_com_map[DEV_ID]=0x11;
// 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[IMU_ENABLE]=0;
//g_com_map[COM_INTERVAL]=50;
#endif
//g_com_map[NOMOVESLEEP_TIME]=10;
@@ -668,16 +671,16 @@
Error_Handler();
}
/* USER CODE BEGIN USART1_Init 2 */
-// GPIO_InitStruct.Pin = GPIO_PIN_9;
-// GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
-// GPIO_InitStruct.Pull = GPIO_PULLUP;
-// GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
-// GPIO_InitStruct.Alternate = GPIO_AF4_USART1;
-// HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-// if(HAL_UART_Receive_IT(&huart1, (uint8_t *)aRxBuffer, 1) != HAL_OK)
-// {
-// Error_Handler();
-// }
+ GPIO_InitStruct.Pin = GPIO_PIN_9;
+ GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+ GPIO_InitStruct.Pull = GPIO_PULLUP;
+ GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
+ GPIO_InitStruct.Alternate = GPIO_AF4_USART1;
+ HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+ if(HAL_UART_Receive_IT(&huart1, (uint8_t *)aRxBuffer, 1) != HAL_OK)
+ {
+ Error_Handler();
+ }
Usart1InitVariables();
/* USER CODE END USART1_Init 2 */
--
Gitblit v1.9.3