From ec7c9ba29c460cd03894f270170a77545031286f Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期二, 25 二月 2025 09:53:38 +0800
Subject: [PATCH] 2.13，加入看门狗
---
Src/main.c | 86 +++++++++++++++++++++++++++++++++++-------
1 files changed, 71 insertions(+), 15 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 578231b..2b26d4c 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,9 +137,10 @@
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();
state5v=1;
UsartInit();
}
@@ -224,6 +228,7 @@
uint8_t uwb_active_flag = 0;
u8 active_flag=0;
u16 nomovesleep_time=0,interval;
+extern uint8_t uwb_onflag;
void Program_Init(void)
{ float temp;
uint16_t temp2;
@@ -234,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)|4;
+ g_com_map[VERSION] = (2<<8)|13;
// g_com_map[DEV_ID]=0x7;
#ifdef DEBUG_MODE
@@ -253,6 +258,7 @@
active_flag = g_com_map[ACTIVE_INDEX];
//g_com_map[HEIGHTOFFEST_INDEX]=g_com_map[MAX_REPORT_ANC_NUM];
+ uwb_onflag=g_com_map[UWB_ONFLAG];
module_power = g_com_map[POWER];
imu_enable=g_com_map[IMU_ENABLE];
motor_enable=g_com_map[MOTOR_ENABLE];
@@ -331,7 +337,6 @@
// break;
// }
}
-
void DoubleClickProcess(void)
{ char temp[50];
uint8_t len;
@@ -347,6 +352,14 @@
HAL_Delay(1000);
HAL_TIM_PWM_Stop(&htim2, TIM_CHANNEL_3);
}
+if(uwb_onflag)
+{
+UWB_RXOFF();
+}
+else
+{
+UWB_RXON();
+}
g_com_map[UWB_ACTIVE_FLAG_IDX]= uwb_active_flag;
save_com_map_to_flash();
}
@@ -354,6 +367,8 @@
{
//SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
+
+uint8_t userkey_num;
/* USER CODE END 0 */
/**
@@ -383,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();
@@ -402,9 +419,17 @@
// 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);
+// 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);
+ if(uwb_onflag)
+ {
+ UWB_RXON();
+ }
+ else
+ {
+ UWB_RXOFF();
+ }
DW_DISABLE;
if(HAL_UART_Receive_DMA(&huart1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE))
{
@@ -437,7 +462,7 @@
HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
#endif
}
- if(g_start_send_flag)
+ if(g_start_send_flag/*&&uwb_onflag*/)
{ static uint16_t blink_count=0;
g_start_send_flag = 0;
// GetPressAndTemp();
@@ -469,7 +494,6 @@
}else{
IdleTask();
}
-
// HAL_Delay(100);
// Get_Battary();
@@ -498,10 +522,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;
@@ -584,6 +610,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 */
}
@@ -923,6 +978,7 @@
static uint8_t i=0;
SystemClock_Config();
g_start_send_flag=1;
+ userkey_num=0;
// current_slotnum++;
// SetNextPollTime(tagslotpos);
if(button_delay<1)
@@ -991,12 +1047,12 @@
}else{
gotosleep_flag=0;
}
-#ifndef DEBUG_MODE
+//#ifndef DEBUG_MODE
if(nomove_count>g_com_map[NOMOVESLEEP_TIME]&&imu_enable)
{
mcu_sleep();
}
-#endif
+//#endif
}
/* USER CODE END 4 */
--
Gitblit v1.9.3