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 | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 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 50c088a..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" @@ -37,10 +37,11 @@ uint16_t sysscal; 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_flag2,dissucc_flag1; +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; +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???????? @@ -62,8 +63,10 @@ flag_newsecond=1; //GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_SET); sync_timer=0; - dissucc_flag2 = 0; - dissucc_flag1 = 0; + dissucc_times = 0; + success_ancid = 0; + USART_puts(usart_send_array[0],21*usart_array_num); + usart_array_num = 0; TagListUpdate(); } @@ -113,18 +116,18 @@ // } // } }else{ //标签同步处理 - if(sync_timer%100==0) + if(sync_timer%20==0) { - last_polltime=sync_timer; + // 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; - } +// if(sync_timer>900&&(dissucc_flag2&dissucc_flag2)==0) +// { +// if(sync_timer%10==0) +// g_start_send_flag=1; +// } } -- Gitblit v1.9.3