From 30473596c542f4e475b6654bedf63a4cd4e44214 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期三, 29 十一月 2023 16:12:56 +0800
Subject: [PATCH] Merge branch '定位-临近' of http://47.108.70.204:60062/r/XRange_Tag into 定位-临近
---
Src/main.c | 55 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 13 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 0e0f583..45d9c6a 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -99,6 +99,7 @@
u16 count=HAL_LPTIM_ReadCounter(&hlptim1);
return count*LPTIMER_LSB/1000;
}
+extern volatile int32_t m_EUART_DMA_RXPtr;
void UsartInit(void)
{
// waitusart_timer = tag_frequency*USART_KEEPWAKE_TIME;
@@ -108,16 +109,41 @@
{
Error_Handler();
}
+ m_EUART_DMA_RXPtr = 0;
+}
+static void MX_DMA_DeInit(void)
+{
+
+ /* DMA controller clock enable */
+ __HAL_RCC_DMA1_CLK_DISABLE();
+
+ /* DMA interrupt init */
+ /* DMA1_Channel2_3_IRQn interrupt configuration */
+ // HAL_NVIC_SetPriority(DMA1_Channel2_3_IRQn, 1, 0);
+ HAL_NVIC_DisableIRQ(DMA1_Channel2_3_IRQn);
+
+}
+void UsartDeInit(void)
+{
+ GPIO_InitTypeDef GPIO_InitStruct = {0};
+ waitusart_timer = 0;
+ MX_DMA_DeInit();
+ HAL_UART_DeInit(&huart1);
+ GPIO_InitStruct.Pin = GPIO_PIN_9|GPIO_PIN_10;
+ GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
+ GPIO_InitStruct.Pull = GPIO_NOPULL;
+ HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
}
uint16_t hardware_version,hardware_pici,hardware_type;
u16 current_time;
-uint8_t state5v;
+uint8_t state5v = 1;
void IdleTask(void)
{
-
- UART_CheckReceive();
+ if(state5v)
+ {
+ UART_CheckReceive();
UART_CheckSend();
-
+ }
if(huart1.Instance->ISR&USART_ISR_FE)
{
// SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
@@ -136,8 +162,6 @@
if(motor_keeptime>0)
{
motor_state = 2;
- }else{
- motor_state = 0;
}
//motor_state=2;
switch(motor_state)
@@ -203,7 +227,11 @@
LED_LG_OFF;
}
}else{
- state5v=0;
+ if(state5v==1)
+ {
+ state5v=0;
+ UsartDeInit();
+ }
LED_LR_OFF;
LED_LG_OFF;
// }
@@ -257,9 +285,9 @@
-void ErrorConfig_Handler(void)
+void CheckComMap(void)
{
- if(g_com_map[COM_INTERVAL]==0||g_com_map[COM_INTERVAL]>1000)
+ if(g_com_map[COM_INTERVAL]==0||g_com_map[COM_INTERVAL]>1000)
{
g_com_map[COM_INTERVAL]=100;
}
@@ -287,7 +315,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)|65;
+ g_com_map[VERSION] = (2<<8)|73;
// g_com_map[DEV_ID]=0x7;
#ifdef DEBUG_MODE
@@ -303,6 +331,7 @@
//g_com_map[NOMOVESLEEP_TIME]=10;
// g_com_map[IMU_ENABLE]=0;
// g_com_map[COM_INTERVAL]=50;
+CheckComMap();
active_flag = g_com_map[ACTIVE_INDEX];
if(active_flag==0)
{
@@ -442,7 +471,7 @@
LED_LG_ON;
Program_Init();
Accelerometer_Init();
- BarInit();
+ // BarInit();
Dw1000_Init();
Dw1000_App_Init();
HardWareTypeDiffConfig();
@@ -481,7 +510,7 @@
HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
#endif
}
- if(g_start_send_flag&&active_flag&&uwb_active_flag)
+ if(g_start_send_flag&&active_flag)
{ static uint16_t blink_count=0;
g_start_send_flag = 0;
// GetPressAndTemp();
@@ -538,7 +567,7 @@
/** Configure LSE Drive Capability
*/
HAL_PWR_EnableBkUpAccess();
- __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
+ __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_HIGH);
/** Initializes the RCC Oscillators according to the specified parameters
* in the RCC_OscInitTypeDef structure.
*/
--
Gitblit v1.9.3