From ee92c0770f3d386bdd58189f1b395b342f79ec34 Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期三, 10 八月 2022 16:37:28 +0800 Subject: [PATCH] V1.67 测试完成 --- 源码/核心板/Src/application/dw_app.c | 304 +++++++++++++++++++++++++++++++++++++------------- 1 files changed, 225 insertions(+), 79 deletions(-) diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c" index f15c60a..61a2ad7 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c" @@ -14,7 +14,7 @@ DWT_PAC8, /* Preamble acquisition chunk size. Used in RX only. */ 9, /* TX preamble code. Used in TX only. */ 9, /* RX preamble code. Used in RX only. */ - 0, /* Use non-standard SFD (Boolean) */ + 1, /* Use non-standard SFD (Boolean) */ DWT_BR_6M8, /* Data rate. */ DWT_PHRMODE_STD, /* PHY header mode. */ (129 + 8 - 8) /* SFD timeout (preamble length + 1 + SFD length - PAC size). Used in RX only. */ @@ -48,9 +48,9 @@ uint32_t g_UWB_com_interval = 0; float dis_after_filter; //当前距离值 LPFilter_Frac* p_Dis_Filter; //测距用的低通滤波器 -uint16_t g_Tagdist[TAG_NUM_IN_SYS]; +int32_t g_Tagdist[TAG_NUM_IN_SYS]; uint8_t g_flag_Taggetdist[256]; - +extern u16 supergroupid; static uint64_t get_tx_timestamp_u64(void) { uint8_t ts_tab[5]; @@ -110,11 +110,12 @@ g_flag_Taggetdist[i]++; if(g_flag_Taggetdist[i]>=2) { - g_Tagdist[i]=0xffff; + g_Tagdist[i]=0x1ffff; } } } } +extern int16_t g_commap_antdelay; void Dw1000_Init(void) { /* Reset and initialise DW1000. @@ -131,12 +132,13 @@ /* Apply default antenna delay value. See NOTE 1 below. */ dwt_setrxantennadelay(RX_ANT_DLY); //设置接收天线延迟 - dwt_settxantennadelay(TX_ANT_DLY); //设置发射天线延迟 + dwt_settxantennadelay(0); //设置发射天线延迟 /* Set expected response's delay and timeout. See NOTE 4 and 5 below. * As this example only handles one incoming frame with always the same delay and timeout, those values can be set here once for all. */ //设置接收超时时间 } +extern u16 group_id; void Dw1000_App_Init(void) { //g_com_map[DEV_ID] = 0x0b; @@ -145,6 +147,10 @@ tx_final_msg[MESSAGE_TYPE_IDX]=FINAL; tx_sync_msg[MESSAGE_TYPE_IDX]=SYNC; + memcpy(&tx_poll_msg[GROUP_ID_IDX], &group_id, 1); + memcpy(&tx_final_msg[GROUP_ID_IDX], &group_id, 1); + memcpy(&tx_resp_msg[GROUP_ID_IDX], &group_id, 1); + memcpy(&tx_poll_msg[TAG_ID_IDX], &dev_id, 2); memcpy(&tx_final_msg[TAG_ID_IDX], &dev_id, 2); memcpy(&tx_resp_msg[ANCHOR_ID_IDX], &dev_id, 2); @@ -307,11 +313,12 @@ } return max_slotpos-1; } -u8 test=0; -u8 anclost_times=0; -u8 exsistbase_list[MAX_NEARBASE_NUM],report_num,get_newbase=0; -u16 temp_sync_timer1,temp_sync_timer2; - +u8 test=0,dissucc_times,lastdist1,lastdist2; +u8 anclost_times=0,usartoutput_count; +u16 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,success_ancid; +int32_t rec_extratag_dist; void NearPoll(void) { static u8 mainbase_lost_count=0,flag_finalsend,flag_rxon; @@ -324,6 +331,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) { @@ -333,6 +341,7 @@ last_nearbase_num=next_nearbase_num; nearbase_num=next_nearbase_num; recbase_num=0; + tx_nearpoll_msg[GROUP_ID_IDX] = group_id; tx_nearpoll_msg[BATTARY_IDX] = Get_Battary(); tx_nearpoll_msg[BUTTON_IDX] = !READ_KEY0; tx_nearpoll_msg[SEQUENCE_IDX] = frame_seq_nb++; @@ -340,15 +349,17 @@ memcpy(&tx_nearpoll_msg[NEARBASEID_INDEX],&nearbaseid_list,nearbase_num*2); for(i=0;i<nearbase_num;i++) { memcpy(&tx_nearpoll_msg[NEARBASEID_INDEX+nearbase_num*2+i*2],&nearbase_distlist[i],2);} - + + memcpy(&tx_nearpoll_msg[NEARBASEID_INDEX+nearbase_num*4],&g_commap_antdelay,2); + for(i=0;i<MAX_NEARBASE_NUM;i++) { nearbase_distlist[i]=0x1ffff; } tx_nearpoll_msg[MESSAGE_TYPE_IDX] = NEAR_POLL; memcpy(&tx_nearpoll_msg[ANCHOR_ID_IDX],&mainbase_id,2); - dwt_writetxdata(13+4*nearbase_num, tx_nearpoll_msg, 0);//将Poll包数据传给DW1000,将在开启发送时传出去 - dwt_writetxfctrl(13+4*nearbase_num, 0);//设置超宽带发送数据长度 + dwt_writetxdata(15+4*nearbase_num, tx_nearpoll_msg, 0);//将Poll包数据传给DW1000,将在开启发送时传出去 + dwt_writetxfctrl(15+4*nearbase_num, 0);//设置超宽带发送数据长度 dwt_starttx(DWT_START_TX_IMMEDIATE | DWT_RESPONSE_EXPECTED);//开启发送,发送完成后等待一段时间开启接收,等待时间在dwt_setrxaftertxdelay中设置 flag_finalsend=0; @@ -390,7 +401,7 @@ dwt_readrxdata(rx_buffer, frame_len, 0); //读取接收数据 dwt_setrxtimeout(0);//DELAY_BETWEEN_TWO_FRAME_UUS*(nearbase_num+1-recbase_num)+10);//设定接收超时时间,0位没有超时时间 dwt_rxenable(0);//打开接收 - if (rx_buffer[MESSAGE_TYPE_IDX] == NEAR_RESPONSE&&!memcmp(&rx_buffer[TAG_ID_IDX],&dev_id,2)) //判断接收到的数据是否是response数据 + if (rx_buffer[MESSAGE_TYPE_IDX] == NEAR_RESPONSE&&!memcmp(&rx_buffer[TAG_ID_IDX],&dev_id,2)&&(rx_buffer[GROUP_ID_IDX]==supergroupid||rx_buffer[GROUP_ID_IDX] == group_id||group_id==supergroupid)) //判断接收到的数据是否是response数据 { u16 rec_nearbaseid,rec_nearbasepos; int32_t temp_dist; poll_tx_ts = get_tx_timestamp_u64(); //获得POLL发送时间T1 @@ -412,30 +423,36 @@ memcpy(&tmp_time,&rx_buffer[ANCTIMEUS],2); - if(g_com_map[DEV_ROLE]!=0) - { - sync_timer=temp_sync_timer1; -//// memcpy(&tagslotpos,&rx_buffer[TAGSLOTPOS],2); +// if(g_com_map[DEV_ROLE]!=0) +// { +// sync_timer=temp_sync_timer1; +////// memcpy(&tagslotpos,&rx_buffer[TAGSLOTPOS],2); +//// // - - tmp_time=tmp_time+650; - if(tmp_time>999) - { - tmp_time-=999; - sync_timer++; - if(sync_timer>=1000) - {sync_timer=0;} - } - TIM3->CNT=tmp_time; - } - current_slotnum=temp_sync_timer1/g_com_map[COM_INTERVAL]; +// tmp_time=tmp_time+650; +// if(tmp_time>999) +// { +// tmp_time-=999; +// sync_timer++; +// if(sync_timer>=1000) +// {sync_timer=0;} +// } +// TIM3->CNT=tmp_time; +// } +// current_slotnum=temp_sync_timer1/g_com_map[COM_INTERVAL]; // if(tagslotpos>max_slotpos) // tagslotpos=tagslotpos%(max_slotpos+1); // tyncpoll_time=(tagslotpos-1)*slottime; //////////////////////////// rec_nearbasepos=0; - + + memcpy(&rec_extratag_id,&rx_buffer[EXTRA_TAGID_INDEX],2); + memcpy(&rec_extratag_dist,&rx_buffer[EXTRA_TAGDIST_INDEX],4); + memcpy(&temp_dist,&rx_buffer[DIST_IDX],4); + temp_dist = temp_dist&0xffffff; + rec_extratag_dist = rec_extratag_dist&0xffffff; + nearbase_distlist[rec_nearbasepos]=temp_dist; if(temp_dist!=0x1ffff) exsistbase_list[rec_nearbasepos]=KEEP_TIMES; @@ -451,38 +468,54 @@ final_msg_set_ts(&tx_nearfinal_msg[FINAL_MSG_RESP_RX_NEARBASE_IDX], resp_rx_ts); final_msg_set_ts(&tx_nearfinal_msg[FINAL_MSG_FINAL_TX_TS_IDX], final_tx_ts); tx_nearfinal_msg[MESSAGE_TYPE_IDX]=NEAR_FINAL; + tx_nearfinal_msg[GROUP_ID_IDX] = group_id; dwt_writetxdata(28+nearbase_num*4, tx_nearfinal_msg, 0);//将发送数据写入DW1000 dwt_writetxfctrl(28+nearbase_num*4, 0);//设定发送数据长度 memcpy(&rec_tagpos_binary,&rx_buffer[NEARMSG_EMPTYSLOTPOS_INDEX],4); - if(temp_dist!=0x1ffff) - { + if(temp_dist!=0x1ffff)//没有成功测距,且距离和上一次不相等 + { + if(success_ancid!=rec_nearbaseid&&dissucc_times<2) + { + success_ancid = rec_nearbaseid; + dissucc_times++; + + + g_Resttimer=0; - IWDG_Feed(); + IWDG_Feed(); #ifdef USART_SINGLE_OUTPUT usart_send[2] = 1;//正常模式 usart_send[3] = 17;//数据段长度 usart_send[4] = frame_seq_nb;//数据段长度 - if(g_com_map[DEV_ROLE]) - { memcpy(&usart_send[5],&dev_id,2); - memcpy(&usart_send[7],&rec_nearbaseid,2); - }else{ - memcpy(&usart_send[5],&rec_nearbaseid,2); - memcpy(&usart_send[7],&dev_id,2); - } - memcpy(&usart_send[9],&rx_buffer[DIST_IDX],4); - usart_send[13] = battary; + memcpy(&usart_send[7],&rec_nearbaseid,2); + memcpy(&usart_send[9],&temp_dist,4); + usart_send[13] = rx_buffer[DIST_IDX+3]; + usart_send[14] = button; + 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) + { + #ifdef USART_SINGLE_OUTPUT + usart_send[2] = 1;//正常模式 + usart_send[3] = 17;//数据段长度 + usart_send[4] = frame_seq_nb;//数据段长度 + memcpy(&usart_send[5],&rec_extratag_id,2); + memcpy(&usart_send[7],&rec_nearbaseid,2); + memcpy(&usart_send[9],&rec_extratag_dist,4); + usart_send[13] = rx_buffer[EXTRA_TAGDIST_INDEX+3]; usart_send[14] = button; checksum = Checksum_u16(&usart_send[2],17); memcpy(&usart_send[19],&checksum,2); UART_PushFrame(usart_send,21); #endif - - //dwt_setdelayedtrxtime(final_tx_time);//设置final包发送时间T5 - // result=dwt_starttx(DWT_START_TX_DELAYED);//设定为延迟发送 - //dwt_writetxdata(4,&tx_near_msg[FINAL_MSG_RESP_RX_NEARBASE_IDX+(rec_nearbasepos+1)*4], FINAL_MSG_RESP_RX_NEARBASE_IDX+(rec_nearbasepos+1)*4);//将发送数据写入DW1000 - } - + } + } + } }else{ rec_nearbasepos=FindNearBasePos(rec_nearbaseid); @@ -493,8 +526,11 @@ nearbaseid_list[rec_nearbasepos] = rec_nearbaseid; memcpy(&tx_nearfinal_msg[ANCHOR_ID_IDX],&rec_nearbaseid,2); } - + memcpy(&rec_extratag_id,&rx_buffer[EXTRA_TAGID_INDEX],2); + memcpy(&rec_extratag_dist,&rx_buffer[EXTRA_TAGDIST_INDEX],4); memcpy(&temp_dist,&rx_buffer[DIST_IDX],4); + temp_dist = temp_dist&0xffffff; + rec_extratag_dist = rec_extratag_dist&0xffffff; nearbase_distlist[rec_nearbasepos]=temp_dist; if(temp_dist!=0x1ffff) @@ -506,8 +542,13 @@ LED0_BLINK; // memcpy(&rec_tagpos_binary,&rx_buffer[NEARMSG_EMPTYSLOTPOS_INDEX],4); // tagslotpos=GetRandomSlotPos(rec_tagpos_binary); - if(temp_dist!=0x1ffff) - { + if(temp_dist!=0x1ffff)//没有成功测距,且距离和上一次不相等 + { + if(success_ancid!=rec_nearbaseid&&dissucc_times<2) + { + success_ancid = rec_nearbaseid; + dissucc_times++; + #ifdef USART_SINGLE_OUTPUT usart_send[2] = 1;//正常模式 usart_send[3] = 17;//数据段长度 @@ -520,18 +561,43 @@ memcpy(&usart_send[5],&rec_nearbaseid,2); memcpy(&usart_send[7],&dev_id,2); } - memcpy(&usart_send[9],&rx_buffer[DIST_IDX],4); - usart_send[13] = battary; + memcpy(&usart_send[9],&temp_dist,4); + usart_send[13] = rx_buffer[DIST_IDX+3]; //电量集成到距离里面输出了 + usart_send[14] = button; + 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 + // result=dwt_starttx(DWT_START_TX_DELAYED);//设定为延迟发送 + //dwt_writetxdata(4,&tx_near_msg[FINAL_MSG_RESP_RX_NEARBASE_IDX+(rec_nearbasepos+1)*4], FINAL_MSG_RESP_RX_NEARBASE_IDX+(rec_nearbasepos+1)*4);//将发送数据写入DW1000 + + if(rec_extratag_dist!=0x1ffff&&rec_extratag_dist!=0&&rx_buffer[GROUP_ID_IDX]!=supergroupid) + { + #ifdef USART_SINGLE_OUTPUT + usart_send[2] = 1;//正常模式 + usart_send[3] = 17;//数据段长度 + usart_send[4] = frame_seq_nb;//数据段长度 + if(g_com_map[DEV_ROLE]) + { + memcpy(&usart_send[5],&rec_extratag_id,2); + memcpy(&usart_send[7],&rec_nearbaseid,2); + }else{ + memcpy(&usart_send[5],&rec_nearbaseid,2); + memcpy(&usart_send[7],&rec_extratag_id,2); + } + memcpy(&usart_send[9],&rec_extratag_dist,4); + usart_send[13] = rx_buffer[EXTRA_TAGDIST_INDEX+3]; usart_send[14] = button; checksum = Checksum_u16(&usart_send[2],17); memcpy(&usart_send[19],&checksum,2); UART_PushFrame(usart_send,21); #endif - - //dwt_setdelayedtrxtime(final_tx_time);//设置final包发送时间T5 - // result=dwt_starttx(DWT_START_TX_DELAYED);//设定为延迟发送 - //dwt_writetxdata(4,&tx_near_msg[FINAL_MSG_RESP_RX_NEARBASE_IDX+(rec_nearbasepos+1)*4], FINAL_MSG_RESP_RX_NEARBASE_IDX+(rec_nearbasepos+1)*4);//将发送数据写入DW1000 - } + } + } + } } } }else{ @@ -640,6 +706,16 @@ // }else{ // anclost_times=0; // } + if(usartoutput_count>=2) + { + usartoutput_notenough = 0; + }else{ + sync_timer += time32_incr%2; + if(usartoutput_notenough++>500) + { + 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); } @@ -720,7 +796,7 @@ break; } - SetNextPollTime(tyncpoll_time); +// SetNextPollTime(tyncpoll_time); g_start_send_flag = 0; GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_RESET); } @@ -731,6 +807,7 @@ u16 tagid_list[TAG_NUM_IN_SYS]; u8 tagofflinetime[TAG_NUM_IN_SYS]; int32_t tagdist_list[TAG_NUM_IN_SYS]; +u8 tagseq_list[TAG_NUM_IN_SYS],tagnewdist_list[TAG_NUM_IN_SYS]; void TagListUpdate(void) { u16 i,j=0,temp[TAG_NUM_IN_SYS]; @@ -756,6 +833,7 @@ uint32_t frame_len; uint32_t resp_tx_time; uint8_t rec_nearbase_num,anc_report_num; +int16_t rec_antdelay; void Anchor_RecPoll(void) { tmp_time=TIM3->CNT; @@ -779,6 +857,8 @@ battary = rx_buffer[BATTARY_IDX]; button = rx_buffer[BUTTON_IDX]; + + frame_seq_nb2 = rx_buffer[SEQUENCE_IDX]; if(result==0) { @@ -829,8 +909,31 @@ dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_ALL_RX_ERR); } } + double firstpath_power, rx_power,rec_firstpath_power; + double f1, f2, r1, r2; +uint16_t F1,F2,F3,N,C; +double B = 131072; +double A = 121.74; +double min_power; + dwt_rxdiag_t d1; +double LOS(dwt_rxdiag_t *dia) { + F1 = dia->firstPathAmp1; + F2 = dia->firstPathAmp2; + F3 = dia->firstPathAmp3; + N = dia->rxPreamCount; + C = dia->maxGrowthCIR; + + firstpath_power=10* log10((F1*F1+F2*F2+F3*F3)/(N*N))-A; + rx_power=10*log10(C*B/(N*N))-A; + + // min_power = - 10 * log10((F1 *F1 + F2 * F2 + F3 * F3) / (C *B)); + return min_power; + } +u16 smallcar_idlist[10]={0x4052,0x4032,0x4055,0x4034,0x4016,0x4010,0x4036,0x4027,0x4024,0x4047}; extern u16 dist_threshold; u8 misdist_num[TAG_NUM_IN_SYS],seize_anchor,getrange_success=0; +int32_t filter_dist,filter_speed; +u8 newmeasure,recpoll_len; u8 Anchor_RecNearPoll(u8 ancrec_nearbasepos) //0 mainbase 1 first near_base { u8 motorstate; @@ -858,26 +961,40 @@ }else{ motorstate =0; } - if(new_tagid) { tagdist_list[taglist_pos]=0x1ffff; memcpy(&tx_nearresp_msg[DIST_IDX], &tagdist_list[taglist_pos], 4); }else{ + if(tagnewdist_list[taglist_pos]) + { + tagnewdist_list[taglist_pos] = 0; memcpy(&tx_nearresp_msg[DIST_IDX], &tagdist_list[taglist_pos], 4); + } } + tx_nearresp_msg[GROUP_ID_IDX] = group_id; tx_nearresp_msg[MAINBASE_INDEX]=flag_syncbase; tx_nearresp_msg[MESSAGE_TYPE_IDX]=NEAR_RESPONSE; - tx_nearresp_msg[MOTORSTATE_INDEX]=(remotesend_state<<4)|motorstate; - if(remotesend_state) - { - memcpy(&tx_nearresp_msg[REMOTEPARA_INDEX],remotetag_para,REMOTEPARA_LEN); - dwt_writetxdata(22+REMOTEPARA_LEN, tx_nearresp_msg, 0);//写入发送数据 - dwt_writetxfctrl(22+REMOTEPARA_LEN, 0);//设定发送长度 - }else{ - dwt_writetxdata(22, tx_nearresp_msg, 0);//写入发送数据 - dwt_writetxfctrl(22, 0);//设定发送长度 - } + tx_nearresp_msg[MOTORSTATE_INDEX]=0;//(remotesend_state<<4)|motorstate; +// if(remotesend_state) +// { +// memcpy(&tx_nearresp_msg[REMOTEPARA_INDEX],remotetag_para,REMOTEPARA_LEN); +// dwt_writetxdata(22+REMOTEPARA_LEN, tx_nearresp_msg, 0);//写入发送数据 +// dwt_writetxfctrl(22+REMOTEPARA_LEN, 0);//设定发送长度 +// }else{ + if(taglist_pos==1) + { + memcpy(&tx_nearresp_msg[EXTRA_TAGID_INDEX], &tagid_list[0], 2); + memcpy(&tx_nearresp_msg[EXTRA_TAGDIST_INDEX], &tagdist_list[0], 4); + } + if(taglist_pos==0) + { + memcpy(&tx_nearresp_msg[EXTRA_TAGID_INDEX], &tagid_list[1], 2); + memcpy(&tx_nearresp_msg[EXTRA_TAGDIST_INDEX], &tagdist_list[1], 4); + } + dwt_writetxdata(28, tx_nearresp_msg, 0);//写入发送数据 + dwt_writetxfctrl(28, 0);//设定发送长度 + // } result = dwt_starttx(DWT_START_TX_DELAYED | DWT_RESPONSE_EXPECTED);//延迟发送,等待接收 @@ -899,12 +1016,13 @@ { return 1; } - if (rx_buffer[MESSAGE_TYPE_IDX] == NEAR_FINAL&&!memcmp(&rx_buffer[TAG_ID_IDX],&tag_id_recv,2)) //判断是否为Final包 + if (rx_buffer[MESSAGE_TYPE_IDX] == NEAR_FINAL&&!memcmp(&rx_buffer[TAG_ID_IDX],&tag_id_recv,2)&&(rx_buffer[GROUP_ID_IDX]==supergroupid||rx_buffer[GROUP_ID_IDX] == group_id||group_id==supergroupid)) //判断是否为Final包 { uint32_t poll_tx_ts, resp_rx_ts, final_tx_ts; uint32_t poll_rx_ts_32, resp_tx_ts_32, final_rx_ts_32; double Ra, Rb, Da, Db; int64_t tof_dtu; + u8 si; resp_tx_ts = get_tx_timestamp_u64();//获得response发送时间T3 final_rx_ts = get_rx_timestamp_u64();//获得final接收时间T6 final_msg_get_ts(&rx_buffer[FINAL_MSG_POLL_TX_TS_IDX], &poll_tx_ts);//从接收数据中读取T1,T4,T5 @@ -922,7 +1040,9 @@ tof = tof_dtu * DWT_TIME_UNITS; distance = tof * SPEED_OF_LIGHT;//距离=光速*飞行时间 dist_no_bias = distance - dwt_getrangebias(config.chan, (float)distance, config.prf); //距离减去矫正系数 - dist_cm = dist_no_bias * 1000; //dis 为单位为cm的距离 + dist_cm = dist_no_bias * 1000; //dis 为单位为cm的距离 + dwt_readdiagnostics(&d1); + LOS(&d1); /*--------------------------以下为非测距逻辑------------------------*/ //dist_cm=33000; getrange_success = 1; @@ -930,33 +1050,54 @@ LED0_BLINK; //每成功一次通讯则闪烁一次 dis_after_filter=dist_cm; hex_dist = dist_cm+(int16_t)g_com_map[DIST_OFFSET]*10; + + if(recpoll_len==rec_nearbase_num*4+15) + { + hex_dist = dist_cm+(int16_t)g_com_map[DIST_OFFSET]*10-rec_antdelay*10; + } + g_flag_Taggetdist[taglist_pos]=0; - if(hex_dist>-10000&&hex_dist<2000000) + + if(hex_dist>-100000&&hex_dist<2000000) { if(abs(hex_dist-his_dist[taglist_pos])<dist_threshold||misdist_num[taglist_pos]>3) { - int32_t filter_dist; + g_Resttimer=0; IWDG_Feed(); #ifdef TDFILTER NewTrackingDiffUpdate(taglist_pos, (float)hex_dist); - filter_dist=pos_predict[taglist_pos]/10; + filter_dist = pos_predict[taglist_pos]/10; + //filter_speed = vel_predict[taglist_pos]; + newmeasure = 1; #else filter_dist=hex_dist/10; #endif misdist_num[taglist_pos]=0; - tagdist_list[taglist_pos] = filter_dist; + tagdist_list[taglist_pos] = filter_dist; his_dist[taglist_pos]=hex_dist; - g_Tagdist[taglist_pos]=filter_dist; + if(hex_dist>0) + { + g_Tagdist[taglist_pos]=hex_dist/10; + }else{ + g_Tagdist[taglist_pos]= 1; + } + tagnewdist_list[taglist_pos] = 1; + tagseq_list[taglist_pos] = frame_seq_nb2; #ifdef USART_SINGLE_OUTPUT usart_send[2] = 1;//正常模式 usart_send[3] = 17;//数据段长度 usart_send[4] = frame_seq_nb2;//数据段长度 memcpy(&usart_send[5],&tag_id_recv,2); - memcpy(&usart_send[7],&dev_id,2); + memcpy(&usart_send[7],&dev_id,2); + if(tagdist_list[taglist_pos]<=0) + tagdist_list[taglist_pos]=10; memcpy(&usart_send[9],&tagdist_list[taglist_pos],4); + tagdist_list[taglist_pos] =tagdist_list[taglist_pos]| (battary<<24); usart_send[13] = battary; usart_send[14] = button; + usart_send[15] = firstpath_power; + usart_send[16] = rx_power; checksum = Checksum_u16(&usart_send[2],17); memcpy(&usart_send[19],&checksum,2); UART_PushFrame(usart_send,21); @@ -1006,10 +1147,13 @@ dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_RXFCG);//清除标志位 frame_len = dwt_read32bitreg(RX_FINFO_ID) & RX_FINFO_RXFL_MASK_1023;//获得接收数据长度 + recpoll_len = frame_len; dwt_readrxdata(rx_buffer, frame_len, 0);//读取接收数据 memcpy(&anc_id_recv,&rx_buffer[ANCHOR_ID_IDX],2); //将收到的tag_id分别写入各次通讯的包中,为多标签通讯服务,防止一次通讯中接收到不同ID标签的数据 memcpy(&tag_id_recv,&rx_buffer[TAG_ID_IDX],2); + if((rx_buffer[GROUP_ID_IDX]==supergroupid||rx_buffer[GROUP_ID_IDX] == group_id||group_id==supergroupid)) + { switch(rx_buffer[MESSAGE_TYPE_IDX]) { // case POLL: @@ -1065,6 +1209,7 @@ memcpy(&tag_id_recv,&rx_buffer[TAG_ID_IDX],2); memcpy(&rec_ancidlist,&rx_buffer[NEARBASEID_INDEX],2*rec_nearbase_num); memcpy(&rec_ancdistlist,&rx_buffer[NEARBASEID_INDEX+2*rec_nearbase_num],2*rec_nearbase_num); + memcpy(&rec_antdelay,&rx_buffer[NEARBASEID_INDEX+rec_nearbase_num*4],2); #ifdef USART_ALL_OUTPUT usart_send[2] = 0x0c;//正常模式 usart_send[3] = 8+rec_nearbase_num*4;//数据段长度 @@ -1125,4 +1270,5 @@ dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_ALL_RX_ERR); } } +} -- Gitblit v1.9.3