From 681567d6d1bd2894eccde5b22a948eac7d3a22a5 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期五, 20 九月 2024 18:38:25 +0800
Subject: [PATCH] 对应发货标签V1.6，更改版本号为V1.1，与一期标签分开，更改了tag的uwb测距配置与DW1000通讯,并将测距接包逻辑单次接包改为打开循环接收
---
keil/include/drivers/mk_spi.c | 60 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/keil/include/drivers/mk_spi.c b/keil/include/drivers/mk_spi.c
index 431f7d0..5bcd345 100644
--- a/keil/include/drivers/mk_spi.c
+++ b/keil/include/drivers/mk_spi.c
@@ -91,37 +91,37 @@
// update state
switch (spi_handle[id].state)
{
- case SPI_STATE_READY:
- spi_handle[id].state = state;
- break;
- case SPI_STATE_BUSY_RX:
- if (state == SPI_STATE_BUSY_TX)
- {
- spi_handle[id].state = SPI_STATE_BUSY_TX_RX;
- }
- else
- {
+ case SPI_STATE_READY:
+ spi_handle[id].state = state;
+ break;
+ case SPI_STATE_BUSY_RX:
+ if (state == SPI_STATE_BUSY_TX)
+ {
+ spi_handle[id].state = SPI_STATE_BUSY_TX_RX;
+ }
+ else
+ {
+ ret = DRV_BUSY;
+ }
+ break;
+ case SPI_STATE_BUSY_TX:
+ if (state == SPI_STATE_BUSY_RX)
+ {
+ spi_handle[id].state = SPI_STATE_BUSY_TX_RX;
+ }
+ else
+ {
+ ret = DRV_BUSY;
+ }
+ break;
+ case SPI_STATE_BUSY_TX_RX:
ret = DRV_BUSY;
- }
- break;
- case SPI_STATE_BUSY_TX:
- if (state == SPI_STATE_BUSY_RX)
- {
- spi_handle[id].state = SPI_STATE_BUSY_TX_RX;
- }
- else
- {
- ret = DRV_BUSY;
- }
- break;
- case SPI_STATE_BUSY_TX_RX:
- ret = DRV_BUSY;
- break;
- case SPI_STATE_RESET:
- case SPI_STATE_TIMEOUT:
- case SPI_STATE_ERROR:
- ret = DRV_ERROR;
- break;
+ break;
+ case SPI_STATE_RESET:
+ case SPI_STATE_TIMEOUT:
+ case SPI_STATE_ERROR:
+ ret = DRV_ERROR;
+ break;
}
int_unlock(lock);
--
Gitblit v1.9.3