update trouble deps

Author: jamessizeland

Cargo.toml

@@ -18,7 +18,7 @@ embassy-nrf = { version = "0.3", default-features = false, features = [
     "time-driver-rtc1",
 ] }
 embassy-time = { version = "0.4", default-features = false }
-embassy-sync = { version = "0.6" }
+embassy-sync = { version = "0.6.2" }
 cortex-m = { version = "0.7.6" }
 embedded-hal = "1.0"
 lsm303agr = "1.1.0"

examples/trouble/Cargo.toml

@@ -14,13 +14,13 @@ embassy-executor = { version = "0.7", default-features = false, features = [
     ] }
 embassy-time = { version = "0.4", default-features = false, features = ["defmt", "defmt-timestamp-uptime"] }
 embassy-futures = "0.1.1"
-embassy-sync = { version = "0.6", features = ["defmt"] }
+embassy-sync = { version = "0.6.2", features = ["defmt"] }
 microbit-bsp = { path = "../../", features = ["trouble"]}
 
 futures = { version = "0.3", default-features = false, features = ["async-await"]}
 trouble-host = { git = "https://github.com/embassy-rs/trouble.git", features = [
     "defmt",
-], rev = "770b1e801c0a06ba51a4eb9b9f5a393726f32f33"}
+], rev = "a1daee269deee25fbb6236cb599a8fb5919c02b7"}
 
 defmt = "0.3.10"
 defmt-rtt = "0.4.0"

examples/trouble/src/main.rs

@@ -19,8 +19,6 @@ const CONNECTIONS_MAX: usize = 1;
 /// Max number of L2CAP channels.
 const L2CAP_CHANNELS_MAX: usize = 2; // Signal + att
 
-type Resources<C> = HostResources<C, CONNECTIONS_MAX, L2CAP_CHANNELS_MAX, L2CAP_MTU>;
-
 // GATT Server definition
 #[gatt_server]
 struct Server {
@@ -64,10 +62,11 @@ where
     let address = Address::random([0x42, 0x6A, 0xE3, 0x1E, 0x83, 0xE7]);
     info!("Our address = {:?}", address);
 
-    let mut resources = Resources::new(PacketQos::None);
-    let (stack, mut peripheral, _, runner) = trouble_host::new(controller, &mut resources)
-        .set_random_address(address)
-        .build();
+    let mut resources: HostResources<CONNECTIONS_MAX, L2CAP_CHANNELS_MAX, L2CAP_MTU> = HostResources::new();
+    let stack = trouble_host::new(controller, &mut resources).set_random_address(address);
+    let Host {
+        mut peripheral, runner, ..
+    } = stack.build();
 
     info!("Starting advertising and GATT service");
     let server = Server::new_with_config(GapConfig::Peripheral(PeripheralConfig {
@@ -82,7 +81,7 @@ where
                 Ok(conn) => {
                     // set up tasks when the connection is established to a central, so they don't run when no one is connected.
                     let a = gatt_events_task(&server, &conn);
-                    let b = custom_task(&server, &conn, stack);
+                    let b = custom_task(&server, &conn, &stack);
                     // run until any task ends (usually because the connection has been closed),
                     // then return to advertising state.
                     select(a, b).await;
@@ -180,7 +179,7 @@ async fn advertise<'a, C: Controller>(
 /// This task will notify the connected central of a counter value every 2 seconds.
 /// It will also read the RSSI value every 2 seconds.
 /// and will stop when the connection is closed by the central or an error occurs.
-async fn custom_task<C: Controller>(server: &Server<'_>, conn: &Connection<'_>, stack: Stack<'_, C>) {
+async fn custom_task<C: Controller>(server: &Server<'_>, conn: &Connection<'_>, stack: &Stack<'_, C>) {
     let mut tick: u8 = 0;
     let level = server.battery_service.level;
     loop {