From da4743257980448c8e5de958d63c381ee7118359 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期三, 07 六月 2023 15:52:55 +0800
Subject: [PATCH] V1.64 重大更新 1.修改初始化代码,降低设备待机功耗到100ua(原来500ua)。 2.待机模式(无标签)5秒测距一次。 3.增加基站心跳包功能,携带基站版本号,功率,小组ID,电量,校准距离等参数,每分钟输出一次。

---
 Src/main.c |  180 +++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 123 insertions(+), 57 deletions(-)

diff --git a/Src/main.c b/Src/main.c
index 34a4d9b..93720ec 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -55,6 +55,8 @@
 /* Private variables ---------------------------------------------------------*/
 ADC_HandleTypeDef hadc;
 
+IWDG_HandleTypeDef hiwdg;
+
 LPTIM_HandleTypeDef hlptim1;
 
 SPI_HandleTypeDef hspi1;
@@ -78,6 +80,7 @@
 void MX_ADC_Init(void);
 static void MX_DMA_Init(void);
 static void MX_TIM2_Init(void);
+static void MX_IWDG_Init(void);
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
@@ -110,8 +113,31 @@
 	 Error_Handler();
 	}
 }
+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;
-uint8_t state5v;
+uint8_t state5v = 1;
 float motor_keeptime;
 void IdleTask(void)
 {u16 current_time;
@@ -140,7 +166,11 @@
 			LED_LG_OFF;		
 		}		
 	}else{
-		state5v=0;
+        if(state5v==1)
+        {
+            state5v=0;
+            UsartDeInit();
+        }
 		LED_LR_OFF;
 		LED_LG_OFF;
 //	}
@@ -218,7 +248,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] = (1<<8)|63;
+	g_com_map[VERSION] = (1<<8)|64;
     
     #ifdef DEBUG_MODE
    // g_com_map[GROUP_ID]=21;
@@ -298,12 +328,6 @@
 {
 		//SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
 }
-/* USER CODE END 0 */
-
-/**
-  * @brief  The application entry point.
-  * @retval int
-  */
 uint16_t temp2; 
 float dw_vbat,last_vbat;
 uint8_t Get_Battary_UWB(void)
@@ -337,6 +361,17 @@
     }
 	return last_value;	       
 }
+void MX_ADC_DeInit(void)
+{
+    HAL_ADC_DeInit(&hadc);
+    HAL_ADCEx_DisableVREFINT();
+}
+/* USER CODE END 0 */
+
+/**
+  * @brief  The application entry point.
+  * @retval int
+  */
 int main(void)
 {
   /* USER CODE BEGIN 1 */
@@ -360,29 +395,30 @@
   /* USER CODE END SysInit */
 
   /* Initialize all configured peripherals */
-  MX_GPIO_Init();
-  MX_LPTIM1_Init();
-   MX_DMA_Init();
-  MX_USART1_UART_Init();
-  MX_SPI1_Init();
- // MX_ADC_Init();
- 
-//  MX_TIM2_Init();
-  /* USER CODE BEGIN 2 */
-	LED_LG_ON;
-	Program_Init();
-//	LIS3DH_Data_Init();	
-	Dw1000_Init();
-	Dw1000_App_Init();
-//	HardWareTypeDiffConfig();
-	dwt_configuresleep(DWT_PRESRV_SLEEP | DWT_CONFIG, DWT_WAKE_CS | DWT_WAKE_WK| DWT_SLP_EN);
-	dwt_entersleep();
-	DW_DISABLE;
-	 if(HAL_UART_Receive_DMA(&huart1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE))
-	{
-	 Error_Handler();
-	}
-	HAL_Delay(2000);
+    MX_GPIO_Init();
+    MX_LPTIM1_Init();
+    MX_DMA_Init();
+    MX_USART1_UART_Init();
+    MX_SPI1_Init();
+    MX_ADC_Init();
+
+    //  MX_TIM2_Init();
+    MX_IWDG_Init();
+    /* USER CODE BEGIN 2 */
+    LED_LG_ON;
+    Program_Init();
+    //	LIS3DH_Data_Init();	
+    Dw1000_Init();
+    Dw1000_App_Init();
+    //	HardWareTypeDiffConfig();
+    dwt_configuresleep(DWT_PRESRV_SLEEP | DWT_CONFIG, DWT_WAKE_CS | DWT_WAKE_WK| DWT_SLP_EN);
+    dwt_entersleep();
+    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;		
 //	SystemPower_Config();
@@ -400,7 +436,7 @@
 	{ static uint16_t blink_count=0;
 		SystemClock_Config();
 		g_start_send_flag = 0;	
-		
+		HAL_IWDG_Refresh(&hiwdg);
 //		if(current_count>slot_startcount&&current_count<slot_startcount+interval_count)
 //		{
 //		HAL_GPIO_WritePin(LED0_GPIO, GPIO_PIN_9, GPIO_PIN_SET);
@@ -424,24 +460,21 @@
 		if(waitusart_timer>0)
 		{
 			waitusart_timer--;
-		}
-			if(m_bEUARTTxEn==0&&waitusart_timer==0)
-			{
-             if(memcmp(g_com_map2,g_com_map,200)!=0)
-             {
-                SCB->AIRCR = 0X05FA0000|(unsigned int)0x04;
-             }
-#ifndef DEBUG_MODE	
-if(!HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))				
-				HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);  
-#endif
-			}
-		
- 
+		}		 
 	}else{
 	IdleTask();	
 	}
-
+    if(m_bEUARTTxEn==0&&waitusart_timer==0)
+    {
+     if(memcmp(g_com_map2,g_com_map,200)!=0)
+     {
+        SCB->AIRCR = 0X05FA0000|(unsigned int)0x04;
+     }
+    #ifndef DEBUG_MODE	
+    if(!HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))				
+                    HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);  
+    #endif
+    }
 // HAL_Delay(100);
     //  Get_Battary();
 
@@ -469,10 +502,12 @@
   __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_HIGH);
   /** Initializes the CPU, AHB and APB busses clocks
   */
-  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI|RCC_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI|RCC_OSCILLATORTYPE_LSI
+                              |RCC_OSCILLATORTYPE_LSE;
   RCC_OscInitStruct.LSEState = RCC_LSE_ON;
   RCC_OscInitStruct.HSIState = RCC_HSI_ON;
   RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
+  RCC_OscInitStruct.LSIState = RCC_LSI_ON;
   RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
   RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI;
   RCC_OscInitStruct.PLL.PLLMUL = RCC_PLLMUL_4;
@@ -509,11 +544,6 @@
   * @param None
   * @retval None
   */
-void MX_ADC_DeInit(void)
-{
-    HAL_ADC_DeInit(&hadc);
-    HAL_ADCEx_DisableVREFINT();
-}
 void MX_ADC_Init(void)
 {
 
@@ -551,7 +581,7 @@
   }
   /** Configure for the selected ADC regular channel to be converted.
   */
-  sConfig.Channel = ADC_CHANNEL_VREFINT;
+  sConfig.Channel = ADC_CHANNEL_1;
   sConfig.Rank = ADC_RANK_CHANNEL_NUMBER;
   if (HAL_ADC_ConfigChannel(&hadc, &sConfig) != HAL_OK)
   {
@@ -561,6 +591,35 @@
     HAL_ADCEx_EnableVREFINT();
     HAL_ADCEx_Calibration_Start(&hadc,ADC_SINGLE_ENDED);
   /* USER CODE END ADC_Init 2 */
+
+}
+
+/**
+  * @brief IWDG Initialization Function
+  * @param None
+  * @retval None
+  */
+static void MX_IWDG_Init(void)
+{
+
+  /* USER CODE BEGIN IWDG_Init 0 */
+
+  /* USER CODE END IWDG_Init 0 */
+
+  /* USER CODE BEGIN IWDG_Init 1 */
+
+  /* USER CODE END IWDG_Init 1 */
+  hiwdg.Instance = IWDG;
+  hiwdg.Init.Prescaler = IWDG_PRESCALER_256;
+  hiwdg.Init.Window = 4095;
+  hiwdg.Init.Reload = 4095;
+  if (HAL_IWDG_Init(&hiwdg) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN IWDG_Init 2 */
+
+  /* USER CODE END IWDG_Init 2 */
 
 }
 
@@ -885,9 +944,9 @@
 extern float freqlost_count,range_lost_time;
 void HAL_LPTIM_CompareMatchCallback(LPTIM_HandleTypeDef *hlptim)
 {
-	static uint8_t i=0;
+	static uint8_t i=0,lost_jumpcount=0;
 	i++;
-	g_start_send_flag=1;
+	
 	current_slotnum++;
     freqlost_count+=1/(float)tag_frequency;
     range_lost_time +=1/(float)tag_frequency;
@@ -895,6 +954,13 @@
     if(freqlost_count>FREQ_LOST_TIME)
     {
         tag_frequency = NOTAG_FREQ;
+        if(lost_jumpcount++>=4) //无测距情况下,每5秒发一次;
+        {
+            lost_jumpcount = 0;
+            g_start_send_flag=1;
+        }
+    }else{
+        g_start_send_flag=1;
     }
     if(range_lost_time<1||freqlost_count>FREQ_LOST_TIME)
     {

--
Gitblit v1.9.3