From 4402e21a531b498511417f44c246917edcf8b040 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期三, 26 七月 2023 17:57:15 +0800
Subject: [PATCH] Merge branch '防撞' of http://47.108.70.204:60062/r/XRange_Tag into 防撞
---
Src/stm32l0xx_it.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Src/stm32l0xx_it.c b/Src/stm32l0xx_it.c
index e373a05..9756a92 100644
--- a/Src/stm32l0xx_it.c
+++ b/Src/stm32l0xx_it.c
@@ -65,7 +65,7 @@
/* 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.
@@ -91,6 +91,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,7 +156,10 @@
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 */
--
Gitblit v1.9.3