From a26a36940097da7c033be9199219374801d9b32c Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 16 四月 2020 22:07:51 +0800
Subject: [PATCH] V1.11 修复读取参数回复BUG
---
源码/核心板/Src/stm32f10x_it.c | 74 ++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 29 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 fd3f3d7..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,59 +32,75 @@
/* 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;
+u8 neartimout_timer=0;
+extern u16 tyncpoll_time;
-void SysTick_Handler(void)
+void TIM3_IRQHandler(void) //TIM3??
{
-
- time32_incr++;
- g_UWB_com_interval++;
+ if (TIM_GetITStatus(TIM3, TIM_IT_Update) != RESET) //??TIM3????????
+ {
+ TIM_ClearITPendingBit(TIM3, TIM_IT_Update ); //??TIMx??????
+
+ 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();
}
-// 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();
- sync_timer++;
- if(sync_timer==30)
+ if(g_com_map[ALARM_DEV]!=0)
+ main_logic();
+ #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>=1000)
- {
- sync_timer=0;
- if(dev_id==0)
+
+ if(sync_timer==0)
{
- SyncPoll(0);
+ TagListUpdate();
+ if(dev_id==0)
+ SyncPoll(0);
}
+ }else{ //标签同步处理
+ if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer>=10)
+ {
+ GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
+ g_start_send_flag=1;
+ }
+
}
- //if(g_pairstart!=1)
- //main_logic();
- }
-//#endif
+
+ }
+}
+
+void SysTick_Handler(void)
+{
+
}
--
Gitblit v1.9.3