From 7f53552cf8d33444254e46d1be482825e7d6a578 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 13 十一月 2019 14:59:33 +0800
Subject: [PATCH] v1.7
---
源码/核心板/Src/stm32f10x_it.c | 40 +++++++++++++++-------------------------
1 files changed, 15 insertions(+), 25 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 96ad665..d00482c 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"
@@ -44,20 +44,21 @@
if (TIM_GetITStatus(TIM3, TIM_IT_Update) != RESET) //??TIM3????????
{
TIM_ClearITPendingBit(TIM3, TIM_IT_Update ); //??TIMx??????
- time32_incr++;
- g_UWB_com_interval++;
+
+ time32_incr++;
heartbeat_timer++;
- poll_timer++;
-
- if(tag_timer++>=g_com_map[COM_INTERVAL])
- {tag_timer=0;}
+ sync_timer++;
+
+ if(sync_timer>=1010)
+ {sync_timer=0;}
+
if(g_Resttimer++>2000)
{
NVIC_SystemReset();
}
- sync_timer++;
+
if(!g_com_map[DEV_ROLE]) //基站
{
@@ -65,33 +66,22 @@
TagDistClear();
if(g_com_map[ALARM_DEV]!=0)
main_logic();
- if(sync_timer==10)
- {
- GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
- }else{
- GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_RESET);
- }
+
if(sync_timer>500&&dev_id!=0)
{
sync_seq=0xff;
}
- if(sync_timer>=1010)
- {
- sync_timer=0;
- if(dev_id==0)
+
+ if(sync_timer==0)
{
- SyncPoll(0);
+ TagListUpdate();
+ if(dev_id==0)
+ SyncPoll(0);
}
- }
}else{ //标签同步处理
- if(sync_timer>=1010)
- {sync_timer=0;}
- if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time)
+ if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer>=10)
{
GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
- }
- if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time)
- {
g_start_send_flag=1;
}
--
Gitblit v1.9.3