From 4cdc4b3d488e15b1d6572bdcd61a2ce92d0c8c9b Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期五, 16 五月 2025 18:13:14 +0800
Subject: [PATCH] 成功分离2个测距功能
---
keil/include/components/app/src/ranging_fira.c | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/keil/include/components/app/src/ranging_fira.c b/keil/include/components/app/src/ranging_fira.c
index 55e8933..beb9436 100644
--- a/keil/include/components/app/src/ranging_fira.c
+++ b/keil/include/components/app/src/ranging_fira.c
@@ -136,12 +136,14 @@
// This function will be called by uwbapi_session_init()
void app_session_init(void)
-{
- normal_uwb_change_to_fira();//变为fira配置的uwb
+{
+ #ifdef MY_MODE
+ normal_uwb_change_to_fira();
+ #endif
// register process handler for MAC TX done and RX done
mac_register_process_handler(ranging_tx_process, ranging_rx_process);
+ uwbs_handler_init(&op);
- uwbs_handler_init(&op);
}
void ranging_configure(void)
@@ -309,10 +311,10 @@
.phy_cfg.rx_ant_id = UWB_RX_ANT_3, /* UWB RX antenna port */
};
#endif
-uint8_t normal_flag=1;
+
void uwb_fira_init(void)
{
- uwb_open();
+// uwb_open();
// set advanced parameters
struct PHY_ADV_CONFIG_T adv_config =
@@ -340,6 +342,7 @@
uwb_app_config.session_param.tx_power_level = board_param.tx_power_fcc[CALIB_CH(uwb_app_config.ppdu_params.ch_num)];
uwb_app_config.ppdu_params.rx_ant_id = (uint8_t)(RX_MAIN_ANT_PORT);
}
+uint8_t normal_flag=0;
void uwb_normal_init(void)
{
Uwb_init();
@@ -403,7 +406,9 @@
void ranging_stop(void)
{
ranging_env.enable = 0;
+ #ifdef MY_MODE
fira_uwb_change_to_normal();//变为normal配置的uwb
+ #endif
ranging_monitor_stop();
LOG_INFO(TRACE_NO_REPORT_HOST | TRACE_MODULE_APP, "Ranging stop\r\n");
}
--
Gitblit v1.9.3