From 8aca4882a9626eaf1c75d973b91d2b09b1758b72 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期六, 07 十一月 2020 17:39:50 +0800
Subject: [PATCH] Revert "Revert "V1.34 增加滤波 防撞1对10发货""
---
源码/核心板/Src/stm32f10x_it.c | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 77ee444..1d55cfb 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,7 +37,7 @@
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;
+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;
@@ -55,15 +55,19 @@
//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++>2000)
+ if(g_Resttimer++>20000)
{
-// NVIC_SystemReset();
+ NVIC_SystemReset();
}
@@ -82,7 +86,7 @@
}
#ifdef USART_INTEGRATE_OUTPUT
- if(sync_timer==target_time)
+ if(sync_timer%g_com_map[COM_INTERVAL]==0)
{
usart_send_flag=1;
@@ -94,7 +98,7 @@
}
if(synclost_timer>SYNCLOST_TIME)
{
- //flag_syncbase=1;
+ flag_syncbase=1;
}
if(flag_syncbase) //本模块是同步基站
@@ -109,6 +113,7 @@
}else{ //标签同步处理
if(sync_timer==target_time)
{
+
last_polltime=sync_timer;
// GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
g_start_send_flag=1;
--
Gitblit v1.9.3