From 003aff1766ffd3ccfe9df6096ef137340ebfeabf Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 18 十二月 2020 16:57:26 +0800
Subject: [PATCH] Merge branch '调试' into 定位-临近
---
Src/application/dw_app.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Src/application/dw_app.c b/Src/application/dw_app.c
index 5a3d9c4..8f1a2e0 100644
--- a/Src/application/dw_app.c
+++ b/Src/application/dw_app.c
@@ -69,7 +69,7 @@
#define FINAL_MSG_FINAL_TX_TS_IDX 18
#define FINAL_MSG_TS_LEN 4
-#define STARTPOLL REGPOLL
+#define STARTPOLL DISCPOLL
enum enumtagstate
{
REGPOLL,
@@ -584,7 +584,7 @@
tyncpoll_time=(tagslotpos-1)*slottime;
}
mainbase_id=minid;
-// mainbase_id = 0x9804;
+// mainbase_id = 0x4;
}
u8 nearmsg_mainbase=0,rec_tagpos_emptylist[32],mainbase_type;;
void GetNearMsg(void)
@@ -986,6 +986,9 @@
{
//LED0_ON;
+ SPIx_CS_GPIO->BRR = SPIx_CS;
+ delay_us(700);
+ SPIx_CS_GPIO->BSRR = SPIx_CS;
id = dwt_readdevid() ;
while (DWT_DEVICE_ID != id)
{
@@ -1014,10 +1017,8 @@
tag_state = STARTPOLL;
}
break;
- case NEARPOLL:
- //GPIO_WriteBit(EU_TX_GPIO, EU_RX_PIN, Bit_SET);
+ case NEARPOLL:
NearPoll();
- //GPIO_WriteBit(EU_TX_GPIO, EU_RX_PIN, Bit_RESET);
break;
}
dwt_entersleep();
--
Gitblit v1.9.3