From 5b130136a057f2cec4df6b4f14165b503e8ac816 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期日, 31 五月 2020 18:19:17 +0800
Subject: [PATCH] 修改部分bug
---
源码/核心板/Src/stm32f10x_it.c | 62 ++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 17 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 d00482c..a22f0be 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"
@@ -32,13 +32,15 @@
/* Tick timer count. */
volatile uint32_t time32_incr;
uint8_t tt=0;
-uint8_t g_start_send_flag = 0,sync_seq=0;
+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;
-u16 timer3;
+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????????
@@ -48,9 +50,15 @@
time32_incr++;
heartbeat_timer++;
sync_timer++;
-
- if(sync_timer>=1010)
- {sync_timer=0;}
+ neartimout_timer++;
+ synclost_timer++;
+ GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_RESET);
+ if(sync_timer>=1000)
+ {
+ GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_SET);
+ sync_timer=0;
+ TagListUpdate();
+ }
if(g_Resttimer++>2000)
{
@@ -64,24 +72,44 @@
{
tag_recv_timer++;
TagDistClear();
- if(g_com_map[ALARM_DEV]!=0)
- main_logic();
-
+ if(g_com_map[ANC_POLL])
+ {
+ if(sync_timer%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer<990&&sync_timer!=last_polltime)
+ {
+ g_start_send_flag=1;
+ }
+ }
+
+ #ifdef USART_INTEGRATE_OUTPUT
+ if(sync_timer%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer<990)
+ {
+
+ usart_send_flag=1;
+ }
+ #endif
if(sync_timer>500&&dev_id!=0)
{
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)
+
+ if(flag_syncbase) //本模块是同步基站
{
- GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
+ 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