From 55e36bbbabc1afed172689543d507b6a25d3932c Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期六, 07 八月 2021 09:25:22 +0800
Subject: [PATCH] 1
---
源码/核心板/Src/stm32f10x_it.c | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 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 22aa618..25f52ea 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,14 +32,14 @@
/* Tick timer count. */
volatile uint32_t time32_incr;
uint8_t tt=0;
-uint8_t g_start_send_flag = 0,sync_seq=0,usart_send_flag;
-u16 usart_timer=0;
+uint8_t g_start_send_flag = 0,sync_seq=0,usart_send_flag,waitsync_flag=0;
+u16 usart_timer=0,synclost_count=0;
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;
u8 neartimout_timer=0,flag_syncbase=0,flag_newsecond=0;
-extern u16 tyncpoll_time;
+extern u16 tyncpoll_time,target_time;
extern uint32_t synclost_timer,current_syncid;
void TIM3_IRQHandler(void) //TIM3??
{
@@ -52,16 +52,33 @@
sync_timer++;
neartimout_timer++;
synclost_timer++;
- //GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_RESET);
+ GPIO_WriteBit(GPIOA, GPIO_Pin_8, Bit_RESET);
if(sync_timer>=1000)
- {
+ {uint8_t i;
+ for(i=0;i<MAX_REGTAGNUM;i++)
+ {
+ if(regtag_map.remain_time[i]>0)
+ {
+ regtag_map.remain_time[i]--;
+ }
+ }
+ if(pwtag.remain_time>0)
+ {pwtag.remain_time--;}
flag_newsecond=1;
- //GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_SET);
+ GPIO_WriteBit(GPIOA, GPIO_Pin_8, Bit_SET);
sync_timer=0;
+ synclost_count++;
TagListUpdate();
+ if(g_com_map[BASESYNCSEQ]==1) //本模块是同步基站
+ {
+ synclost_count = 0;
+ current_syncid = 1;
+ sync_seq=0;
+ SyncPoll(sync_seq);
+ }
}
- if(g_Resttimer++>2000)
+ if(g_Resttimer++>12000)
{
NVIC_SystemReset();
}
@@ -75,40 +92,23 @@
TagDistClear();
if(g_com_map[ANC_POLL])
{
- if(sync_timer%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer<990&&sync_timer!=last_polltime)
+ if(sync_timer==target_time)
{
- // g_start_send_flag=1;
+ g_start_send_flag=1;
}
}
#ifdef USART_INTEGRATE_OUTPUT
- if(sync_timer%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer<990)
+ if(sync_timer%g_com_map[COM_INTERVAL]==0)
{
usart_send_flag=1;
}
#endif
- if(sync_timer>500&&dev_id!=0)
- {
- sync_seq=0xff;
- }
- if(synclost_timer>SYNCLOST_TIME)
- {
- 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);
- }
- }
}else{ //标签同步处理
- if(sync_timer%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer<990&&sync_timer!=last_polltime)
+ if(sync_timer==target_time)
{
+
last_polltime=sync_timer;
// GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
g_start_send_flag=1;
--
Gitblit v1.9.3