From 5bdc868b2ef673bbce5e0abbc2a7bf8f7f8fa55e Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 27 四月 2021 11:59:30 +0800
Subject: [PATCH] V2.17 增加基站汇总模式，青岛待测试
---
源码/核心板/Src/stm32f10x_it.c | 86 ++++++++++++++++++++++++++-----------------
1 files changed, 52 insertions(+), 34 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 16657d7..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,30 +32,55 @@
/* Tick timer count. */
volatile uint32_t time32_incr;
uint8_t tt=0;
-uint8_t g_start_send_flag = 0,sync_seq=0,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;
+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;
-extern u16 tyncpoll_time, checksum;;
-extern u8 anc_report_num;
+u8 neartimout_timer=0,flag_syncbase=0,flag_newsecond=0;
+extern u16 tyncpoll_time,target_time;
+extern uint32_t synclost_timer,current_syncid;
void TIM3_IRQHandler(void) //TIM3??
{
if (TIM_GetITStatus(TIM3, TIM_IT_Update) != RESET) //??TIM3????????
{
TIM_ClearITPendingBit(TIM3, TIM_IT_Update ); //??TIMx??????
-
+ main_logic();
time32_incr++;
heartbeat_timer++;
sync_timer++;
- neartimout_timer++;
- if(sync_timer>=1010)
- {sync_timer=0;}
+ neartimout_timer++;
+ synclost_timer++;
+ 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_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();
+ NVIC_SystemReset();
}
@@ -65,34 +90,27 @@
{
tag_recv_timer++;
TagDistClear();
- if(g_com_map[ALARM_DEV]!=0)
- main_logic();
- #ifdef USART_INTEGRATE_OUTPUT
- if(usart_timer++>g_com_map[COM_INTERVAL])
+ if(g_com_map[ANC_POLL])
{
- usart_timer=0;
- usart_send[2] = anc_report_num;//正常模式
- checksum = Checksum_u16(&usart_send[2],anc_report_num*6+1);
- memcpy(&usart_send[3+anc_report_num*6],&checksum,2);
- UART_PushFrame(usart_send,5+anc_report_num*6);
-anc_report_num=0;
+ if(sync_timer==target_time)
+ {
+ g_start_send_flag=1;
+ }
+ }
+
+ #ifdef USART_INTEGRATE_OUTPUT
+ 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(sync_timer==0)
- {
- TagListUpdate();
- if(dev_id==0)
- SyncPoll(0);
- }
}else{ //标签同步处理
- if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer>=10)
+ if(sync_timer==target_time)
{
- GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
+
+ last_polltime=sync_timer;
+ // GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
g_start_send_flag=1;
}
--
Gitblit v1.9.3