From 27043c6cbe5dc65519c3adbe96868622aab84ba2 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期四, 09 十一月 2023 10:10:23 +0800
Subject: [PATCH] 气压计测试程序  1s输出一包高度数据。

---
 Src/main.c |  202 ++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 153 insertions(+), 49 deletions(-)

diff --git a/Src/main.c b/Src/main.c
index 2d78f69..79def85 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -53,6 +53,8 @@
 /* Private variables ---------------------------------------------------------*/
 ADC_HandleTypeDef hadc;
 
+IWDG_HandleTypeDef hiwdg;
+
 LPTIM_HandleTypeDef hlptim1;
 
 SPI_HandleTypeDef hspi1;
@@ -76,6 +78,7 @@
 static 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 */
@@ -152,8 +155,8 @@
 		state5v=0;
 		LED_LR_OFF;
 		LED_LG_OFF;
-//	}
-}
+	}
+//}
 	if(g_com_map[CNT_UPDATE]==1)
 	{
 	uint32_t result = 0;
@@ -219,6 +222,10 @@
         {
         g_com_map[STATIONARY_TIME]=10;
         }
+				if(g_com_map[NOMOVESLEEP_TIME]<120)
+				{
+					g_com_map[NOMOVESLEEP_TIME] = 120;
+				}
         
 }
 uint8_t uwb_active_flag = 0;
@@ -234,9 +241,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] = (2<<8)|5;
-    
-//	g_com_map[DEV_ID]=0x7;
+#ifdef QIYA_JIZHAN
+	g_com_map[VERSION] = (2<<8)|1;
+#else
+	g_com_map[VERSION] = (2<<8)|11;
+#endif
+  ErrorConfig_Handler();
+	//g_com_map[DEV_ID]=0x9444;
 #ifdef DEBUG_MODE
 //	g_com_map[DEV_ROLE]=1;
 	//	g_com_map[DEV_ID]=0x4009;
@@ -283,7 +294,11 @@
   {
     Error_Handler();
   }
-   printf("固件版本:SS双路定位标签-防撞基站 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
+#ifdef QIYA_JIZHAN	
+   printf("固件版本:L051-嘉峪关-气压基站 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
+#else
+	printf("固件版本:L051-嘉峪关-定位标签防撞基站 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
+#endif
 //g_com_map[NOMOVESLEEP_TIME]=5;
 //	printf("标签ID: %d .\r\n",dev_id);
 //	printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]);
@@ -354,8 +369,28 @@
 {
 		//SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
 }
-int Pressure_Para[11],Temperature_Para[3];
+extern  int Pressure_Para[11],Temperature_Para[3];
 extern float Altitude;
+u8 BMP390_ID;
+u8 Config;
+void BarInit(void)
+{
+	    /*气压计*/
+
+    BMP390_ID = BMP390_Init();
+    Parameter_Reading(Pressure_Para,Temperature_Para);
+	//Judge the relevant state of the sensor
+	Config = BMP390_Read_Byte(ERR_REG_Addr);
+	if(Config&0x01) 
+    printf("Fatal Error");
+	else 
+    printf("No errors.");
+	if((Config>>1)&0x01) 
+    printf("Failed.");
+	else 
+    printf("Successful.");
+    /*气压计*/
+}
 /* USER CODE END 0 */
 
 /**
@@ -386,48 +421,33 @@
 
   /* Initialize all configured peripherals */
   MX_GPIO_Init();
-//  MX_LPTIM1_Init();
-//    MX_DMA_Init();
-//  MX_USART1_UART_Init();
-//  MX_SPI1_Init();
-//  MX_ADC_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();
-//	Accelerometer_Init();	
-//   // BarInit();
-//	Dw1000_Init();
-//	Dw1000_App_Init();
-//	HardWareTypeDiffConfig();
+  MX_TIM2_Init();
+  MX_IWDG_Init();
+  /* USER CODE BEGIN 2 */
+	LED_LG_ON;
+	Program_Init();
+	Accelerometer_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();
 //	waitusart_timer=tag_frequency*USART_KEEPWAKE_TIME;;
-//    dwt_setinterrupt(  DWT_INT_RFCG | (DWT_INT_ARFE | DWT_INT_RFSL | DWT_INT_SFDT | DWT_INT_RPHE | DWT_INT_RFCE | DWT_INT_RFTO | DWT_INT_RXPTO), 1);
-//    dwt_setrxtimeout(0);//设定接收超时时间,0位没有
-//    dwt_rxenable(0);
-//	DW_DISABLE;
-	Bmp390Init();
-	while(1);
-    /*气压计*/
-//    IIC_Init();
-//    u8 BMP390_ID;
-//    u8 Config;
-//    BMP390_ID = BMP390_Init();
-//    Parameter_Reading(Pressure_Para,Temperature_Para);
-	//Judge the relevant state of the sensor
-//	Config = BMP390_Read_Byte(ERR_REG_Addr);
-//	if(Config&0x01) 
-//    printf("Fatal Error");
-//	else 
-//    printf("No errors.");
-//	if((Config>>1)&0x01) 
-//    printf("Failed.");
-//	else 
-//    printf("Successful.");
-    /*气压计*/
 
+		BarInit();
+	DW_DISABLE;
+    
+	 if(HAL_UART_Receive_DMA(&huart1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE))
+	{
+	 Error_Handler();
+	}
    
 	
 //	HAL_Delay(2000);
@@ -441,7 +461,54 @@
   /* USER CODE BEGIN WHILE */
   while (1)
   {
+    /* USER CODE END WHILE */
 
+    /* USER CODE BEGIN 3 */
+//				while(1)
+//		{
+//		MODBUS_Poll();
+//		}
+		HAL_IWDG_Refresh(&hiwdg);
+if(m_bEUARTTxEn==0&&(motor_state==0||motor_state==3))
+			{	
+#ifndef DEBUG_MODE	
+				if(!HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
+				HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);  
+#endif
+			}
+		if(g_start_send_flag)
+	{ static uint16_t blink_count=0;
+		g_start_send_flag = 0;	
+	//	GetPressAndTemp();
+//		if(current_count>slot_startcount&&current_count<slot_startcount+interval_count)
+//		{
+//		HAL_GPIO_WritePin(LED0_GPIO, GPIO_PIN_9, GPIO_PIN_SET);
+//		}else{
+//		HAL_GPIO_WritePin(LED0_GPIO, GPIO_PIN_9, GPIO_PIN_RESET);
+//		}
+//		LED_TR_BLINK;
+
+			__disable_irq();
+		if(bat_percent>15)
+		{	LED_TB_ON;
+			Tag_App();
+			LED_TB_OFF;
+		}else{
+			LED_TR_ON;
+			Tag_App();
+			LED_TR_OFF;		
+		}
+			__enable_irq();
+		//LED0_BLINK;		
+		IdleTask();	
+		if(waitusart_timer>0)
+		{
+			waitusart_timer--;
+		}
+		
+	}else{
+	IdleTask();	
+	}
 
 // HAL_Delay(100);
     //  Get_Battary();
@@ -467,14 +534,16 @@
   /** 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.
   */
-  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;
@@ -557,6 +626,35 @@
   /* USER CODE BEGIN ADC_Init 2 */
 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 */
 
 }
 
@@ -819,11 +917,11 @@
   GPIO_InitStruct.Pull = GPIO_PULLUP;
   HAL_GPIO_Init(USER_KEY_GPIO_Port, &GPIO_InitStruct);
 
-  /*Configure GPIO pin : INPUT_5V_Pin */
-  GPIO_InitStruct.Pin = INPUT_5V_Pin;
+  /*Configure GPIO pin : PB11 */
+  GPIO_InitStruct.Pin = GPIO_PIN_11;
   GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
   GPIO_InitStruct.Pull = GPIO_PULLDOWN;
-  HAL_GPIO_Init(INPUT_5V_GPIO_Port, &GPIO_InitStruct);
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
   /*Configure GPIO pins : LED1_G_Pin LED1_R_Pin LED2_R_Pin PWR_CTL_Pin */
   GPIO_InitStruct.Pin = LED1_G_Pin|LED1_R_Pin|LED2_R_Pin|PWR_CTL_Pin;
@@ -839,6 +937,12 @@
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
+  /*Configure GPIO pin : INPUT_5V_Pin */
+  GPIO_InitStruct.Pin = INPUT_5V_Pin;
+  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  HAL_GPIO_Init(INPUT_5V_GPIO_Port, &GPIO_InitStruct);
+
   /*Configure GPIO pin : PWR_ON_Pin */
   GPIO_InitStruct.Pin = PWR_ON_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_INPUT;

--
Gitblit v1.9.3