Revert "V1.64 增加碰撞随机跳时间片"

zhyinch

2022-07-07 40a60c4d3d0d3859d93f239beadc3de7128ece4b

 Ô´Âë/ºËÐÄ°å/Src/application/dw_app.c

@@ -314,7 +314,7 @@
return max_slotpos-1;
}
u8 test=0;
u8 anclost_times=0;
u8 anclost_times=0,usartoutput_count,usartoutput_notenough=0;
u8 exsistbase_list[MAX_NEARBASE_NUM],report_num,get_newbase=0,rec_extratag_battary;
u16 temp_sync_timer1,temp_sync_timer2,rec_extratag_id;
int32_t rec_extratag_dist;
@@ -330,6 +330,7 @@
    dwt_setrxaftertxdelay(POLL_TX_TO_RESP_RX_DLY_UUS);         //设置发送后开启接收，并设定延迟时间
    dwt_setrxtimeout(RESP_RX_TIMEOUT_UUS);      
   tag_succ_times = 0;
    usartoutput_count = 0;
   GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_SET);
   if(next_nearbase_num>=MAX_NEARBASE_NUM)
   {
@@ -492,6 +493,7 @@
                              checksum = Checksum_u16(&usart_send[2],17);
                              memcpy(&usart_send[19],&checksum,2);
                              UART_PushFrame(usart_send,21);
                                        usartoutput_count++;
                              #endif
                           }
                           if(rec_extratag_dist!=0x1ffff&&rec_extratag_dist!=0&&rx_buffer[GROUP_ID_IDX]!=supergroupid)
@@ -563,6 +565,7 @@
                              checksum = Checksum_u16(&usart_send[2],17);
                              memcpy(&usart_send[19],&checksum,2);
                              UART_PushFrame(usart_send,21);
                                        usartoutput_count++;
                              #endif

                           //dwt_setdelayedtrxtime(final_tx_time);//设置final包发送时间T5
@@ -699,6 +702,15 @@
//         }else{
//            anclost_times=0;
//         }
        if(usartoutput_count>=2)
        {
            usartoutput_notenough = 0;
        }else{
            if(usartoutput_notenough++>10)
            {
                SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
            }
        }
dwt_forcetrxoff();
   dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_ALL_RX_ERR| SYS_STATUS_TXFRS |SYS_STATUS_RXFCG);
}