From 038ffb0327e40886b4db2eb8b3fcd1653aa264a3 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 29 七月 2022 14:32:15 +0800
Subject: [PATCH] V1.68 去掉时间同步，解决互测距延迟bug
---
源码/核心板/Src/stm32f10x_it.c | 33 ++++++++++-----------------------
1 files changed, 10 insertions(+), 23 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 a13ead0..fdb743c 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"
@@ -41,7 +41,6 @@
u8 neartimout_timer=0,flag_syncbase=0,flag_newsecond=0;
extern u16 tyncpoll_time,target_time;
extern uint32_t synclost_timer,current_syncid;
-u8 needanchorrx=1;
void TIM3_IRQHandler(void) //TIM3??
{
if (TIM_GetITStatus(TIM3, TIM_IT_Update) != RESET) //??TIM3????????
@@ -68,7 +67,7 @@
if(g_Resttimer++>10000)
{
- // NVIC_SystemReset();
+ NVIC_SystemReset();
}
@@ -102,16 +101,15 @@
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);
- // needanchorrx = 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==target_time)
{
@@ -143,18 +141,7 @@
}
}
-u32 status_reg;
-void EXTI0_IRQHandler(void)
-{
- if(EXTI_GetITStatus(EXTI_Line0)!= RESET)
- {
- status_reg = dwt_read32bitreg(SYS_STATUS_ID);
- EXTI_ClearITPendingBit(EXTI_Line0);
- Anchor_App();
- needanchorrx = 1;
- }
-}
void USART1_IRQHandler(void)
{
if(USART_GetITStatus(EXT_UART, USART_IT_RXNE) != RESET)//?????????
--
Gitblit v1.9.3