From fb94d1fed6b33cdf6247ab4297f748d499c2b589 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 21 九月 2022 15:05:09 +0800
Subject: [PATCH] V1.70 修改数据输出方式
---
源码/核心板/Src/stm32f10x_it.c | 152 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 115 insertions(+), 37 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 92c2c5b..b4c11f8 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,33 +28,115 @@
#include "beep_logic_app.h"
#include "led.h"
#include "Usart.h"
+#include "dw_app.h"
/* Tick timer count. */
volatile uint32_t time32_incr;
uint8_t tt=0;
-uint8_t g_start_send_flag = 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;
-extern uint16_t g_Resttimer;
-extern uint8_t g_pairstart;
-void SysTick_Handler(void)
-{uint16_t i;
- time32_incr++;
- g_UWB_com_interval++;
-
- if(g_Resttimer++>2000)
+u16 tag_recv_timer, tag_timer,last_polltime;
+extern uint16_t g_Resttimer,heartbeat_timer,sync_timer;
+extern uint8_t g_pairstart,getrange_success,dissucc_times;
+u8 neartimout_timer=0,flag_syncbase=0,flag_newsecond=0;
+extern u16 tyncpoll_time,target_time,success_ancid;
+extern uint32_t synclost_timer,current_syncid;
+extern uint8_t usart_send_array[5][21],usart_array_num;
+void TIM3_IRQHandler(void) //TIM3??
+{
+ 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++;
+ //GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_RESET);
+ if(sync_timer>=1000)
+ {
+// if(getrange_success==0)
+// {
+// NVIC_SystemReset();
+// }
+ flag_newsecond=1;
+ //GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_SET);
+ sync_timer=0;
+ dissucc_times = 0;
+ success_ancid = 0;
+ USART_puts(usart_send_array[0],21*usart_array_num);
+ usart_array_num = 0;
+ TagListUpdate();
+ }
+
+ if(g_Resttimer++>10000)
{
NVIC_SystemReset();
}
-// if(g_UWB_com_interval > 1000)
-// {
-// dis_after_filter = DEFAULT_DISTANCE;
+
+
+
+
+ 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
+ if(sync_timer>500&&dev_id!=0)
+ {
+ sync_seq=0xff;
+ }
+ if(synclost_timer>SYNCLOST_TIME)
+ {
+ flag_syncbase=1;
+ }
+
+// if(flag_syncbase) //本模块是同步基站
+// {
+// if(sync_timer==995)
+// {
+// current_syncid = g_com_map[DEV_ID];
+// sync_seq=0;
+// SyncPoll(sync_seq,current_syncid);
+// }
// }
-#ifdef WORK_MODE_ANCHOR
- tag_recv_timer++;
- TagDistClear();
- if(g_pairstart!=1)
- main_logic();
-#endif
+ }else{ //标签同步处理
+ if(sync_timer%20==0)
+ {
+
+ // last_polltime=sync_timer;
+ // GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET);
+ g_start_send_flag=1;
+ }
+// if(sync_timer>900&&(dissucc_flag2&dissucc_flag2)==0)
+// {
+// if(sync_timer%10==0)
+// g_start_send_flag=1;
+// }
+
+ }
+
+ }
+}
+
+void SysTick_Handler(void)
+{
+
}
@@ -70,18 +152,6 @@
}
}
-void RTCAlarm_IRQHandler(void)
-{
- // LED0_BLINK;
- RCC_Configuration();
- // LED0_BLINK;
- EXTI_ClearITPendingBit(EXTI_Line17);
- RTC_ClearITPendingBit(RTC_FLAG_ALR);
- g_start_send_flag = 1;
-
- tt++;
- //SYS.wake_id|=1<<17;
-}
void USART1_IRQHandler(void)
{
if(USART_GetITStatus(EXT_UART, USART_IT_RXNE) != RESET)//?????????
@@ -89,15 +159,23 @@
UART_CheckReceive();
}
- /*************************************************************
- if(USART_GetITStatus(USARTy, USART_IT_TXE) != RESET)
- {
+// if(USART_GetITStatus(USARTy, USART_IT_TXE) != RESET)
- USART_SendData(USARTy, TxBuffer1[TxCounter1++]);
+// {
- }
-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/
+// USART_SendData(USARTy, TxBuffer1[TxCounter1++]);
+
+// }
+
+}
+void HardFalut_Handler(void)
+{
+ while(1)
+ {
+ NVIC_SystemReset();
+ }
+
}
--
Gitblit v1.9.3