From 829eef8555abe71bc3eb5b090d690fbe53763ad7 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 08 五月 2020 21:32:29 +0800
Subject: [PATCH] 基本测试完成V1.14
---
源码/核心板/Src/stm32f10x_it.c | 49 ++++++++++++++++++++++++++++++-------------------
1 files changed, 30 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 53f65b2..74ff909 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"
@@ -35,12 +35,12 @@
uint8_t g_start_send_flag = 0,sync_seq=0,usart_send_flag;
u16 usart_timer=0;
uint16_t sysscal;
-u16 tag_recv_timer, tag_timer;
+u16 tag_recv_timer, tag_timer,last_polltime;
extern uint16_t g_Resttimer,heartbeat_timer,sync_timer;
extern uint8_t g_pairstart;
-u8 neartimout_timer=0;
+u8 neartimout_timer=0,flag_syncbase=0;
extern u16 tyncpoll_time;
-
+extern uint32_t synclost_timer,current_syncid;
void TIM3_IRQHandler(void) //TIM3??
{
if (TIM_GetITStatus(TIM3, TIM_IT_Update) != RESET) //??TIM3????????
@@ -50,13 +50,17 @@
time32_incr++;
heartbeat_timer++;
sync_timer++;
- neartimout_timer++;
- if(sync_timer>=1010)
- {sync_timer=0;}
+ neartimout_timer++;
+ synclost_timer++;
+ if(sync_timer>=1000)
+ {
+ sync_timer=0;
+ TagListUpdate();
+ }
if(g_Resttimer++>2000)
{
- //NVIC_SystemReset();
+ NVIC_SystemReset();
}
@@ -68,17 +72,16 @@
TagDistClear();
if(g_com_map[ANC_POLL])
{
- if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer>=10&&sync_timer!=1010)
+ if(sync_timer%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer<990&&sync_timer!=last_polltime)
{
g_start_send_flag=1;
}
}
- //if(g_com_map[ALARM_DEV]!=0)
- main_logic();
+
#ifdef USART_INTEGRATE_OUTPUT
- if(usart_timer++>=g_com_map[COM_INTERVAL])
+ if(sync_timer%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer<990)
{
- usart_timer=0;
+
usart_send_flag=1;
}
#endif
@@ -86,16 +89,24 @@
{
sync_seq=0xff;
}
-
- if(sync_timer==0)
+ if(synclost_timer>SYNCLOST_TIME)
{
- TagListUpdate();
- if(dev_id==0)
- SyncPoll(0);
+ flag_syncbase=1;
}
- }else{ //标签同步处理
- if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer>=10&&sync_timer!=1010)
+
+ 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%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer<990&&sync_timer!=last_polltime)
+ {
+ last_polltime=sync_timer;
// GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
g_start_send_flag=1;
}
--
Gitblit v1.9.3