From 96a63685fd53bd939772377296a9e732333e3748 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 28 三月 2022 10:23:16 +0800
Subject: [PATCH] V2.47 可能有无法接收数据的bug
---
源码/核心板/Src/stm32f10x_it.c | 108 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 65 insertions(+), 43 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 0be95b9..a60802e 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"
@@ -48,13 +48,20 @@
TIM_ClearITPendingBit(TIM3, TIM_IT_Update ); //??TIMx??????
// main_logic();
time32_incr++;
- heartbeat_timer++;
+// heartbeat_timer++;
sync_timer++;
- neartimout_timer++;
- synclost_timer++;
- GPIO_WriteBit(GPIOA, GPIO_Pin_8, Bit_RESET);
+// neartimout_timer++;
+// synclost_timer++;
+// GPIO_WriteBit(GPIOA, GPIO_Pin_8, Bit_RESET);
+GPIOA->BRR = GPIO_Pin_8;
+if(sync_timer==10)
+{
+GPIOA->BSRR = GPIO_Pin_8;
+}
+
if(sync_timer>=1000)
{uint8_t i;
+ heartbeat_timer++;
for(i=0;i<MAX_REGTAGNUM;i++)
{
if(regtag_map.remain_time[i]>0)
@@ -65,56 +72,57 @@
if(pwtag.remain_time>0)
{pwtag.remain_time--;}
flag_newsecond=1;
- GPIO_WriteBit(GPIOA, GPIO_Pin_8, Bit_SET);
+// GPIO_WriteBit(GPIOA, GPIO_Pin_8, Bit_SET);
sync_timer=0;
synclost_count++;
- TagListUpdate();
- if(g_com_map[BASESYNCSEQ]==1) //本模块是同步基站
+
+ if(g_Resttimer++>12)
+ {
+ NVIC_SystemReset();
+ }
+ if(g_com_map[BASESYNCSEQ]==1) //本模块是同步基站
{
synclost_count = 0;
current_syncid = 1;
sync_seq=0;
- SyncPoll(sync_seq);
+ SyncPoll(sync_seq);
}
}
-
- if(g_Resttimer++>12000)
- {
- NVIC_SystemReset();
- }
+//
+
+//
+// if(!g_com_map[DEV_ROLE]) //基站
+// {
+// tag_recv_timer++;
+// TagDistClear();
+// if(g_com_map[ANC_POLL])
+// {
+// 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
+// }else{ //标签同步处理
+// if(sync_timer==target_time)
+// {
+
+// last_polltime=sync_timer;
+// // GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
+// g_start_send_flag=1;
+// }
+//
- if(!g_com_map[DEV_ROLE]) //基站
- {
- tag_recv_timer++;
- TagDistClear();
- if(g_com_map[ANC_POLL])
- {
- 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
- }else{ //标签同步处理
- if(sync_timer==target_time)
- {
-
- last_polltime=sync_timer;
- // GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
- g_start_send_flag=1;
- }
-
- }
}
}
@@ -136,7 +144,21 @@
}
}
-
+u8 needanchorrx=1;
+u16 ttt = 0;
+extern u32 status_reg;
+void EXTI0_IRQHandler(void)
+{
+ if(EXTI_GetITStatus(EXTI_Line0)!= RESET)
+ {
+ EXTI_ClearITPendingBit(EXTI_Line0);
+
+ //GPIOA->BSRR = GPIO_Pin_8;
+ //if(ttt==0)
+ Anchor_App();
+ //GPIOA->BRR = GPIO_Pin_8;
+ }
+}
void USART1_IRQHandler(void)
{
if(USART_GetITStatus(EXT_UART, USART_IT_RXNE) != RESET)//?????????
--
Gitblit v1.9.3