From 012f7bf4e14a8e92f5bba7a2c80b78cbe42fb362 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 23 三月 2021 12:17:37 +0800
Subject: [PATCH] V1.42 增加全基站数据模式，配合新华智云测试
---
源码/核心板/Src/stm32f10x_it.c | 92 +++++++++++++++++++++++++++++++--------------
1 files changed, 63 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 c1e9ce1..3905386 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,64 +32,90 @@
/* 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;
+u16 tag_recv_timer, tag_timer,last_polltime;
extern uint16_t g_Resttimer,heartbeat_timer,sync_timer;
-extern uint8_t g_pairstart;
-u16 timer3;
-extern u16 tyncpoll_time;
+extern uint8_t g_pairstart,getrange_success;
+u8 neartimout_timer=0,flag_syncbase=0,flag_newsecond=0;
+extern u16 tyncpoll_time,target_time;
+extern uint32_t synclost_timer,current_syncid;
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++;
+ main_logic();
+ time32_incr++;
heartbeat_timer++;
- poll_timer++;
-
- if(tag_timer++>=g_com_map[COM_INTERVAL])
- {tag_timer=0;}
- if(g_Resttimer++>2000)
+ sync_timer++;
+ neartimout_timer++;
+ synclost_timer++;
+ //GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_RESET);
+ if(sync_timer>=1000)
+ {
+// if(getrange_success==0)
+// {
+// NVIC_SystemReset();
+// }
+ flag_newsecond=1;
+ //GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_SET);
+ sync_timer=0;
+ TagListUpdate();
+ }
+
+ if(g_Resttimer++>20000)
{
NVIC_SystemReset();
}
- sync_timer++;
+
if(!g_com_map[DEV_ROLE]) //基站
{
tag_recv_timer++;
TagDistClear();
- if(sync_timer==10)
+ if(g_com_map[ANC_POLL])
{
- GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
- }else{
- GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_RESET);
+ if(sync_timer==target_time)
+ {
+ g_start_send_flag=1;
+ }
}
+
+ #ifdef USART_INTEGRATE_OUTPUT
+ if(sync_timer%g_com_map[COM_INTERVAL]==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(synclost_timer>SYNCLOST_TIME)
{
- SyncPoll(0);
+ flag_syncbase=1;
+ }
+
+ if(flag_syncbase) //本模块是同步基站
+ {
+ if(sync_timer==995)
+ {
+ current_syncid = g_com_map[DEV_ID];
+ sync_seq=0;
+ SyncPoll(sync_seq,current_syncid);
}
}
}else{ //标签同步处理
- if(sync_timer>=1010)
- {sync_timer=0;}
- if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time)
+ if(sync_timer==target_time)
{
- GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
- }
- if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time)
- {
+
+ last_polltime=sync_timer;
+ // GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
g_start_send_flag=1;
}
@@ -134,4 +160,12 @@
// }
}
+void HardFalut_Handler(void)
+{
+ while(1)
+ {
+ NVIC_SystemReset();
+ }
+
+}
--
Gitblit v1.9.3