From a9357d6172cb307dc8a6b4740f643bd3c0cded55 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期四, 20 七月 2023 18:15:29 +0800
Subject: [PATCH] 开发完毕，使用前需要重新安排一下代码。

---
 Src/main.c |   87 ++++++++++++++++++++++++-------------------
 1 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/Src/main.c b/Src/main.c
index 6e1ea5a..499c84f 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -370,12 +370,11 @@
   /* Initialize all configured peripherals */
   MX_GPIO_Init();
   MX_LPTIM1_Init();
-    MX_DMA_Init();
-  MX_USART1_UART_Init();
   MX_SPI1_Init();
   MX_ADC_Init();
-
+  MX_DMA_Init();
 //  MX_IWDG_Init();
+  MX_USART1_UART_Init();
   /* USER CODE BEGIN 2 */
     LED_LG_ON;
     Program_Init();
@@ -383,14 +382,15 @@
     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;
+//    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);
+//    HAL_NVIC_EnableIRQ(EXTI4_15_IRQn);
 //	mcu_sleep();
 	//LED0_BLINK;		
 //	SystemPower_Config();
@@ -404,11 +404,11 @@
     /* USER CODE END WHILE */
 
     /* USER CODE BEGIN 3 */
-		if(g_start_send_flag)
-	{ static uint16_t blink_count=0;
-		SystemClock_Config();
-		g_start_send_flag = 0;	
-		HAL_IWDG_Refresh(&hiwdg);
+//		if(g_start_send_flag)
+//	{ 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);
@@ -418,35 +418,35 @@
 //		LED_TR_BLINK;s
 		
 			
-		if(bat_percent>15)
-		{	LED_TB_ON;
-			Tag_App();
-			LED_TB_OFF;
-		}else{
-			LED_TR_ON;
-			Tag_App();
-			LED_TR_OFF;		
-		}
-		//LED0_BLINK;		
+//		if(bat_percent>15)
+//		{	LED_TB_ON;
+//			Tag_App();
+//			LED_TB_OFF;
+//		}else{
+//			LED_TR_ON;
+//			Tag_App();
+//			LED_TR_OFF;		
+//		}
+//		//LED0_BLINK;		
 		IdleTask();	
-		if(waitusart_timer>0)
-		{
-			waitusart_timer--;
-		}		 
-	}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
-    }
+//		if(waitusart_timer>0)
+//		{
+//			waitusart_timer--;
+//		}		 
+//	}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();
 
@@ -817,10 +817,19 @@
   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, 0, 0);
+//  HAL_NVIC_EnableIRQ(EXTI4_15_IRQn);
+HAL_NVIC_DisableIRQ(EXTI4_15_IRQn);
 }
 
 /* USER CODE BEGIN 4 */

--
Gitblit v1.9.3