From 7db378e2b93702b98ffe7f7b6ab9a4d20aaabb20 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 16 四月 2020 08:50:37 +0800
Subject: [PATCH] V1.10 去掉基站标识，改输出模式
---
源码/核心板/Src/stm32f10x_it.c | 50 ++++++++++++++++++++++++--------------------------
1 files changed, 24 insertions(+), 26 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..7d85176 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"
@@ -32,32 +32,35 @@
/* Tick timer count. */
volatile uint32_t time32_incr;
uint8_t tt=0;
-uint8_t g_start_send_flag = 0,sync_seq=0;
+uint8_t g_start_send_flag = 0,sync_seq=0,usart_send_flag;
+u16 usart_timer=0;
uint16_t sysscal;
u16 tag_recv_timer, tag_timer;
extern uint16_t g_Resttimer,heartbeat_timer,sync_timer;
extern uint8_t g_pairstart;
-u16 timer3;
+u8 neartimout_timer=0;
extern u16 tyncpoll_time;
+
void TIM3_IRQHandler(void) //TIM3??
{
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++;
+ neartimout_timer++;
+ if(sync_timer>=1010)
+ {sync_timer=0;}
+
if(g_Resttimer++>2000)
{
- NVIC_SystemReset();
+ //NVIC_SystemReset();
}
- sync_timer++;
+
if(!g_com_map[DEV_ROLE]) //基站
{
@@ -65,33 +68,28 @@
TagDistClear();
if(g_com_map[ALARM_DEV]!=0)
main_logic();
- if(sync_timer==10)
+ #ifdef USART_INTEGRATE_OUTPUT
+ if(usart_timer++>=g_com_map[COM_INTERVAL])
{
- GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
- }else{
- GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_RESET);
+ usart_timer=0;
+ usart_send_flag=1;
}
+ #endif
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