F103基站代码
blame | 历史 | 补丁 | 提交 | 提交对比 | 显示空白
zhyinch
2022-01-24 745df4596c097ceff8d2ec624b3bf996dd95edcf 
 源码/核心板/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);


@@ -579,7 +584,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);


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