From 1066acd3b7e804e453b324be2529349216d4df80 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 10 三月 2022 17:28:40 +0800
Subject: [PATCH] V1.66 增加按键电量信息
---
源码/核心板/Src/application/dw_app.c | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 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 741a0fe..91c5765 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"
@@ -883,7 +883,16 @@
dwt_setrxaftertxdelay(RESP_TX_TO_FINAL_RX_DLY_UUS+(rec_nearbase_num+1-ancrec_nearbasepos)*DELAY_BETWEEN_TWO_FRAME_UUS);//设置发送完成后开启接收延迟时间
dwt_setrxtimeout(FINAL_RX_TIMEOUT_UUS);//接收超时时间
- if(tagdist_list[taglist_pos]<g_com_map[ALARM_DISTANCE1])
+
+ if(new_tagid)
+ {
+ tagdist_list[taglist_pos]=0x1ffff;
+ memcpy(&tx_nearresp_msg[DIST_IDX], &tagdist_list[taglist_pos], 4);
+ }else{
+ memcpy(&tx_nearresp_msg[DIST_IDX], &tagdist_list[taglist_pos], 4);
+ }
+
+ if(tagdist_list[taglist_pos]<g_com_map[ALARM_DISTANCE1])
{
motorstate =0;
}else if(tagdist_list[taglist_pos]<g_com_map[ALARM_DISTANCE2])
@@ -895,18 +904,11 @@
}else{
motorstate =0;
}
-
- if(new_tagid)
- {
- tagdist_list[taglist_pos]=0x1ffff;
- memcpy(&tx_nearresp_msg[DIST_IDX], &tagdist_list[taglist_pos], 4);
- }else{
- memcpy(&tx_nearresp_msg[DIST_IDX], &tagdist_list[taglist_pos], 4);
- }
+
tx_nearresp_msg[GROUP_ID_IDX] = group_id;
tx_nearresp_msg[MAINBASE_INDEX]=flag_syncbase;
tx_nearresp_msg[MESSAGE_TYPE_IDX]=NEAR_RESPONSE;
- tx_nearresp_msg[MOTORSTATE_INDEX]=(remotesend_state<<4)|motorstate;
+ tx_nearresp_msg[MOTORSTATE_INDEX]=(remotesend_state<<4)|(motorstate&0xf);
if(remotesend_state)
{
memcpy(&tx_nearresp_msg[REMOTEPARA_INDEX],remotetag_para,REMOTEPARA_LEN);
@@ -1001,7 +1003,7 @@
{
g_Tagdist[taglist_pos]=hex_dist/10;
}else{
- g_Tagdist[taglist_pos]= 1;
+ // g_Tagdist[taglist_pos]= 1;
}
#ifdef USART_SINGLE_OUTPUT
usart_send[2] = 1;//正常模式
@@ -1009,8 +1011,8 @@
usart_send[4] = frame_seq_nb2;//数据段长度
memcpy(&usart_send[5],&tag_id_recv,2);
memcpy(&usart_send[7],&dev_id,2);
- if(tagdist_list[taglist_pos]<=0)
- tagdist_list[taglist_pos]=10;
+ if(tagdist_list[taglist_pos]<=0)
+ tagdist_list[taglist_pos]=0x2ffff;
memcpy(&usart_send[9],&tagdist_list[taglist_pos],4);
usart_send[13] = battary;
usart_send[14] = button;
@@ -1025,6 +1027,7 @@
memcpy(&usart_send_anc[6+6*anc_report_num],&tagdist_list[taglist_pos],4);
anc_report_num++;
#endif
+ tagstate_list[taglist_pos] = (button<<8)|battary;
for(i=0;i<taglist_num-1;i++)
{
if( tagdist_list[i]>tagdist_list[i+1]&&tagdist_list[i+1]!=0)
--
Gitblit v1.9.3