From b72fdc20f9048d43538704e5b162b9d0b2d6c41c Mon Sep 17 00:00:00 2001 From: Ulf Lilleengen Date: Thu, 21 Mar 2024 00:35:15 +0100 Subject: [PATCH] Update to fixed nrf-sdc --- examples/nrf-sdc/Cargo.toml | 4 ++-- examples/nrf-sdc/src/bin/ble_bas_peripheral.rs | 2 +- examples/nrf-sdc/src/bin/ble_l2cap_central.rs | 2 +- examples/nrf-sdc/src/bin/ble_l2cap_peripheral.rs | 2 +- rust-toolchain.toml | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/examples/nrf-sdc/Cargo.toml b/examples/nrf-sdc/Cargo.toml index f7fd0e7..b2fb29d 100644 --- a/examples/nrf-sdc/Cargo.toml +++ b/examples/nrf-sdc/Cargo.toml @@ -37,8 +37,8 @@ embassy-futures = { git = "https://github.com/embassy-rs/embassy.git", branch = embassy-time = { git = "https://github.com/embassy-rs/embassy.git", branch = "main" } embassy-time-driver = { git = "https://github.com/embassy-rs/embassy.git", branch = "main" } embassy-embedded-hal = { git = "https://github.com/embassy-rs/embassy.git", branch = "main" } -nrf-sdc = { git = "https://github.com/alexmoon/nrf-sdc.git", branch = "main" } -nrf-mpsl = { git = "https://github.com/alexmoon/nrf-sdc.git", branch = "main" } +nrf-sdc = { git = "https://github.com/alexmoon/nrf-sdc.git", branch = "update-api" } +nrf-mpsl = { git = "https://github.com/alexmoon/nrf-sdc.git", branch = "update-api" } bt-hci = { git = "https://github.com/alexmoon/bt-hci.git", branch = "serial-controller" } #embassy-executor = {path = "../../../embassy/embassy-executor"} diff --git a/examples/nrf-sdc/src/bin/ble_bas_peripheral.rs b/examples/nrf-sdc/src/bin/ble_bas_peripheral.rs index f409971..ded0a3b 100644 --- a/examples/nrf-sdc/src/bin/ble_bas_peripheral.rs +++ b/examples/nrf-sdc/src/bin/ble_bas_peripheral.rs @@ -1,6 +1,6 @@ #![no_std] #![no_main] -#![feature(type_alias_impl_trait)] +#![feature(impl_trait_in_assoc_type)] use bt_hci::cmd::SyncCmd; use bt_hci::param::BdAddr; diff --git a/examples/nrf-sdc/src/bin/ble_l2cap_central.rs b/examples/nrf-sdc/src/bin/ble_l2cap_central.rs index 49a2ae0..6c1e2fd 100644 --- a/examples/nrf-sdc/src/bin/ble_l2cap_central.rs +++ b/examples/nrf-sdc/src/bin/ble_l2cap_central.rs @@ -1,6 +1,6 @@ #![no_std] #![no_main] -#![feature(type_alias_impl_trait)] +#![feature(impl_trait_in_assoc_type)] use bt_hci::cmd::SyncCmd; use bt_hci::param::BdAddr; diff --git a/examples/nrf-sdc/src/bin/ble_l2cap_peripheral.rs b/examples/nrf-sdc/src/bin/ble_l2cap_peripheral.rs index c6a541a..0128070 100644 --- a/examples/nrf-sdc/src/bin/ble_l2cap_peripheral.rs +++ b/examples/nrf-sdc/src/bin/ble_l2cap_peripheral.rs @@ -1,6 +1,6 @@ #![no_std] #![no_main] -#![feature(type_alias_impl_trait)] +#![feature(impl_trait_in_assoc_type)] use bt_hci::cmd::SyncCmd; use bt_hci::param::BdAddr; diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 681e009..4401c0e 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -5,5 +5,6 @@ channel = "nightly-2024-03-20" components = [ "rust-src", "rustfmt", "llvm-tools-preview" ] targets = [ "thumbv7em-none-eabi", + "thumbv7em-none-eabihf", "thumbv6m-none-eabi", ]