From d48641460072d9a160ca5f04977269ba0171a9e2 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期日, 12 四月 2020 16:34:29 +0800
Subject: [PATCH] V1.0 防撞初版
---
源码/核心板/Src/stm32f10x_it.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/stm32f10x_it.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/stm32f10x_it.c"
index d00482c..2001894 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/stm32f10x_it.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/stm32f10x_it.c"
@@ -37,7 +37,7 @@
u16 tag_recv_timer, tag_timer;
extern uint16_t g_Resttimer,heartbeat_timer,sync_timer;
extern uint8_t g_pairstart;
-u16 timer3;
+u8 neartimout_timer=0;
extern u16 tyncpoll_time;
void TIM3_IRQHandler(void) //TIM3??
{
@@ -48,13 +48,13 @@
time32_incr++;
heartbeat_timer++;
sync_timer++;
-
+ neartimout_timer++;
if(sync_timer>=1010)
{sync_timer=0;}
if(g_Resttimer++>2000)
{
- NVIC_SystemReset();
+ //NVIC_SystemReset();
}
--
Gitblit v1.9.3