From b23727c7dab2b34ed778dc6d3918564651843213 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 27 十月 2020 12:54:16 +0800
Subject: [PATCH] V2.4 飞机客户初步调通
---
源码/核心板/Src/stm32f10x_it.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 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..b0d8cd8 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"
@@ -55,15 +55,17 @@
//GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_RESET);
if(sync_timer>=1000)
{
+ if(pwtag.remain_time>0)
+ {pwtag.remain_time--;}
flag_newsecond=1;
//GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_SET);
sync_timer=0;
TagListUpdate();
}
- if(g_Resttimer++>2000)
+ if(g_Resttimer++>12000)
{
-// NVIC_SystemReset();
+ NVIC_SystemReset();
}
@@ -82,7 +84,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 +96,7 @@
}
if(synclost_timer>SYNCLOST_TIME)
{
- //flag_syncbase=1;
+ flag_syncbase=1;
}
if(flag_syncbase) //本模块是同步基站
@@ -109,6 +111,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