From a249d25e6f162ea7e17478010864193de4681b74 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 08 四月 2020 21:36:30 +0800
Subject: [PATCH] v1.20
---
源码/核心板/Src/stm32f10x_it.c | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 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..36a0ba8 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)
{
@@ -77,17 +84,14 @@
}
if(sync_timer>=1010)
{
- sync_timer=0;
- if(dev_id==0)
+ sync_timer=0;
+// if(synclost_timer++>20)
+// {
+// sync_mainbase=1;
+// }
+ if(sync_mainbase)
{
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{ //标签同步处理
@@ -107,11 +111,11 @@
}
}
-void SysTick_Handler(void)
-{
-
+//void SysTick_Handler(void)
+//{
+//
-}
+//}
/**
* @brief 中断服务函数
--
Gitblit v1.9.3