From 858c42df60ffeb07dc5916e2cec1f0b98b1b4e39 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期五, 12 五月 2023 12:04:39 +0800
Subject: [PATCH] V2.4 1.修改震动逻辑，先短振3下，5秒后再振3下，每5分钟循环一次，如果短按按键，2小时内不再震动。 2.SOS改成长按3秒按键触发。
---
Src/stm32l0xx_it.c | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Src/stm32l0xx_it.c b/Src/stm32l0xx_it.c
index d91cb50..0f35729 100644
--- a/Src/stm32l0xx_it.c
+++ b/Src/stm32l0xx_it.c
@@ -63,11 +63,11 @@
/* USER CODE BEGIN EV */
float motor_ontime=0;
uint8_t userkey_state = 0;
-extern u8 active_flag;
+extern u8 active_flag,motorskip_flag,motor_state;
/* 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.
@@ -93,6 +93,7 @@
while (1)
{
/* USER CODE BEGIN W1_HardFault_IRQn 0 */
+ printf("HardFault_Handler.\r\n");
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04;
/* USER CODE END W1_HardFault_IRQn 0 */
}
@@ -151,6 +152,7 @@
void EXTI0_1_IRQHandler(void)
{
/* USER CODE BEGIN EXTI0_1_IRQn 0 */
+ SystemClock_Config();
if(GET_IMUINT)
{
nomove_count = 0;
@@ -158,7 +160,9 @@
if(!GET_USERKEY)
{
- userkey_state = 1;
+ if(motor_state)
+ {motorskip_flag = 1;}
+ //userkey_state = 1;
if(g_com_map[MOTOR_ENABLE])
{
@@ -167,8 +171,8 @@
MOTOR_OFF;
}
nomove_count = 0;
- waitusart_timer = tag_frequency*USART_KEEPWAKE_TIME;
- UsartInit();
+// waitusart_timer = tag_frequency*USART_KEEPWAKE_TIME;
+ // UsartInit();
// MOTOR_ON;
}
--
Gitblit v1.9.3