From 4936a48d23b9aef4ef44e4cf333e75cb8d49e37c Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期四, 27 二月 2025 15:02:54 +0800
Subject: [PATCH] 2.15,加入写入参数时候,如果没擦除成功会一直擦除的机制,最多200次  不成功就重启。

---
 Src/main.c |  142 ++++++++++++++++++++++++++++++++++-------------
 1 files changed, 102 insertions(+), 40 deletions(-)

diff --git a/Src/main.c b/Src/main.c
index 63503e8..b815c70 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;
@@ -70,12 +72,13 @@
 /* Private function prototypes -----------------------------------------------*/
 void SystemClock_Config(void);
 static void MX_GPIO_Init(void);
-static void MX_LPTIM1_Init(void);
+static void MX_DMA_Init(void);
 static void MX_USART1_UART_Init(void);
 static void MX_SPI1_Init(void);
 static void MX_ADC_Init(void);
-static void MX_DMA_Init(void);
+static void MX_LPTIM1_Init(void);
 static void MX_TIM2_Init(void);
+static void MX_IWDG_Init(void);
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
@@ -134,7 +137,7 @@
     bat_percent=Get_Battary();
 	if(HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
 	{
-		nomove_count = 0;
+//		nomove_count = 0;
 		if(state5v==0)
 		{
             UWB_RXOFF();
@@ -236,7 +239,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)|8;
+	g_com_map[VERSION] = (2<<8)|15;
     
 //	g_com_map[DEV_ID]=0x7;
 #ifdef DEBUG_MODE
@@ -364,7 +367,7 @@
 {
 		//SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
 }
-
+uint8_t mcu_sleep_flag;
 uint8_t userkey_num;
 /* USER CODE END 0 */
 
@@ -395,14 +398,16 @@
   /* USER CODE END SysInit */
 
   /* Initialize all configured peripherals */
+//  MX_IWDG_Init();
   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();
+  
   /* USER CODE BEGIN 2 */
 	LED_LG_ON;
 	Program_Init();
@@ -446,10 +451,21 @@
     /* USER CODE END WHILE */
 
     /* USER CODE BEGIN 3 */
-//				while(1)
-//		{
-//		MODBUS_Poll();
-//		}
+
+      if(mcu_sleep_flag)
+      {
+          if(g_start_send_flag)
+          {
+          g_start_send_flag = 0;	
+          dwt_entersleep(); 
+          HAL_IWDG_Refresh(&hiwdg); 
+          }
+          
+      HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);  
+      }
+      else
+      {
+
 if(m_bEUARTTxEn==0&&(motor_state==0||motor_state==3))
 			{	
 #ifndef DEBUG_MODE	
@@ -457,7 +473,7 @@
 				HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);  
 #endif
 			}
-		if(g_start_send_flag&&uwb_onflag)
+		if(g_start_send_flag/*&&uwb_onflag*/)
 	{ static uint16_t blink_count=0;
 		g_start_send_flag = 0;	
 	//	GetPressAndTemp();
@@ -489,11 +505,13 @@
 	}else{
 	IdleTask();	
 	}
-// HAL_Delay(100);
-    //  Get_Battary();
-
-	//	LIS3DH_Data_Init();	
+        if(nomove_count>g_com_map[NOMOVESLEEP_TIME]&&imu_enable)
+        {
+        mcu_sleep();
+        }
   }
+  }
+      
   /* USER CODE END 3 */
 }
 
@@ -517,10 +535,12 @@
   /** 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;
@@ -603,6 +623,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_32;
+  hiwdg.Init.Window = 3699;
+  hiwdg.Init.Reload = 3699;
+  if (HAL_IWDG_Init(&hiwdg) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN IWDG_Init 2 */
+
+  /* USER CODE END IWDG_Init 2 */
 
 }
 
@@ -913,25 +962,38 @@
 }
 void mcu_sleep(void)
 {
-	HAL_LPTIM_DeInit(&hlptim1);
-	GPIO_InitTypeDef GPIO_InitStruct = {0};
-	GPIO_InitStruct.Pin = GPIO_PIN_All;
-  GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-	HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-	HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
-	
+//	HAL_LPTIM_DeInit(&hlptim1);
+//        HAL_ADC_DeInit(&hadc);  
+//    __HAL_RCC_GPIOA_CLK_DISABLE();  
+//    __HAL_RCC_GPIOB_CLK_DISABLE();  
+//    __HAL_RCC_GPIOC_CLK_DISABLE(); 
+    Dw1000_Init();
+    dwt_forcetrxoff();
+    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), 0);
 
+    
+	dwt_configuresleep(DWT_PRESRV_SLEEP | DWT_CONFIG, DWT_WAKE_CS | DWT_WAKE_WK| DWT_SLP_EN);
+	dwt_entersleep();
+    delay_ms(100);
+    
+//	GPIO_InitTypeDef GPIO_InitStruct = {0};
+//	GPIO_InitStruct.Pin = GPIO_PIN_All;
+//  GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
+//  GPIO_InitStruct.Pull = GPIO_NOPULL;
+//  HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+//	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*/
-  __HAL_PWR_CLEAR_FLAG(PWR_FLAG_WU);  
-  /*Re-enable all used wakeup sources: Pin1(PA.0)*/
-  HAL_PWR_EnableWakeUpPin(PWR_WAKEUP_PIN1);
-  /*Enter the Standby mode*/
-  HAL_PWR_EnterSTANDBYMode();	
+	mcu_sleep_flag=1;
+//	HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);  
+//	HAL_PWR_DisableWakeUpPin(PWR_WAKEUP_PIN1);  
+//  /*Clear all related wakeup flags*/
+//  __HAL_PWR_CLEAR_FLAG(PWR_FLAG_WU);  
+//  /*Re-enable all used wakeup sources: Pin1(PA.0)*/
+//  HAL_PWR_EnableWakeUpPin(PWR_WAKEUP_PIN1);
+//  /*Enter the Standby mode*/
+//  HAL_PWR_EnterSTANDBYMode();	
+    
 }
 extern u16 tagslotpos;
 extern uint8_t tx_near_msg[80],stationary_flag,gotosleep_flag;
@@ -1011,12 +1073,12 @@
 	}else{
 		gotosleep_flag=0;
 	}
-#ifndef DEBUG_MODE    
-	if(nomove_count>g_com_map[NOMOVESLEEP_TIME]&&imu_enable)
-	{
-		mcu_sleep();
-	}
-#endif
+//#ifndef DEBUG_MODE    
+//	if(nomove_count>g_com_map[NOMOVESLEEP_TIME]&&imu_enable)
+//	{
+//		mcu_sleep();
+//	}
+//#endif
 }
 /* USER CODE END 4 */
 

--
Gitblit v1.9.3