From 4864dd7a1bf69e16045c18bc19220b3ce9f55c72 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 17 六月 2020 23:49:37 +0800
Subject: [PATCH] V1.18华星测试基站防撞版本
---
源码/核心板/Src/stm32f10x_it.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 74ff909..22aa618 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"
@@ -38,7 +38,7 @@
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;
+u8 neartimout_timer=0,flag_syncbase=0,flag_newsecond=0;
extern u16 tyncpoll_time;
extern uint32_t synclost_timer,current_syncid;
void TIM3_IRQHandler(void) //TIM3??
@@ -46,14 +46,17 @@
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++;
- synclost_timer++;
+ synclost_timer++;
+ //GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_RESET);
if(sync_timer>=1000)
{
+ flag_newsecond=1;
+ //GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_SET);
sync_timer=0;
TagListUpdate();
}
@@ -74,7 +77,7 @@
{
if(sync_timer%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer<990&&sync_timer!=last_polltime)
{
- g_start_send_flag=1;
+ // g_start_send_flag=1;
}
}
--
Gitblit v1.9.3