From 815ea18d897111c4bf70861277acf94201ccf60a Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 14 十月 2022 16:25:59 +0800
Subject: [PATCH] V1.72 增加滤波器 增加频率可调
---
源码/核心板/Src/stm32f10x_it.c | 50 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 35 insertions(+), 15 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 1d55cfb..3e4722b 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"
@@ -37,10 +37,11 @@
uint16_t sysscal;
u16 tag_recv_timer, tag_timer,last_polltime;
extern uint16_t g_Resttimer,heartbeat_timer,sync_timer;
-extern uint8_t g_pairstart,getrange_success;
+extern uint8_t g_pairstart,getrange_success,dissucc_times;
u8 neartimout_timer=0,flag_syncbase=0,flag_newsecond=0;
-extern u16 tyncpoll_time,target_time;
+extern u16 tyncpoll_time,target_time,success_ancid;
extern uint32_t synclost_timer,current_syncid;
+extern uint8_t usart_send_array[5][21],usart_array_num;
void TIM3_IRQHandler(void) //TIM3??
{
if (TIM_GetITStatus(TIM3, TIM_IT_Update) != RESET) //??TIM3????????
@@ -65,12 +66,18 @@
TagListUpdate();
}
- if(g_Resttimer++>20000)
+ if(g_Resttimer++>10000)
{
NVIC_SystemReset();
}
-
+ if(g_com_map[DEV_ROLE]&&(time32_incr%g_com_map[COM_INTERVAL]==0))
+ {
+ dissucc_times = 0;
+ success_ancid = 0;
+ USART_puts(usart_send_array[0],21*usart_array_num);
+ usart_array_num = 0;
+ }
if(!g_com_map[DEV_ROLE]) //基站
@@ -101,23 +108,28 @@
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);
- }
- }
+// 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==target_time)
+ if(sync_timer%20==0)
{
- last_polltime=sync_timer;
+ // last_polltime=sync_timer;
// GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
g_start_send_flag=1;
}
+// if(sync_timer>900&&(dissucc_flag2&dissucc_flag2)==0)
+// {
+// if(sync_timer%10==0)
+// g_start_send_flag=1;
+// }
}
@@ -160,4 +172,12 @@
// }
}
+void HardFalut_Handler(void)
+{
+ while(1)
+ {
+ NVIC_SystemReset();
+ }
+
+}
--
Gitblit v1.9.3