From fed6a447e90051027925217fae8c6a5d57054989 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 08 八月 2022 09:32:35 +0800
Subject: [PATCH] 1.66
---
源码/核心板/Src/stm32f10x_it.c | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 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 d454d67..50c088a 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,dissucc_flag2,dissucc_flag1;
u8 neartimout_timer=0,flag_syncbase=0,flag_newsecond=0;
extern u16 tyncpoll_time,target_time;
extern uint32_t synclost_timer,current_syncid;
@@ -55,13 +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;
+ dissucc_flag2 = 0;
+ dissucc_flag1 = 0;
TagListUpdate();
}
- if(g_Resttimer++>2000)
+ if(g_Resttimer++>10000)
{
NVIC_SystemReset();
}
@@ -97,23 +103,28 @@
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);
- }
- }
+// 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)
+ if(sync_timer%100==0)
{
last_polltime=sync_timer;
// GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
g_start_send_flag=1;
}
+ if(sync_timer>900&&(dissucc_flag2&dissucc_flag2)==0)
+ {
+ if(sync_timer%10==0)
+ g_start_send_flag=1;
+ }
}
@@ -156,4 +167,12 @@
// }
}
+void HardFalut_Handler(void)
+{
+ while(1)
+ {
+ NVIC_SystemReset();
+ }
+
+}
--
Gitblit v1.9.3