From 0336357cf8d72c0c17c6fed3d5233f1e352e32ae Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 16 二月 2022 19:57:40 +0800
Subject: [PATCH] 修改485控制BUG
---
源码/核心板/Src/stm32f10x_it.c | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 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 3927bc7..f595a9d 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;
+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;
+u8 needanchorrx=1;
void TIM3_IRQHandler(void) //TIM3??
{
if (TIM_GetITStatus(TIM3, TIM_IT_Update) != RESET) //??TIM3????????
@@ -55,15 +56,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++>12000)
+ if(g_Resttimer++>10000)
{
- NVIC_SystemReset();
+ // NVIC_SystemReset();
}
@@ -97,13 +102,14 @@
flag_syncbase=1;
}
- if(flag_syncbase) //本模块是同步基站
+ if(1)//flag_syncbase) //本模块是同步基站
{
if(sync_timer==995)
{
current_syncid = g_com_map[DEV_ID];
sync_seq=0;
- SyncPoll(sync_seq,current_syncid);
+ SyncPoll(sync_seq,current_syncid);
+ // needanchorrx = 1;
}
}
}else{ //标签同步处理
@@ -137,7 +143,18 @@
}
}
+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)//?????????
@@ -156,4 +173,12 @@
// }
}
+void HardFalut_Handler(void)
+{
+ while(1)
+ {
+ NVIC_SystemReset();
+ }
+
+}
--
Gitblit v1.9.3