From f7107e325fbd42ed9875b7b28c340e1cda8627cc Mon Sep 17 00:00:00 2001 From: yincheng.zhong <634916154@qq.com> Date: 星期日, 24 三月 2024 18:29:51 +0800 Subject: [PATCH] 1.12 修复大于25个的添加标签的bug --- Src/stm32l0xx_it.c | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diff --git a/Src/stm32l0xx_it.c b/Src/stm32l0xx_it.c index e373a05..0b9092e 100644 --- a/Src/stm32l0xx_it.c +++ b/Src/stm32l0xx_it.c @@ -43,6 +43,7 @@ /* Private variables ---------------------------------------------------------*/ /* USER CODE BEGIN PV */ float nomove_count=0; +uint16_t aaa; /* USER CODE END PV */ /* Private function prototypes -----------------------------------------------*/ @@ -65,10 +66,10 @@ /* USER CODE END EV */ /******************************************************************************/ -/* Cortex-M0+ Processor Interruption and Exception Handlers */ +/* Cortex-M0+ Processor Interruption and Exception Handlers */ /******************************************************************************/ /** - * @brief This function handles Non maskable interrupt. + * @brief This function handles Non maskable Interrupt. */ void NMI_Handler(void) { @@ -91,6 +92,7 @@ while (1) { /* USER CODE BEGIN W1_HardFault_IRQn 0 */ + SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader /* USER CODE END W1_HardFault_IRQn 0 */ } } @@ -155,15 +157,31 @@ if(!GET_USERKEY) { - waitusart_timer = tag_frequency*10; + nomove_count = 0; + waitusart_timer = tag_frequency*USART_KEEPWAKE_TIME; + UsartInit(); + // MOTOR_ON; } /* USER CODE END EXTI0_1_IRQn 0 */ HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_0); - HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_1); /* USER CODE BEGIN EXTI0_1_IRQn 1 */ //DW_DISABLE; /* USER CODE END EXTI0_1_IRQn 1 */ +} + +/** + * @brief This function handles EXTI line 2 and line 3 interrupts. + */ +void EXTI2_3_IRQHandler(void) +{ + /* USER CODE BEGIN EXTI2_3_IRQn 0 */ + + /* USER CODE END EXTI2_3_IRQn 0 */ + HAL_GPIO_EXTI_IRQHandler(RADIO_DIO1_Pin); + /* USER CODE BEGIN EXTI2_3_IRQn 1 */ + + /* USER CODE END EXTI2_3_IRQn 1 */ } /** @@ -213,4 +231,3 @@ /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ -/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ -- Gitblit v1.9.3