From 6991ff5ec5d1eb4992d22ac53e2c7d8657406fa0 Mon Sep 17 00:00:00 2001 From: Jannik Beyerstedt Date: Fri, 25 Sep 2026 13:09:54 +0200 Subject: [PATCH] ble: Move feature listing to own module --- src/ble.rs | 13 +------------ src/main.rs | 1 + src/util.rs | 20 ++++++++++++++++++++ 3 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 src/util.rs diff --git a/src/ble.rs b/src/ble.rs index bdb32be..a460d4e 100644 --- a/src/ble.rs +++ b/src/ble.rs @@ -120,20 +120,9 @@ pub async fn run( .. } = stack.build(); - let mut features = alloc::vec![]; - if cfg!(feature = "cam") { - features.push("cam"); - } - if cfg!(feature = "denm") { - features.push("denm"); - } - if cfg!(feature = "spat") { - features.push("mapem"); - features.push("spatem"); - } info!( "Starting advertising and GATT service for {}", - features.join(",") + crate::util::get_rx_feature_list().join(",") ); let server = Server::new_with_config(GapConfig::Peripheral(PeripheralConfig { name: &name, diff --git a/src/main.rs b/src/main.rs index ae2a14e..5c23fe6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -58,6 +58,7 @@ mod io; mod screen; #[cfg(feature = "gnss_ubx")] mod ubx; +mod util; const WIFI_CHANNEL: radio::Channel = 180; const WIFI_TXPOWER: i8 = 10; // dBm, 2..20 diff --git a/src/util.rs b/src/util.rs new file mode 100644 index 0000000..a1eb931 --- /dev/null +++ b/src/util.rs @@ -0,0 +1,20 @@ +//! Some stuff used at several places + +use alloc::vec::Vec; + +#[allow(unused)] +pub(crate) fn get_rx_feature_list() -> Vec<&'static str> { + let mut features = alloc::vec![]; + if cfg!(feature = "cam") { + features.push("cam"); + } + if cfg!(feature = "denm") { + features.push("denm"); + } + if cfg!(feature = "spat") { + features.push("mapem"); + features.push("spatem"); + } + + features +}