diff options
| author | Dario Nieuwenhuis <dirbaio@dirbaio.net> | 2021-02-03 06:25:30 +0100 |
|---|---|---|
| committer | Dario Nieuwenhuis <dirbaio@dirbaio.net> | 2021-02-03 06:25:30 +0100 |
| commit | 96e625fc3baa4f258e9e9f761845a76751710b0d (patch) | |
| tree | 50f25a17c00f23dba5bb67acde88c715e5c322ca /examples | |
| parent | 1c821300e2b39c8cc31b11f0f857df81b1aaa9f2 (diff) | |
| download | nrf-softdevice-96e625fc3baa4f258e9e9f761845a76751710b0d.zip | |
unify and improve central config structs
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/src/bin/ble_bas_central.rs | 6 | ||||
| -rw-r--r-- | examples/src/bin/ble_l2cap_central.rs | 6 | ||||
| -rw-r--r-- | examples/src/bin/ble_scan.rs | 5 |
3 files changed, 8 insertions, 9 deletions
diff --git a/examples/src/bin/ble_bas_central.rs b/examples/src/bin/ble_bas_central.rs index 13f6fb5..be90a4c 100644 --- a/examples/src/bin/ble_bas_central.rs +++ b/examples/src/bin/ble_bas_central.rs @@ -37,9 +37,9 @@ async fn ble_central_task(sd: &'static Softdevice) { AddressType::RandomStatic, [0x06, 0x6b, 0x71, 0x2c, 0xf5, 0xc0], )]; - - let config = central::Config::default(); - let conn = unwrap!(central::connect(sd, addrs, &config).await); + let mut config = central::ConnectConfig::default(); + config.scan_config.whitelist = Some(addrs); + let conn = unwrap!(central::connect(sd, &config).await); info!("connected"); let client: BatteryServiceClient = unwrap!(gatt_client::discover(&conn).await); diff --git a/examples/src/bin/ble_l2cap_central.rs b/examples/src/bin/ble_l2cap_central.rs index b00087a..e5f3e3c 100644 --- a/examples/src/bin/ble_l2cap_central.rs +++ b/examples/src/bin/ble_l2cap_central.rs @@ -39,6 +39,7 @@ async fn ble_central_task(sd: &'static Softdevice) { let config = central::ScanConfig { whitelist: None, tx_power: TxPower::ZerodBm, + ..Default::default() }; let res = central::scan(sd, &config, |params| unsafe { let mut data = slice::from_raw_parts(params.data.p_data, params.data.len as usize); @@ -72,8 +73,9 @@ async fn ble_central_task(sd: &'static Softdevice) { let addrs = &[&address]; - let config = central::Config::default(); - let conn = unwrap!(central::connect(sd, addrs, &config).await); + let mut config = central::ConnectConfig::default(); + config.scan_config.whitelist = Some(addrs); + let conn = unwrap!(central::connect(sd, &config).await); info!("connected"); let l = l2cap::L2cap::<Packet>::init(sd); diff --git a/examples/src/bin/ble_scan.rs b/examples/src/bin/ble_scan.rs index 71ee0d0..7250364 100644 --- a/examples/src/bin/ble_scan.rs +++ b/examples/src/bin/ble_scan.rs @@ -27,10 +27,7 @@ async fn softdevice_task(sd: &'static Softdevice) { #[task] async fn ble_task(sd: &'static Softdevice) { - let config = central::ScanConfig { - whitelist: None, - tx_power: TxPower::ZerodBm, - }; + let config = central::ScanConfig::default(); let res = central::scan(sd, &config, |params| unsafe { info!("AdvReport!"); info!( |