From 2d82c2dfc1a64b05cf92a1bf1bd6fc840cb84e79 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 18 十月 2018 16:24:29 +0800
Subject: [PATCH] Revert "配对完成，有bug"
---
源码/核心板/Src/stm32f10x_it.c | 11 +++++------
1 files changed, 5 insertions(+), 6 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 c7bee66..ffbefdc 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"
@@ -34,7 +34,6 @@
uint8_t g_start_send_flag = 0;
uint16_t sysscal;
extern uint16_t g_Resttimer;
-extern uint8_t g_pairstart;
void SysTick_Handler(void)
{uint16_t i;
time32_incr++;
@@ -47,11 +46,9 @@
// {
// dis_after_filter = DEFAULT_DISTANCE;
// }
-#ifdef WORK_MODE_ANCHOR
- TagDistClear();
- if(g_pairstart!=1)
- main_logic();
-#endif
+TagDistClear();
+ main_logic();
+
}
@@ -77,6 +74,8 @@
g_start_send_flag = 1;
RTC_SET_ALARM(1);
tt++;
+
+
//SYS.wake_id|=1<<17;
}
void USART1_IRQHandler(void)
--
Gitblit v1.9.3