From 20bdb4be1fc4676cceaf09456b5ff4b648f4a4a4 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 14 七月 2022 15:21:33 +0800
Subject: [PATCH] v2.49 新版子功能调通
---
Src/application/dw_app.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/Src/application/dw_app.c b/Src/application/dw_app.c
index 7dcb0ca..a0e851a 100644
--- a/Src/application/dw_app.c
+++ b/Src/application/dw_app.c
@@ -766,6 +766,7 @@
// tyncpoll_time = (tagslotpos--%max_slotpos)*slottime;
}
}
+extern float nomove_count;
uint8_t pack_length = 0,pack_index = 0,pack_msgtype = 0;
void NearPoll(void)
{
@@ -1030,6 +1031,7 @@
}else{
if(pack_index<200)
{
+ nomove_count = 0;
memcpy((uint8_t*)&g_com_map + pack_index, &rec_remotepara[3], pack_length);
//返回一个error状态
//SendComMap(pack_datalen,pack_index);
@@ -1085,7 +1087,7 @@
dwt_starttx(DWT_START_TX_IMMEDIATE | DWT_RESPONSE_EXPECTED);//开启发送，发送完成后等待一段时间开启接收，等待时间在dwt_setrxaftertxdelay中设置
while (!((status_reg = dwt_read32bitreg(SYS_STATUS_ID)) & (SYS_STATUS_RXFCG | SYS_STATUS_ALL_RX_ERR)))//不断查询芯片状态直到成功接收或者发生错误
{
- IdleTask();
+// IdleTask();
};
if(status_reg==0xffffffff)
@@ -1156,7 +1158,7 @@
IdleTask();
if(error_times++>20)
{
- printf("DW ID ERROR.\r\n");
+ //printf("DW ID ERROR.\r\n");
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
}
@@ -1185,8 +1187,8 @@
break;
case NEARPOLL:
NearPoll();
- GetPressAndHeight();
- intheight = Height*100;
+ // GetPressAndHeight();
+ //intheight = Height*100;
break;
case SINGLEPOLL:
Poll();
--
Gitblit v1.9.3