From 5bfa1bc693623159c5059067f8db7589fabd04a1 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 27 四月 2020 09:03:22 +0800
Subject: [PATCH] V1.22
---
源码/核心板/Src/stm32f10x_it.c | 13 ++++++++++---
1 files changed, 10 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 7d85176..53f65b2 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"
@@ -66,7 +66,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();
#ifdef USART_INTEGRATE_OUTPUT
if(usart_timer++>=g_com_map[COM_INTERVAL])
@@ -87,9 +94,9 @@
SyncPoll(0);
}
}else{ //标签同步处理
- if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer>=10)
+ if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer>=10&&sync_timer!=1010)
{
- GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
+ // GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
g_start_send_flag=1;
}
--
Gitblit v1.9.3