From 3c94abf0624a935435da580595f537ecdc8d98b8 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期日, 07 三月 2021 10:09:44 +0800
Subject: [PATCH] V2.22 默认震动输出
---
Src/application/dw_app.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/Src/application/dw_app.c b/Src/application/dw_app.c
index 0725258..c102ec6 100644
--- a/Src/application/dw_app.c
+++ b/Src/application/dw_app.c
@@ -646,6 +646,7 @@
uint32_t final_tx_time;
u32 start_poll;
u8 i,j,getsync_flag=0,timeout;
+ USART_putc(current_slotnum);
dwt_setrxaftertxdelay(POLL_TX_TO_RESP_RX_DLY_UUS); //设置发送后开启接收，并设定延迟时间
dwt_setrxtimeout(RESP_RX_TIMEOUT_UUS);
tag_succ_times = 0;
@@ -765,7 +766,7 @@
}
ancsync_time=((sync_timer)*1000+tmp_time);
last_slotnum=current_slotnum;
- current_slotnum=((float)(sync_timer*10)/(SLOTTIME_MS*bigslot_num))+1;
+ current_slotnum=((float)(sync_timer*10 - tagslotpos*SLOTTIME_MS)/(SLOTTIME_MS*bigslot_num))+1;
if(current_slotnum==last_slotnum-1)
{flag_getresponse=1;}
lastsync_timer=sync_timer;
@@ -808,6 +809,8 @@
}
// dwt_write32bitreg(SYS_STATUS_ID,SYS_STATUS_RXFCG| SYS_STATUS_ALL_RX_ERR);
}
+ if(flag_finalsend!=1)
+ {flag_finalsend = 2;}
dwt_forcetrxoff();
dwt_write32bitreg(SYS_STATUS_ID,SYS_STATUS_RXFCG| SYS_STATUS_ALL_RX_ERR);
@@ -839,9 +842,10 @@
pack_length = rec_remotepara[2];
if(pack_msgtype==2)
{
- if( pack_index == MOTOR_ONTIME_INDEX&&motor_keeptime==0)
+ if( pack_index == MOTOR_ONTIME_INDEX)
{
- motor_keeptime = rec_remotepara[3];
+ if(motor_keeptime==0)
+ motor_keeptime = rec_remotepara[3];
}else{
memcpy((uint8_t*)&g_com_map + pack_index, &rec_remotepara[3], pack_length);
//返回一个error状态
--
Gitblit v1.9.3