From 96a63685fd53bd939772377296a9e732333e3748 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 28 三月 2022 10:23:16 +0800
Subject: [PATCH] V2.47 可能有无法接收数据的bug
---
源码/核心板/Src/stm32f10x_it.c | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 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 4684280..a60802e 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"
@@ -47,13 +47,13 @@
{
TIM_ClearITPendingBit(TIM3, TIM_IT_Update ); //??TIMx??????
// main_logic();
-// time32_incr++;
+ time32_incr++;
// heartbeat_timer++;
sync_timer++;
// neartimout_timer++;
// synclost_timer++;
// GPIO_WriteBit(GPIOA, GPIO_Pin_8, Bit_RESET);
- GPIOA->BRR = GPIO_Pin_8;
+GPIOA->BRR = GPIO_Pin_8;
if(sync_timer==10)
{
GPIOA->BSRR = GPIO_Pin_8;
@@ -74,21 +74,22 @@
flag_newsecond=1;
// GPIO_WriteBit(GPIOA, GPIO_Pin_8, Bit_SET);
sync_timer=0;
-// synclost_count++;
-// TagListUpdate();
-// if(g_com_map[BASESYNCSEQ]==1) //本模块是同步基站
-// {
-// synclost_count = 0;
-// current_syncid = 1;
-// sync_seq=0;
-// SyncPoll(sync_seq);
-// }
-// }
+ synclost_count++;
+
+ if(g_Resttimer++>12)
+ {
+ NVIC_SystemReset();
+ }
+ if(g_com_map[BASESYNCSEQ]==1) //本模块是同步基站
+ {
+ synclost_count = 0;
+ current_syncid = 1;
+ sync_seq=0;
+ SyncPoll(sync_seq);
+ }
+ }
//
-// if(g_Resttimer++>12000)
-// {
-// NVIC_SystemReset();
-// }
+
@@ -121,7 +122,7 @@
// g_start_send_flag=1;
// }
//
- }
+
}
}
@@ -152,10 +153,10 @@
{
EXTI_ClearITPendingBit(EXTI_Line0);
- // GPIOA->BSRR = GPIO_Pin_8;
+ //GPIOA->BSRR = GPIO_Pin_8;
//if(ttt==0)
Anchor_App();
- // GPIOA->BRR = GPIO_Pin_8;
+ //GPIOA->BRR = GPIO_Pin_8;
}
}
void USART1_IRQHandler(void)
--
Gitblit v1.9.3