summaryrefslogtreecommitdiff
path: root/examples/src/bin
diff options
context:
space:
mode:
Diffstat (limited to 'examples/src/bin')
-rw-r--r--examples/src/bin/ble_bas_central.rs7
-rw-r--r--examples/src/bin/ble_bas_peripheral.rs17
-rw-r--r--examples/src/bin/ble_l2cap_central.rs4
-rw-r--r--examples/src/bin/ble_l2cap_peripheral.rs17
-rw-r--r--examples/src/bin/ble_peripheral_onoff.rs17
-rw-r--r--examples/src/bin/ble_scan.rs2
-rw-r--r--examples/src/bin/rtic.rs17
7 files changed, 31 insertions, 50 deletions
diff --git a/examples/src/bin/ble_bas_central.rs b/examples/src/bin/ble_bas_central.rs
index 5216aea..2b37593 100644
--- a/examples/src/bin/ble_bas_central.rs
+++ b/examples/src/bin/ble_bas_central.rs
@@ -32,12 +32,13 @@ struct BatteryServiceClient {
}
#[task]
-async fn ble_central_task(sd: &'static Softdevice, config: central::Config) {
+async fn ble_central_task(sd: &'static Softdevice) {
let addrs = &[Address::new_random_static([
0x06, 0x6b, 0x71, 0x2c, 0xf5, 0xc0,
])];
- let conn = unwrap!(central::connect(sd, addrs, config).await);
+ let config = central::Config::default();
+ let conn = unwrap!(central::connect(sd, addrs, &config).await);
info!("connected");
let client: BatteryServiceClient = unwrap!(gatt_client::discover(&conn).await);
@@ -98,7 +99,7 @@ fn main() -> ! {
let executor = EXECUTOR.put(Executor::new(cortex_m::asm::sev));
unwrap!(executor.spawn(softdevice_task(sd)));
- unwrap!(executor.spawn(ble_central_task(sd, central::Config::default())));
+ unwrap!(executor.spawn(ble_central_task(sd)));
loop {
executor.run();
diff --git a/examples/src/bin/ble_bas_peripheral.rs b/examples/src/bin/ble_bas_peripheral.rs
index 08e74fa..a33b5b3 100644
--- a/examples/src/bin/ble_bas_peripheral.rs
+++ b/examples/src/bin/ble_bas_peripheral.rs
@@ -47,17 +47,12 @@ async fn bluetooth_task(sd: &'static Softdevice, config: peripheral::Config) {
];
loop {
- let conn = unwrap!(
- peripheral::advertise(
- sd,
- peripheral::ConnectableAdvertisement::ScannableUndirected {
- adv_data,
- scan_data,
- },
- config,
- )
- .await
- );
+ let config = peripheral::Config::default();
+ let adv = peripheral::ConnectableAdvertisement::ScannableUndirected {
+ adv_data,
+ scan_data,
+ };
+ let conn = unwrap!(peripheral::advertise(sd, adv, &config,).await);
info!("advertising done!");
diff --git a/examples/src/bin/ble_l2cap_central.rs b/examples/src/bin/ble_l2cap_central.rs
index c1675b5..3e04aa7 100644
--- a/examples/src/bin/ble_l2cap_central.rs
+++ b/examples/src/bin/ble_l2cap_central.rs
@@ -37,7 +37,7 @@ async fn ble_central_task(sd: &'static Softdevice) {
info!("Scanning for peer...");
let config = central::ScanConfig { whitelist: None };
- let res = central::scan(sd, config, |params| unsafe {
+ let res = central::scan(sd, &config, |params| unsafe {
let mut data = slice::from_raw_parts(params.data.p_data, params.data.len as usize);
while data.len() != 0 {
let len = data[0] as usize;
@@ -70,7 +70,7 @@ 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 conn = unwrap!(central::connect(sd, addrs, &config).await);
info!("connected");
let l = l2cap::L2cap::<Packet>::init(sd);
diff --git a/examples/src/bin/ble_l2cap_peripheral.rs b/examples/src/bin/ble_l2cap_peripheral.rs
index 312a794..3921864 100644
--- a/examples/src/bin/ble_l2cap_peripheral.rs
+++ b/examples/src/bin/ble_l2cap_peripheral.rs
@@ -45,17 +45,12 @@ async fn bluetooth_task(sd: &'static Softdevice, config: peripheral::Config) {
let l = l2cap::L2cap::<Packet>::init(sd);
loop {
- let conn = unwrap!(
- peripheral::advertise(
- sd,
- peripheral::ConnectableAdvertisement::ScannableUndirected {
- adv_data,
- scan_data,
- },
- config,
- )
- .await
- );
+ let config = peripheral::Config::default();
+ let adv = peripheral::ConnectableAdvertisement::ScannableUndirected {
+ adv_data,
+ scan_data,
+ };
+ let conn = unwrap!(peripheral::advertise(sd, adv, &config).await);
info!("advertising done!");
diff --git a/examples/src/bin/ble_peripheral_onoff.rs b/examples/src/bin/ble_peripheral_onoff.rs
index 625b895..50f31bf 100644
--- a/examples/src/bin/ble_peripheral_onoff.rs
+++ b/examples/src/bin/ble_peripheral_onoff.rs
@@ -45,17 +45,12 @@ async fn run_bluetooth(sd: &'static Softdevice, server: &FooService) {
];
loop {
- let conn = unwrap!(
- peripheral::advertise(
- sd,
- peripheral::ConnectableAdvertisement::ScannableUndirected {
- adv_data,
- scan_data,
- },
- peripheral::Config::default(),
- )
- .await
- );
+ let config = peripheral::Config::default();
+ let adv = peripheral::ConnectableAdvertisement::ScannableUndirected {
+ adv_data,
+ scan_data,
+ };
+ let conn = unwrap!(peripheral::advertise(sd, adv, &config).await);
info!("advertising done!");
diff --git a/examples/src/bin/ble_scan.rs b/examples/src/bin/ble_scan.rs
index 4e54978..46c61a3 100644
--- a/examples/src/bin/ble_scan.rs
+++ b/examples/src/bin/ble_scan.rs
@@ -28,7 +28,7 @@ async fn softdevice_task(sd: &'static Softdevice) {
#[task]
async fn ble_task(sd: &'static Softdevice) {
let config = central::ScanConfig { whitelist: None };
- let res = central::scan(sd, config, |params| unsafe {
+ let res = central::scan(sd, &config, |params| unsafe {
info!("AdvReport!");
info!(
"type: connectable={:u16} scannable={:u16} directed={:u16} scan_response={:u16} extended_pdu={:u16} status={:u16}",
diff --git a/examples/src/bin/rtic.rs b/examples/src/bin/rtic.rs
index bc46c0e..988b124 100644
--- a/examples/src/bin/rtic.rs
+++ b/examples/src/bin/rtic.rs
@@ -51,17 +51,12 @@ async fn bluetooth_task(sd: &'static Softdevice) {
];
loop {
- let conn = unwrap!(
- peripheral::advertise(
- sd,
- peripheral::ConnectableAdvertisement::ScannableUndirected {
- adv_data,
- scan_data,
- },
- peripheral::Config::default()
- )
- .await
- );
+ let config = peripheral::Config::default();
+ let adv = peripheral::ConnectableAdvertisement::ScannableUndirected {
+ adv_data,
+ scan_data,
+ };
+ let conn = unwrap!(peripheral::advertise(sd, adv, &config).await);
info!("advertising done!");
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 06:27:58 +0000