From f3a6daa409dfb287e517cf792a425435038e44df Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 18 五月 2021 16:26:09 +0800
Subject: [PATCH] 修改基站类型未附值BUG
---
源码/核心板/Src/stm32f10x_it.c | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 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 96ad665..d3d58d3 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"
@@ -28,6 +28,7 @@
#include "beep_logic_app.h"
#include "led.h"
#include "Usart.h"
+#include "beep.h"
#include "dw_app.h"
/* Tick timer count. */
volatile uint32_t time32_incr;
@@ -39,6 +40,7 @@
extern uint8_t g_pairstart;
u16 timer3;
extern u16 tyncpoll_time;
+u8 delay_count=0;
void TIM3_IRQHandler(void) //TIM3??
{
if (TIM_GetITStatus(TIM3, TIM_IT_Update) != RESET) //??TIM3????????
@@ -51,7 +53,7 @@
if(tag_timer++>=g_com_map[COM_INTERVAL])
{tag_timer=0;}
- if(g_Resttimer++>2000)
+ if(g_Resttimer++>10000)
{
NVIC_SystemReset();
}
@@ -63,8 +65,15 @@
{
tag_recv_timer++;
TagDistClear();
- if(g_com_map[ALARM_DEV]!=0)
- main_logic();
+ if(g_com_map[ANC_POLL])
+ {
+ if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer>=10&&sync_timer!=1010)
+ {
+ g_start_send_flag=1;
+ }
+ }
+ // if(g_com_map[ALARM_DEV]!=0)
+ main_logic();
if(sync_timer==10)
{
GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
@@ -77,8 +86,12 @@
}
if(sync_timer>=1010)
{
- sync_timer=0;
- if(dev_id==0)
+ sync_timer=0;
+// if(synclost_timer++>20)
+// {
+// sync_mainbase=1;
+// }
+ if(sync_mainbase)
{
SyncPoll(0);
}
@@ -100,11 +113,11 @@
}
}
-void SysTick_Handler(void)
-{
-
+//void SysTick_Handler(void)
+//{
+//
-}
+//}
/**
* @brief 中断服务函数
@@ -136,4 +149,11 @@
// }
}
+void HardFault_Handler(void)
+{
+ while(1)
+ {
+ NVIC_SystemReset();
+ }
+}
--
Gitblit v1.9.3