From d53db68d643026fc207af89dfb36f67f331852fe Mon Sep 17 00:00:00 2001 From: WXK <287788329@qq.com> Date: 星期四, 22 八月 2024 15:02:30 +0800 Subject: [PATCH] V2.1,去掉全部功能,只负责开机,配合urt进入高精度后自动关机的固件使用 --- Src/application/dw_app.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Src/application/dw_app.c b/Src/application/dw_app.c index 83fc76d..68e1f01 100644 --- a/Src/application/dw_app.c +++ b/Src/application/dw_app.c @@ -718,7 +718,7 @@ { nearbase_distlist[nearmsg_i] = 0x1ffff; } -//mainbase_id = 0x9818; +//mainbase_id = 0x1; memcpy(&tx_near_msg[ANCHOR_ID_IDX],&mainbase_id,2); memcpy(&tx_near_msg[TAG_ID_IDX],&dev_id,2); tx_near_msg[MESSAGE_TYPE_IDX] = POS_MSG; @@ -831,11 +831,11 @@ tx_near_msg[BATTARY_IDX] = bat_percent; tx_near_msg[BUTTON_IDX] = userkey_state|stationary_flag<<1|gotosleep_flag<<2|motor_flag<<5; tx_near_msg[SEQUENCE_IDX] = frame_seq_nb; - tx_near_msg[SEQUENCEH_IDX] = (frame_seq_nb++)>>8; + tx_near_msg[SEQUENCEH_IDX] = (frame_seq_nb++)>>8; tx_near_msg[NEARBASENUM_INDEX] = nearbase_num; memcpy(&tx_near_msg[NEARBASEID_INDEX],&nearbaseid_list,nearbase_num*2); - memcpy(&tx_near_msg[NEARBASEID_INDEX+nearbase_num*2],&nearbase_distlist,nearbase_num*4+4); - memcpy(&tx_near_msg[NEARBASEID_INDEX+nearbase_num*6+4],&rec_anc_signalpower,nearbase_num*2+2); + memcpy(&tx_near_msg[NEARBASEID_INDEX+nearbase_num*2],&nearbase_distlist,nearbase_num*4+4); + memcpy(&tx_near_msg[NEARBASEID_INDEX+nearbase_num*6+4],&rec_anc_signalpower,nearbase_num*2+2); if(intheight!=0) @@ -1049,7 +1049,7 @@ #endif }else if(mainbase_lost_count>5*tag_frequency) { - // tag_state = DISCPOLL; + tag_state = DISCPOLL; } if(mainbase_lost_count!=0) { @@ -1070,7 +1070,7 @@ { if( pack_index == MOTOR_ONTIME_INDEX) { - // if(motor_keeptime==0) + if(motor_keeptime==0) motor_keeptime = rec_remotepara[3]; }else if( pack_index == 2*COM_INTERVAL) { @@ -1095,14 +1095,14 @@ } } } - if(get_newdist>2) + if(get_newdist>=2) { notenoughdist_count = 0; }else{ - if(notenoughdist_count++>3) + if(notenoughdist_count++>10) { notenoughdist_count = 0; - // tag_state = DISCPOLL; + tag_state = DISCPOLL; } } for(i=0;i<nearbase_num;i++) @@ -1258,6 +1258,7 @@ // Poll(); break; } + FZNearPoll(); userkey_state = !GET_USERKEY; dwt_entersleep(); } -- Gitblit v1.9.3