From 35ee22677fd90dee7b6fa93c1098f48f16c07aff Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期三, 01 七月 2020 22:54:43 +0800 Subject: [PATCH] 提供给安徽星心V1.30,10对10测试成功 --- 源码/核心板/Src/application/dw_app.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 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 52bcef1..20d2622 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" @@ -329,6 +329,7 @@ extern uint16_t sync_timer; u16 tmp_time; extern float dw_vbat; +extern u16 slottime,max_slotnum,current_slotpos,tyncpoll_time; void Tag_App(void)//发送模式(TAG标签) { uint32_t frame_len; @@ -493,10 +494,10 @@ // deca_sleep(10); } // dwt_entersleep(); -// if(tag_succ_times<g_com_map[MIN_REPORT_ANC_NUM]) -// { -// //poll_timer +=time32_incr&0x7+3; -// } + if(tag_succ_times<1) + { + tyncpoll_time=(current_slotpos--%max_slotnum)*slottime; + } /* Execute a delay between ranging exchanges. */ @@ -648,7 +649,7 @@ hex_dist = dist_cm+(int16_t)g_com_map[DIST_OFFSET]*10; if(tag_id_recv-TAG_ID_START<=TAG_NUM_IN_SYS) { - if(hex_dist-his_dist[tag_id_recv-TAG_ID_START]<15000||misdist_num[tag_id_recv-TAG_ID_START]>4) + if(abs(hex_dist-his_dist[tag_id_recv-TAG_ID_START])<15000||misdist_num[tag_id_recv-TAG_ID_START]>4) { int32_t filter_dist; misdist_num[tag_id_recv-TAG_ID_START]=0; -- Gitblit v1.9.3