From 0cecf2c7754120e4eabdd9555fdcae371130ca50 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期一, 07 七月 2025 09:53:30 +0800
Subject: [PATCH] V2.8 增加专网标志位，专网情况4G启动少发3个指令。修改UWB 配置bug，去掉容易混淆的重定义部分。
---
keil/uwb_tag.c | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/keil/uwb_tag.c b/keil/uwb_tag.c
index 5060fb4..f2d286d 100644
--- a/keil/uwb_tag.c
+++ b/keil/uwb_tag.c
@@ -50,22 +50,23 @@
};
extern uint16_t dev_id;
extern uint8_t group_id;
+extern struct mk_uwb_configure config;
/* Default communication configuration. */
-static struct mk_uwb_configure config = {//yuan
- .phy_work_mode = (uint8_t)(PHY_TX | PHY_RX),
- .phy_cfg.ch_num = 5, /* Channel number. */
- .phy_cfg.code_index = 9, /* TRX preamble code */
- .phy_cfg.mean_prf = MEAN_PRF_64M, /* Mean prf 64/128/256M */
- .phy_cfg.data_bit_rate = DATA_BR_6M8, /* Data rate 6.8M */
- .phy_cfg.sync_sym = PREAM_LEN_128, /* Preamble duration, length of preamble 128 */
- .phy_cfg.sfd_sym = NON_STD_NSFD5_8, /* Identifier for SFD sequence */
- .phy_cfg.ranging_bit = 1, /* ranging bit set 1 */
- .phy_cfg.trx_mode = TRX_MODE_15_4A, /* IEEE802.15.4z - BPRF mode */
- .phy_cfg.sts_pkt_cfg = STS_PKT_CFG_0, /* SP0 Frame */
- .phy_cfg.sts_segnum = STS_SEGNUM_BPRF_1, /* Number of STS segments in the frame */
- .phy_cfg.sts_seglen = STS_SEGLEN_BPRF_64, /* Number of symbols in an STS segment */
- .phy_cfg.rx_ant_id = UWB_RX_ANT_3, /* UWB RX antenna port */
-};
+//static struct mk_uwb_configure config = {//yuan
+// .phy_work_mode = (uint8_t)(PHY_TX | PHY_RX),
+// .phy_cfg.ch_num = 5, /* Channel number. */
+// .phy_cfg.code_index = 9, /* TRX preamble code */
+// .phy_cfg.mean_prf = MEAN_PRF_64M, /* Mean prf 64/128/256M */
+// .phy_cfg.data_bit_rate = DATA_BR_6M8, /* Data rate 6.8M */
+// .phy_cfg.sync_sym = PREAM_LEN_64, /* Preamble duration, length of preamble 128 新基站128，老基站64*/
+// .phy_cfg.sfd_sym = NON_STD_NSFD5_8, /* Identifier for SFD sequence */
+// .phy_cfg.ranging_bit = 1, /* ranging bit set 1 */
+// .phy_cfg.trx_mode = TRX_MODE_15_4A, /* IEEE802.15.4z - BPRF mode */
+// .phy_cfg.sts_pkt_cfg = STS_PKT_CFG_0, /* SP0 Frame */
+// .phy_cfg.sts_segnum = STS_SEGNUM_BPRF_1, /* Number of STS segments in the frame */
+// .phy_cfg.sts_seglen = STS_SEGLEN_BPRF_64, /* Number of symbols in an STS segment */
+// .phy_cfg.rx_ant_id = UWB_RX_ANT_3, /* UWB RX antenna port */
+//};
///* Default communication configuration. */
//static struct mk_uwb_configure config = {
// .phy_work_mode = (uint8_t)(PHY_TX | PHY_RX),
--
Gitblit v1.9.3