From 5739481744a7d26671190f6f327726e23843dd6d Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期一, 02 十一月 2020 15:34:13 +0800 Subject: [PATCH] Merge branch '定位-临近' into 定位临近_工卡 --- Src/stm32l0xx_it.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/Src/stm32l0xx_it.c b/Src/stm32l0xx_it.c index 7ee3a91..1e6d2fc 100644 --- a/Src/stm32l0xx_it.c +++ b/Src/stm32l0xx_it.c @@ -91,6 +91,7 @@ while (1) { /* USER CODE BEGIN W1_HardFault_IRQn 0 */ + SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; /* USER CODE END W1_HardFault_IRQn 0 */ } } @@ -153,6 +154,14 @@ nomove_count = 0; } + if(!GET_USERKEY) + { + 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); -- Gitblit v1.9.3