From 92d139e68796bf902f9e387e6416ced78ad0f44c Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 07 十一月 2019 17:22:39 +0800
Subject: [PATCH] MODBUS移植完成
---
源码/核心板/Src/stm32f10x_it.c | 55 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 15 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 fd3f3d7..de26f82 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"
@@ -37,11 +37,14 @@
u16 tag_recv_timer, tag_timer;
extern uint16_t g_Resttimer,heartbeat_timer,sync_timer;
extern uint8_t g_pairstart;
-
-void SysTick_Handler(void)
+u16 timer3;
+extern u16 tyncpoll_time;
+void TIM3_IRQHandler(void) //TIM3??
{
-
- time32_incr++;
+ if (TIM_GetITStatus(TIM3, TIM_IT_Update) != RESET) //??TIM3????????
+ {
+ TIM_ClearITPendingBit(TIM3, TIM_IT_Update ); //??TIMx??????
+ time32_incr++;
g_UWB_com_interval++;
heartbeat_timer++;
poll_timer++;
@@ -53,17 +56,16 @@
NVIC_SystemReset();
}
-// if(g_UWB_com_interval > 1000)
-// {
-// dis_after_filter = DEFAULT_DISTANCE;
-// }
-//#ifdef WORK_MODE_ANCHOR
+
+ sync_timer++;
+
if(!g_com_map[DEV_ROLE]) //基站
{
tag_recv_timer++;
TagDistClear();
- sync_timer++;
- if(sync_timer==30)
+ if(g_com_map[ALARM_DEV]!=0)
+ main_logic();
+ if(sync_timer==10)
{
GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
}else{
@@ -73,18 +75,41 @@
{
sync_seq=0xff;
}
- if(sync_timer>=1000)
+ if(sync_timer>=1010)
{
sync_timer=0;
if(dev_id==0)
{
SyncPoll(0);
}
+ if(g_com_map[ANC_POLL])
+ {
+ if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time)
+ {
+ g_start_send_flag=1;
+ }
+ }
}
- //if(g_pairstart!=1)
- //main_logic();
+ }else{ //标签同步处理
+ if(sync_timer>=1010)
+ {sync_timer=0;}
+ if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time)
+ {
+ GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
+ }
+ if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time)
+ {
+ g_start_send_flag=1;
+ }
+
}
-//#endif
+
+ }
+}
+
+void SysTick_Handler(void)
+{
+
}
--
Gitblit v1.9.3