From ce4dd5cba076e7ae21faffcc02ab0bf08d1b0949 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期二, 22 八月 2023 16:33:01 +0800
Subject: [PATCH] 修改uwb文件逻辑,方便移植

---
 Src/main.c |  300 +++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 186 insertions(+), 114 deletions(-)

diff --git a/Src/main.c b/Src/main.c
index f81503d..1532486 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -28,10 +28,10 @@
 #include "global_param.h"
 #include "TrackingDiff.h"
 #include "dw_app.h"
-
+#include "BMP390.h"
 #define NSH1 0x0001
 #define GP   0x0002
-//#define DEBUG_MODE
+#define DEBUG_MODE
 /* USER CODE END Includes */
 
 /* Private typedef -----------------------------------------------------------*/
@@ -52,6 +52,8 @@
 
 /* Private variables ---------------------------------------------------------*/
 ADC_HandleTypeDef hadc;
+
+IWDG_HandleTypeDef hiwdg;
 
 LPTIM_HandleTypeDef hlptim1;
 
@@ -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 */
@@ -130,61 +133,7 @@
 //	LED_TR_OFF;
 	current_time=GetLPTime();
 	//motor_state=2;
-if(g_com_map[MOTOR_ENABLE])
-{
-    
-		if(motor_keeptime>0)
-		{
-			motor_state = 2;
-		}else{
-			motor_state = 0;
-		}
-		//motor_state=2;
-	switch(motor_state)
-		{case 0:
-			if(hardware_type==NSH1)
-			{MOTOR_OFF;
-			}else if(hardware_type==GP)
-			{
-			HAL_TIM_PWM_Stop(&htim2, TIM_CHANNEL_3);
-			}
-			break;
-		case 1:
-			if(current_time<MOTOR_ONTIME)
-			{
-				if(hardware_type==NSH1)
-				{MOTOR_ON;
-				}else if(hardware_type==GP)
-				{
-				HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_3);
-				}	
-			}else{
-				if(hardware_type==NSH1)
-				{MOTOR_OFF;
-				}else if(hardware_type==GP)
-				{
-				HAL_TIM_PWM_Stop(&htim2, TIM_CHANNEL_3);
-				}	
-			}				
-			break;
-		case 2:
-			if(hardware_type==NSH1)
-				{MOTOR_ON;
-				}else if(hardware_type==GP)
-				{
-				HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_3);
-				}	
-			break;
-		case 3:
-			if(hardware_type==NSH1)
-				{MOTOR_OFF;
-				}else if(hardware_type==GP)
-				{
-				HAL_TIM_PWM_Stop(&htim2, TIM_CHANNEL_3);
-				}	
-			break;	
-	}
-}
+
     bat_percent=Get_Battary();
 	if(HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
 	{
@@ -206,8 +155,8 @@
 		state5v=0;
 		LED_LR_OFF;
 		LED_LG_OFF;
-//	}
-}
+	}
+//}
 	if(g_com_map[CNT_UPDATE]==1)
 	{
 	uint32_t result = 0;
@@ -265,12 +214,23 @@
 	}
 	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;}
+    if(g_com_map[POWER]>MAX_RFPOWER)
+        {g_com_map[POWER]=MAX_RFPOWER;}
+    if(g_com_map[POWER]<0)
+        {g_com_map[POWER]=0;}
+    if(g_com_map[STATIONARY_TIME]==0)
+        {
+        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;
 u8 active_flag=0;
+u16 nomovesleep_time=0,interval;
 void Program_Init(void)
 {	float temp;
 	uint16_t temp2;
@@ -281,14 +241,18 @@
 	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] = 0x022c;
-    
-//	g_com_map[DEV_ID]=0x7;
+#ifdef QIYA_JIZHAN
+	g_com_map[VERSION] = (2<<8)|1;
+#else
+	g_com_map[VERSION] = (2<<8)|10;
+#endif
+  ErrorConfig_Handler();
+	//g_com_map[DEV_ID]=0x9444;
 #ifdef DEBUG_MODE
 //	g_com_map[DEV_ROLE]=1;
-//		g_com_map[DEV_ID]=0x4009;
+	//	g_com_map[DEV_ID]=0x4009;
 //    g_com_map[ACTIVE_INDEX]=1;
-	g_com_map[COM_INTERVAL]=50;
+//	g_com_map[COM_INTERVAL]=50;
 //	g_com_map[MAX_REPORT_ANC_NUM]=1;
 //	g_com_map[NOMOVESLEEP_TIME]=10;
 //			g_com_map[IMU_ENABLE]=0;
@@ -298,18 +262,12 @@
 //	g_com_map[IMU_ENABLE]=0;
 //	 g_com_map[COM_INTERVAL]=50;
 	active_flag = g_com_map[ACTIVE_INDEX];
-	if(active_flag==0)
-	{   
-        g_com_map[COM_INTERVAL]=1000;
-		g_com_map[IMU_ENABLE]=1;
-		g_com_map[NOMOVESLEEP_TIME]=10;
-		g_com_map[MOTOR_ENABLE]=0;
-	}
+
 //g_com_map[HEIGHTOFFEST_INDEX]=g_com_map[MAX_REPORT_ANC_NUM];
 	module_power = g_com_map[POWER];
 	imu_enable=g_com_map[IMU_ENABLE];
 	motor_enable=g_com_map[MOTOR_ENABLE];
-	
+	uwb_active_flag = g_com_map[UWB_ACTIVE_FLAG_IDX];
 	group_id=g_com_map[GROUP_ID];
 	dev_id = g_com_map[DEV_ID];
 	//slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3;
@@ -318,14 +276,29 @@
 	tyncpoll_time=(g_com_map[DEV_ID]%max_slotpos)*slottime;	
 	slot_startcount=tyncpoll_time*1000/LPTIMER_LSB;
 	lastpoll_time=tyncpoll_time;
-  tag_frequency = 1000/g_com_map[COM_INTERVAL];
+    
 	bigslot_num = TOTAL_SLOTNUM/tag_frequency;
 	current_slotnum=1;
 	current_time=GetLPTime();
+    nomovesleep_time = g_com_map[NOMOVESLEEP_TIME];
+    interval = g_com_map[COM_INTERVAL];
+//    if(active_flag==0)
+//	{   
+//        interval=1000;
+//		imu_enable=1;
+//		nomovesleep_time = 10;
+//		motor_enable=0;
+//	}
+    tag_frequency = 1000/interval;
 		if (HAL_LPTIM_TimeOut_Start_IT(&hlptim1, LPTIMER_1S_COUNT, slot_startcount) != HAL_OK)  //system time is 1010ms   1 puls=30.518us
   {
     Error_Handler();
   }
+#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]);
@@ -352,30 +325,71 @@
 
 void HardWareTypeDiffConfig(void)
 {
-	GPIO_InitTypeDef GPIO_InitStruct = {0};
-	//if(g_com_map[MOTORBEEPER_INDEX]!=1&&g_com_map[MOTORBEEPER_INDEX]!=2)
-	{
-			g_com_map[MOTORBEEPER_INDEX] = 1;
-	}
-	hardware_type	= g_com_map[MOTORBEEPER_INDEX];
-	switch(hardware_type)
-		{
-        case 1:	  
-            HAL_GPIO_WritePin(GPIOB, MOTOR_Pin, GPIO_PIN_SET);
-            GPIO_InitStruct.Pin = MOTOR_Pin;
-            GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
-            GPIO_InitStruct.Pull = GPIO_NOPULL;
-            GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-            HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-			break;
-		case 2:
-			MX_TIM2_Init();
-			break;
-		}
+//	GPIO_InitTypeDef GPIO_InitStruct = {0};
+//	if(g_com_map[MOTORBEEPER_INDEX]!=1&&g_com_map[MOTORBEEPER_INDEX]!=2)
+//	{
+//			g_com_map[MOTORBEEPER_INDEX] = 2;
+//	}
+//	hardware_type	= g_com_map[MOTORBEEPER_INDEX];
+//	switch(hardware_type)
+//		{
+//        case 1:	  
+//            HAL_GPIO_WritePin(GPIOB, MOTOR_Pin, GPIO_PIN_SET);
+//            GPIO_InitStruct.Pin = MOTOR_Pin;
+//            GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+//            GPIO_InitStruct.Pull = GPIO_NOPULL;
+//            GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+//            HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+//			break;
+//		case 2:
+//			MX_TIM2_Init();
+//			break;
+//		}
+}
+
+void DoubleClickProcess(void)
+{ char temp[50];
+  uint8_t len;  
+if(uwb_active_flag)
+{
+    uwb_active_flag = 0;
+    HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_3);
+    HAL_Delay(3000);
+    HAL_TIM_PWM_Stop(&htim2, TIM_CHANNEL_3);
+}else{
+    uwb_active_flag = 1;
+    HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_3);
+    HAL_Delay(1000);
+    HAL_TIM_PWM_Stop(&htim2, TIM_CHANNEL_3);
+}
+   g_com_map[UWB_ACTIVE_FLAG_IDX]= uwb_active_flag;
+save_com_map_to_flash();
 }
 void HAL_UART_ErrorCallback(UART_HandleTypeDef *huart)
 {
 		//SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
+}
+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 */
 
@@ -408,28 +422,34 @@
   /* Initialize all configured peripherals */
   MX_GPIO_Init();
   MX_LPTIM1_Init();
-  MX_DMA_Init();
+	MX_DMA_Init();
   MX_USART1_UART_Init();
   MX_SPI1_Init();
   MX_ADC_Init();
-  //MX_TIM2_Init();
+
+  MX_TIM2_Init();
+  MX_IWDG_Init();
   /* USER CODE BEGIN 2 */
 	LED_LG_ON;
 	Program_Init();
-	LIS3DH_Data_Init();	
-  BarInit();
+	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();
+//	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;;
+
+		BarInit();
 	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;		
@@ -448,6 +468,7 @@
 //		{
 //		MODBUS_Poll();
 //		}
+		HAL_IWDG_Refresh(&hiwdg);
 if(m_bEUARTTxEn==0&&(motor_state==0||motor_state==3))
 			{	
 #ifndef DEBUG_MODE	
@@ -455,7 +476,7 @@
 				HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);  
 #endif
 			}
-		if(g_start_send_flag&&active_flag)
+		if(g_start_send_flag)
 	{ static uint16_t blink_count=0;
 		g_start_send_flag = 0;	
 	//	GetPressAndTemp();
@@ -466,6 +487,7 @@
 //		HAL_GPIO_WritePin(LED0_GPIO, GPIO_PIN_9, GPIO_PIN_RESET);
 //		}
 //		LED_TR_BLINK;
+
 			__disable_irq();
 		if(bat_percent>15)
 		{	LED_TB_ON;
@@ -483,7 +505,7 @@
 		{
 			waitusart_timer--;
 		}
-			
+		
 	}else{
 	IdleTask();	
 	}
@@ -512,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;
@@ -602,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 */
 
 }
 
@@ -864,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;
@@ -884,15 +937,30 @@
   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;
   GPIO_InitStruct.Pull = GPIO_PULLUP;
   HAL_GPIO_Init(PWR_ON_GPIO_Port, &GPIO_InitStruct);
 
+  /*Configure GPIO pin : PB8 */
+  GPIO_InitStruct.Pin = GPIO_PIN_8;
+  GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+
   /* EXTI interrupt init*/
   HAL_NVIC_SetPriority(EXTI0_1_IRQn, 1, 0);
   HAL_NVIC_EnableIRQ(EXTI0_1_IRQn);
+
+  HAL_NVIC_SetPriority(EXTI4_15_IRQn, 1, 0);
+  HAL_NVIC_EnableIRQ(EXTI4_15_IRQn);
 
 }
 
@@ -912,6 +980,8 @@
 	HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 	HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
 	
+
+	
 	HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);  
 	HAL_PWR_DisableWakeUpPin(PWR_WAKEUP_PIN1);  
   /*Clear all related wakeup flags*/
@@ -924,7 +994,7 @@
 extern u16 tagslotpos;
 extern uint8_t tx_near_msg[80],stationary_flag,gotosleep_flag;
 float key_keeptime;
-extern float motor_ontime;
+extern float motor_ontime,button_delay;
 void HAL_LPTIM_CompareMatchCallback(LPTIM_HandleTypeDef *hlptim)
 {
 	static uint8_t i=0;
@@ -932,10 +1002,12 @@
 	g_start_send_flag=1;
 //	current_slotnum++;
 //	SetNextPollTime(tagslotpos);
+    if(button_delay<1)
+    button_delay+=1/(float)tag_frequency;
 	nomove_count+=1/(float)tag_frequency;
 	if(motor_keeptime>0)
 	{	
-	motor_keeptime-=1/(float)tag_frequency;
+        motor_keeptime-=1/(float)tag_frequency;
 	}
     if(motor_keeptime<0)
     {motor_keeptime = 0;}
@@ -990,7 +1062,7 @@
 	}else{
 		stationary_flag = 0;
 	}
-if(nomove_count>=g_com_map[NOMOVESLEEP_TIME]-1&&imu_enable)
+if(nomove_count>=nomovesleep_time-1&&imu_enable)
 	{
 		gotosleep_flag=1;
 	}else{

--
Gitblit v1.9.3