From 32fa4a5edfbd06a3c0be40a2f3890aae2c1a4d23 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 20 十二月 2019 10:50:00 +0800
Subject: [PATCH] ver1.15
---
源码/核心板/Src/stm32f10x_it.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 de26f82..0988ab8 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"
@@ -63,7 +63,14 @@
{
tag_recv_timer++;
TagDistClear();
- if(g_com_map[ALARM_DEV]!=0)
+ if(g_com_map[ANC_POLL])
+ {
+ if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer>=10&&sync_timer!=1010)
+ {
+ g_start_send_flag=1;
+ }
+ }
+ // if(g_com_map[ALARM_DEV]!=0)
main_logic();
if(sync_timer==10)
{
@@ -81,13 +88,6 @@
if(dev_id==0)
{
SyncPoll(0);
- }
- if(g_com_map[ANC_POLL])
- {
- if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time)
- {
- g_start_send_flag=1;
- }
}
}
}else{ //标签同步处理
--
Gitblit v1.9.3