From 02e3adde186a6817de8bffce26edd16f45b05467 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 19 十月 2020 11:38:38 +0800
Subject: [PATCH] V1.30 1.增加修改参数回复。
---
源码/核心板/Src/application/dw_app.c | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 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 fd7fc57..94a6032 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"
@@ -5,7 +5,7 @@
DISCPOLL,
GETNEARMSG,
NEARPOLL,
-}tag_state=GETNEARMSG;
+}tag_state=NEARPOLL;
static dwt_config_t config = {
2, /* Channel number. */
DWT_PRF_64M, /* Pulse repetition frequency. */
@@ -553,7 +553,7 @@
// }
tagslotpos=GetRandomSlotPos(rec_tagpos_binary|tagpos_binary);
tyncpoll_time = (tagslotpos--%max_slotpos)*slottime;
- tag_state=GETNEARMSG;
+ tag_state=NEARPOLL;
}
// tyncpoll_time=0;
next_nearbase_num=0;
@@ -611,13 +611,13 @@
}
// printf("%d,%d",temp_sync_timer2,temp_sync_timer1);
-// #ifdef USART_INTEGRATE_OUTPUT
-// usart_send[2] = 4;//正常模式
-// usart_send[3] = report_num*6+2;//正常模式
-// checksum = Checksum_u16(&usart_send[2],report_num*6+2);
-// memcpy(&usart_send[4+report_num*6],&checksum,2);
-// UART_PushFrame(usart_send,6+report_num*6);
-// #endif
+ #ifdef USART_INTEGRATE_OUTPUT
+ usart_send[2] = 4;//正常模式
+ usart_send[3] = report_num*6+2;//正常模式
+ checksum = Checksum_u16(&usart_send[2],report_num*6+2);
+ memcpy(&usart_send[4+report_num*6],&checksum,2);
+ UART_PushFrame(usart_send,6+report_num*6);
+ #endif
// if(mainbase_lost_count>5)
// {
// //tag_state=DISCPOLL;
@@ -686,6 +686,13 @@
tyncpoll_time = (tagslotpos--%max_slotpos)*slottime;
}
+ #ifdef USART_INTEGRATE_OUTPUT
+ usart_send[2] = 4;//正常模式
+ usart_send[3] = report_num*6+2;//正常模式
+ checksum = Checksum_u16(&usart_send[2],report_num*6+2);
+ memcpy(&usart_send[4+report_num*6],&checksum,2);
+ UART_PushFrame(usart_send,6+report_num*6);
+ #endif
}
void Tag_App(void)//发送模式(TAG标签)
@@ -816,7 +823,7 @@
dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_ALL_RX_ERR);
}
}
-u8 misdist_num[TAG_NUM_IN_SYS],seize_anchor;
+u8 misdist_num[TAG_NUM_IN_SYS],seize_anchor,getrange_success=0;
u8 Anchor_RecNearPoll(u8 ancrec_nearbasepos) //0 mainbase 1 first near_base
{
u8 motorstate;
@@ -913,12 +920,12 @@
dist_cm = dist_no_bias * 100; //dis 为单位为cm的距离
/*--------------------------以下为非测距逻辑------------------------*/
//dist_cm=33000;
-
+ getrange_success = 1;
LED0_BLINK; //每成功一次通讯则闪烁一次
dis_after_filter=dist_cm;
hex_dist = dist_cm+(int16_t)g_com_map[DIST_OFFSET];
g_flag_Taggetdist[taglist_pos]=0;
- if(hex_dist>-1000&&hex_dist<100000)
+ if(hex_dist>-1000&&hex_dist<200000)
{
if(abs(hex_dist-his_dist[taglist_pos])<1500||misdist_num[taglist_pos]>3)
{
@@ -973,6 +980,7 @@
// GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_SET);
while (!((status_reg = dwt_read32bitreg(SYS_STATUS_ID)) & (SYS_STATUS_RXFCG | SYS_STATUS_ALL_RX_ERR))&&!g_start_send_flag&&!g_start_sync_flag)//不断查询芯片状态直到接收成功或者出现错误
{
+
IdleTask();
};
//GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_RESET);
--
Gitblit v1.9.3