F103基站代码
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
zhyinch
2022-01-28 d7dbc22af58c7d83ca01a58ba7f9001d7c8dec64 
 Ô´Âë/ºËÐÄ°å/Src/application/dw_app.c


@@ -315,7 +315,7 @@


}


u8 test=0;


u8 anclost_times=0;


u8 exsistbase_list[MAX_NEARBASE_NUM],report_num,get_newbase=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;


 void NearPoll(void)


@@ -448,6 +448,9 @@


                           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;


@@ -483,8 +486,8 @@


                              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);


@@ -506,7 +509,7 @@


                              memcpy(&usart_send[7],&rec_extratag_id,2);   


                              }                                 


                              memcpy(&usart_send[9],&rec_extratag_dist,4);


                              usart_send[13] = battary;


                              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);


@@ -527,6 +530,8 @@


                          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)


@@ -552,8 +557,8 @@


                              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);


@@ -577,9 +582,9 @@


                              }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] = battary;


                              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);


@@ -1065,6 +1070,7 @@


                            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;


@@ -1180,7 +1186,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+nearbase_num*4],2);


                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;//数据段长度