Integration test

.github/workflows/ci.yaml

@@ -9,7 +9,7 @@ on:
   pull_request:
 
 jobs:
-  ci:
+  build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -24,7 +24,19 @@ jobs:
       - name: Test
         run: |
           cd host
-          cargo test -- --nocapture
+          cargo test --lib -- --nocapture
 
       - name: Build examples
         run: for i in nrf-sdc; do pushd examples/$i; cargo fmt --check && cargo clippy && cargo build --release; popd; done;
+        #integration-tests:
+        #  runs-on: self-hosted
+        #  steps:
+        #    - uses: actions/checkout@v4
+        #    - name: Build
+        #      env:
+        #        TEST_ADAPTER_ONE: /dev/ttyACM0
+        #        TEST_ADAPTER_TWO: /dev/ttyACM1
+        #        RUST_LOG: info
+        #      run: |
+        #        cd host
+        #        cargo test --test '*' -- --nocapture

examples/nrf-sdc/src/bin/ble_bas_peripheral.rs

@@ -2,6 +2,7 @@
 #![no_main]
 #![feature(impl_trait_in_assoc_type)]
 
+use bt_hci::cmd::le::LeSetRandomAddr;
 use bt_hci::cmd::SyncCmd;
 use bt_hci::param::BdAddr;
 use defmt::{error, info, unwrap};
@@ -12,7 +13,6 @@ use embassy_sync::blocking_mutex::raw::NoopRawMutex;
 use embassy_time::{Duration, Timer};
 use nrf_sdc::{self as sdc, mpsl, mpsl::MultiprotocolServiceLayer};
 use sdc::rng_pool::RngPool;
-use sdc::vendor::ZephyrWriteBdAddr;
 use static_cell::StaticCell;
 use trouble_host::{
     adapter::{Adapter, HostResources},
@@ -40,8 +40,8 @@ async fn mpsl_task(mpsl: &'static MultiprotocolServiceLayer<'static>) -> ! {
 fn bd_addr() -> BdAddr {
     unsafe {
         let ficr = &*pac::FICR::ptr();
-        let high = u64::from((ficr.deviceid[1].read().bits() & 0x0000ffff) | 0x0000c000);
-        let addr = high << 32 | u64::from(ficr.deviceid[0].read().bits());
+        let high = u64::from((ficr.deviceaddr[1].read().bits() & 0x0000ffff) | 0x0000c000);
+        let addr = high << 32 | u64::from(ficr.deviceaddr[0].read().bits());
         BdAddr::new(unwrap!(addr.to_le_bytes()[..6].try_into()))
     }
 }
@@ -108,8 +108,8 @@ async fn main(spawner: Spawner) {
     let mut sdc_mem = sdc::Mem::<3312>::new();
     let sdc = unwrap!(build_sdc(sdc_p, &rng, mpsl, &mut sdc_mem));
 
-    info!("Advertising as {:02x}", bd_addr());
-    unwrap!(ZephyrWriteBdAddr::new(bd_addr()).exec(&sdc).await);
+    info!("Our address = {:02x}", bd_addr());
+    unwrap!(LeSetRandomAddr::new(bd_addr()).exec(&sdc).await);
     Timer::after(Duration::from_millis(200)).await;
 
     static HOST_RESOURCES: StaticCell<HostResources<NoopRawMutex, L2CAP_CHANNELS_MAX, PACKET_POOL_SIZE, L2CAP_MTU>> =
@@ -119,11 +119,11 @@ async fn main(spawner: Spawner) {
     let adapter: Adapter<'_, NoopRawMutex, _, CONNECTIONS_MAX, L2CAP_CHANNELS_MAX> = Adapter::new(sdc, host_resources);
     let config = AdvertiseConfig {
         params: None,
-        data: &[
+        adv_data: &[
             AdStructure::Flags(LE_GENERAL_DISCOVERABLE | BR_EDR_NOT_SUPPORTED),
             AdStructure::ServiceUuids16(&[Uuid::Uuid16([0x0f, 0x18])]),
-            AdStructure::CompleteLocalName("Trouble"),
         ],
+        scan_data: &[AdStructure::CompleteLocalName(b"Trouble")],
     };
 
     let mut table: AttributeTable<'_, NoopRawMutex, 10> = AttributeTable::new();

examples/nrf-sdc/src/bin/ble_l2cap_central.rs

@@ -2,6 +2,7 @@
 #![no_main]
 #![feature(impl_trait_in_assoc_type)]
 
+use bt_hci::cmd::le::LeSetRandomAddr;
 use bt_hci::cmd::SyncCmd;
 use bt_hci::param::BdAddr;
 use defmt::{info, unwrap};
@@ -12,7 +13,6 @@ use embassy_sync::blocking_mutex::raw::NoopRawMutex;
 use embassy_time::{Duration, Timer};
 use nrf_sdc::{self as sdc, mpsl, mpsl::MultiprotocolServiceLayer};
 use sdc::rng_pool::RngPool;
-use sdc::vendor::ZephyrWriteBdAddr;
 use static_cell::StaticCell;
 use trouble_host::{
     adapter::{Adapter, HostResources},
@@ -41,8 +41,8 @@ async fn mpsl_task(mpsl: &'static MultiprotocolServiceLayer<'static>) -> ! {
 fn bd_addr() -> BdAddr {
     unsafe {
         let ficr = &*pac::FICR::ptr();
-        let high = u64::from((ficr.deviceid[1].read().bits() & 0x0000ffff) | 0x0000c000);
-        let addr = high << 32 | u64::from(ficr.deviceid[0].read().bits());
+        let high = u64::from((ficr.deviceaddr[1].read().bits() & 0x0000ffff) | 0x0000c000);
+        let addr = high << 32 | u64::from(ficr.deviceaddr[0].read().bits());
         BdAddr::new(unwrap!(addr.to_le_bytes()[..6].try_into()))
     }
 }
@@ -117,7 +117,7 @@ async fn main(spawner: Spawner) {
     let sdc = unwrap!(build_sdc(sdc_p, &rng, mpsl, &mut sdc_mem));
 
     info!("Our address = {:02x}", bd_addr());
-    unwrap!(ZephyrWriteBdAddr::new(bd_addr()).exec(&sdc).await);
+    unwrap!(LeSetRandomAddr::new(bd_addr()).exec(&sdc).await);
     Timer::after(Duration::from_millis(200)).await;
 
     static HOST_RESOURCES: StaticCell<HostResources<NoopRawMutex, L2CAP_CHANNELS_MAX, PACKET_POOL_SIZE, L2CAP_MTU>> =
@@ -126,7 +126,10 @@ async fn main(spawner: Spawner) {
 
     let adapter: Adapter<'_, NoopRawMutex, _, CONNECTIONS_MAX, L2CAP_CHANNELS_MAX> = Adapter::new(sdc, host_resources);
 
-    let config = ScanConfig { params: None };
+    let config = ScanConfig {
+        params: None,
+        filter_accept_list: &[],
+    };
 
     // NOTE: Modify this to match the address of the peripheral you want to connect to
     let target: BdAddr = BdAddr::new([0xf5, 0x9f, 0x1a, 0x05, 0xe4, 0xee]);

examples/nrf-sdc/src/bin/ble_l2cap_peripheral.rs

@@ -2,6 +2,7 @@
 #![no_main]
 #![feature(impl_trait_in_assoc_type)]
 
+use bt_hci::cmd::le::LeSetRandomAddr;
 use bt_hci::cmd::SyncCmd;
 use bt_hci::param::BdAddr;
 use defmt::{info, unwrap};
@@ -12,7 +13,6 @@ use embassy_sync::blocking_mutex::raw::NoopRawMutex;
 use embassy_time::{Duration, Timer};
 use nrf_sdc::{self as sdc, mpsl, mpsl::MultiprotocolServiceLayer};
 use sdc::rng_pool::RngPool;
-use sdc::vendor::ZephyrWriteBdAddr;
 use static_cell::StaticCell;
 use trouble_host::{
     adapter::{Adapter, HostResources},
@@ -40,8 +40,8 @@ async fn mpsl_task(mpsl: &'static MultiprotocolServiceLayer<'static>) -> ! {
 fn bd_addr() -> BdAddr {
     unsafe {
         let ficr = &*pac::FICR::ptr();
-        let high = u64::from((ficr.deviceid[1].read().bits() & 0x0000ffff) | 0x0000c000);
-        let addr = high << 32 | u64::from(ficr.deviceid[0].read().bits());
+        let high = u64::from((ficr.deviceaddr[1].read().bits() & 0x0000ffff) | 0x0000c000);
+        let addr = high << 32 | u64::from(ficr.deviceaddr[0].read().bits());
         BdAddr::new(unwrap!(addr.to_le_bytes()[..6].try_into()))
     }
 }
@@ -116,7 +116,7 @@ async fn main(spawner: Spawner) {
     let sdc = unwrap!(build_sdc(sdc_p, &rng, mpsl, &mut sdc_mem));
 
     info!("Our address = {:02x}", bd_addr());
-    unwrap!(ZephyrWriteBdAddr::new(bd_addr()).exec(&sdc).await);
+    unwrap!(LeSetRandomAddr::new(bd_addr()).exec(&sdc).await);
     Timer::after(Duration::from_millis(200)).await;
 
     static HOST_RESOURCES: StaticCell<HostResources<NoopRawMutex, L2CAP_CHANNELS_MAX, PACKET_POOL_SIZE, L2CAP_MTU>> =
@@ -127,10 +127,8 @@ async fn main(spawner: Spawner) {
 
     let config = AdvertiseConfig {
         params: None,
-        data: &[
-            AdStructure::Flags(LE_GENERAL_DISCOVERABLE | BR_EDR_NOT_SUPPORTED),
-            AdStructure::CompleteLocalName("Trouble"),
-        ],
+        adv_data: &[AdStructure::Flags(LE_GENERAL_DISCOVERABLE | BR_EDR_NOT_SUPPORTED)],
+        scan_data: &[AdStructure::CompleteLocalName(b"Trouble")],
     };
 
     let _ = join(adapter.run(), async {