From d97b9d1feb9f59b7b5508fe2d0fb2c94767204a2 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 21 九月 2020 12:23:25 +0800
Subject: [PATCH] 增加批量修改标签参数功能
---
源码/核心板/Src/application/dw_app.c | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 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 aa958c2..9218bde 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"
@@ -858,16 +858,40 @@
tx_nearresp_msg[MESSAGE_TYPE_IDX]=NEAR_RESPONSE;
tx_nearresp_msg[MOTORSTATE_INDEX]=(remotesend_state<<4)|motorstate;
waittagconfig_reponse=0;
- if(remotesend_state&&!memcmp(&rx_buffer[TAG_ID_IDX],&configremotetagID,2))
- {
- memcpy(&tx_nearresp_msg[REMOTEPARA_INDEX],remotetag_para,remotetag_paralen);
- dwt_writetxdata(22+remotetag_paralen, tx_nearresp_msg, 0);//写入发送数据
- dwt_writetxfctrl(22+remotetag_paralen, 0);//设定发送长度
- waittagconfig_reponse=1;
- }else{
- dwt_writetxdata(22, tx_nearresp_msg, 0);//写入发送数据
- dwt_writetxfctrl(22, 0);//设定发送长度
- }
+ if(pwtag.remain_time>0)
+ {uint8_t i;
+ for(i=0;i<pwtag.groupnum;i++)
+ {
+ if(pwtag.groupid[i][0]<=tag_id_recv&&tag_id_recv<=pwtag.groupid[i][1])
+ {
+ remotesend_state=1;
+ tx_nearresp_msg[MOTORSTATE_INDEX]=(remotesend_state<<4)|motorstate;
+ remotetag_paralen = 2+3;
+ remotetag_para[0] = 2;
+ remotetag_para[1] = 6;
+ remotetag_para[2] = 2;
+ memcpy(&remotetag_para[3],&pwtag.group_interval[i],2);
+ memcpy(&tx_nearresp_msg[REMOTEPARA_INDEX],remotetag_para,remotetag_paralen);
+ dwt_writetxdata(22+remotetag_paralen, tx_nearresp_msg, 0);//写入发送数据
+ dwt_writetxfctrl(22+remotetag_paralen, 0);//设定发送长度
+ remotesend_state=0;
+ break;
+ }
+ }
+
+ }else{
+ dwt_writetxdata(22, tx_nearresp_msg, 0);//写入发送数据
+ dwt_writetxfctrl(22, 0);//设定发送长度
+ }
+
+// if(remotesend_state&&tag_id_recv==configremotetagID)
+// {
+// memcpy(&tx_nearresp_msg[REMOTEPARA_INDEX],remotetag_para,remotetag_paralen);
+// dwt_writetxdata(22+remotetag_paralen, tx_nearresp_msg, 0);//写入发送数据
+// dwt_writetxfctrl(22+remotetag_paralen, 0);//设定发送长度
+// waittagconfig_reponse=1;
+// }else{
+
result = dwt_starttx(DWT_START_TX_DELAYED | DWT_RESPONSE_EXPECTED);//延迟发送，等待接收
battary = rx_buffer[BATTARY_IDX];
--
Gitblit v1.9.3