From 79d5d6bcc3bc634ea2f977c0ecb1f1356554d4b0 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 07 十一月 2019 15:33:21 +0800
Subject: [PATCH] 修改串口数组个数bug，增加报警距离功能
---
源码/核心板/Src/stm32f10x_it.c | 72 ++++++++++++++++++++++++++++--------
1 files changed, 56 insertions(+), 16 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 ab9ecfb..96ad665 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"
@@ -28,18 +28,23 @@
#include "beep_logic_app.h"
#include "led.h"
#include "Usart.h"
+#include "dw_app.h"
/* Tick timer count. */
volatile uint32_t time32_incr;
uint8_t tt=0;
-uint8_t g_start_send_flag = 0;
+uint8_t g_start_send_flag = 0,sync_seq=0;
uint16_t sysscal;
u16 tag_recv_timer, tag_timer;
-extern uint16_t g_Resttimer,heartbeat_timer;
+extern uint16_t g_Resttimer,heartbeat_timer,sync_timer;
extern uint8_t g_pairstart;
-
-void SysTick_Handler(void)
+u16 timer3;
+extern u16 tyncpoll_time;
+void TIM3_IRQHandler(void) //TIM3??
{
- time32_incr++;
+ if (TIM_GetITStatus(TIM3, TIM_IT_Update) != RESET) //??TIM3????????
+ {
+ TIM_ClearITPendingBit(TIM3, TIM_IT_Update ); //??TIMx??????
+ time32_incr++;
g_UWB_com_interval++;
heartbeat_timer++;
poll_timer++;
@@ -51,18 +56,53 @@
NVIC_SystemReset();
}
-// if(g_UWB_com_interval > 1000)
-// {
-// dis_after_filter = DEFAULT_DISTANCE;
-// }
-//#ifdef WORK_MODE_ANCHOR
- if(!g_com_map[DEV_ROLE])
- {tag_recv_timer++;
- TagDistClear();
- //if(g_pairstart!=1)
- main_logic();
+
+ sync_timer++;
+
+ if(!g_com_map[DEV_ROLE]) //基站
+ {
+ tag_recv_timer++;
+ 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)
+ {
+ SyncPoll(0);
+ }
}
-//#endif
+ }else{ //标签同步处理
+ if(sync_timer>=1010)
+ {sync_timer=0;}
+ if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time)
+ {
+ GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
+ }
+ if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time)
+ {
+ g_start_send_flag=1;
+ }
+
+ }
+
+ }
+}
+
+void SysTick_Handler(void)
+{
+
}
--
Gitblit v1.9.3