From 5bfa1bc693623159c5059067f8db7589fabd04a1 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 27 四月 2020 09:03:22 +0800
Subject: [PATCH] V1.22
---
源码/核心板/Src/stm32f10x_it.c | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 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 d00482c..53f65b2 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,13 +32,15 @@
/* Tick timer count. */
volatile uint32_t time32_incr;
uint8_t tt=0;
-uint8_t g_start_send_flag = 0,sync_seq=0;
+uint8_t g_start_send_flag = 0,sync_seq=0,usart_send_flag;
+u16 usart_timer=0;
uint16_t sysscal;
u16 tag_recv_timer, tag_timer;
extern uint16_t g_Resttimer,heartbeat_timer,sync_timer;
extern uint8_t g_pairstart;
-u16 timer3;
+u8 neartimout_timer=0;
extern u16 tyncpoll_time;
+
void TIM3_IRQHandler(void) //TIM3??
{
if (TIM_GetITStatus(TIM3, TIM_IT_Update) != RESET) //??TIM3????????
@@ -48,13 +50,13 @@
time32_incr++;
heartbeat_timer++;
sync_timer++;
-
+ neartimout_timer++;
if(sync_timer>=1010)
{sync_timer=0;}
if(g_Resttimer++>2000)
{
- NVIC_SystemReset();
+ //NVIC_SystemReset();
}
@@ -64,9 +66,22 @@
{
tag_recv_timer++;
TagDistClear();
- if(g_com_map[ALARM_DEV]!=0)
+ 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();
-
+ #ifdef USART_INTEGRATE_OUTPUT
+ if(usart_timer++>=g_com_map[COM_INTERVAL])
+ {
+ usart_timer=0;
+ usart_send_flag=1;
+ }
+ #endif
if(sync_timer>500&&dev_id!=0)
{
sync_seq=0xff;
@@ -79,9 +94,9 @@
SyncPoll(0);
}
}else{ //标签同步处理
- if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer>=10)
+ if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time&&sync_timer>=10&&sync_timer!=1010)
{
- GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
+ // GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
g_start_send_flag=1;
}
--
Gitblit v1.9.3