Skip to content

Commit ed3e223

Browse files
lulflulf
authored
chore: update embassy and nrf-sdc versions (#506)
1 parent b7ae46b commit ed3e223

File tree

12 files changed

+97
-109
lines changed

12 files changed

+97
-109
lines changed

‎benchmarks/nrf-sdc/Cargo.lock‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎benchmarks/nrf-sdc/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ resolver = "2"
77
[dependencies]
88
embassy-executor = { version = "0.9", default-features = false, features = ["arch-cortex-m", "executor-thread", "defmt", "executor-interrupt"] }
99
embassy-time = { version = "0.5", default-features = false, features = ["defmt", "defmt-timestamp-uptime"] }
10-
embassy-nrf = { version = "0.7", default-features = false, features = ["defmt", "time-driver-rtc1", "gpiote", "unstable-pac", "rt"] }
10+
embassy-nrf = { version = "0.8", default-features = false, features = ["defmt", "time-driver-rtc1", "gpiote", "unstable-pac", "rt"] }
1111
embassy-futures = "0.1.1"
1212
embassy-sync = { version = "0.7", features = ["defmt"] }
1313
trouble-host = { path = "../../host", default-features = false, features = ["defmt", "l2cap-rx-queue-size-4", "l2cap-tx-queue-size-4", "central", "peripheral", "scan", "gatt", "default-packet-pool", "default-packet-pool-mtu-251"] }
@@ -40,8 +40,8 @@ debug = 2
4040
#nrf-sdc = { path = "../../../nrf-sdc/nrf-sdc" }
4141
#nrf-mpsl = { path = "../../../nrf-sdc/nrf-mpsl" }
4242
#bt-hci = { path = "../../../bt-hci" }
43-
nrf-sdc = { git = "https://github.com/alexmoon/nrf-sdc.git", rev = "1bc7380cd5d7a031f37511b69da13fc6caded816"}
44-
nrf-mpsl = { git = "https://github.com/alexmoon/nrf-sdc.git", rev = "1bc7380cd5d7a031f37511b69da13fc6caded816"}
43+
nrf-sdc = { git = "https://github.com/alexmoon/nrf-sdc.git", rev = "11d5c3c"}
44+
nrf-mpsl = { git = "https://github.com/alexmoon/nrf-sdc.git", rev = "11d5c3c"}
4545

4646
[features]
4747
nrf52832 = [

‎benchmarks/nrf-sdc/src/bin/l2cap_benchmark_central.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const L2CAP_CHANNELS_MAX: usize = 1;
3737

3838
fn build_sdc<'d, const N: usize>(
3939
p: nrf_sdc::Peripherals<'d>,
40-
rng: &'d mut rng::Rng<RNG, Async>,
40+
rng: &'d mut rng::Rng<Async>,
4141
mpsl: &'d MultiprotocolServiceLayer,
4242
mem: &'d mut sdc::Mem<N>,
4343
) -> Result<nrf_sdc::SoftdeviceController<'d>, nrf_sdc::Error> {

‎benchmarks/nrf-sdc/src/bin/l2cap_benchmark_peripheral.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const L2CAP_CHANNELS_MAX: usize = 1;
3636

3737
fn build_sdc<'d, const N: usize>(
3838
p: nrf_sdc::Peripherals<'d>,
39-
rng: &'d mut rng::Rng<RNG, Async>,
39+
rng: &'d mut rng::Rng<Async>,
4040
mpsl: &'d MultiprotocolServiceLayer,
4141
mem: &'d mut sdc::Mem<N>,
4242
) -> Result<nrf_sdc::SoftdeviceController<'d>, nrf_sdc::Error> {

‎examples/nrf54/Cargo.lock‎

Lines changed: 19 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/nrf54/Cargo.toml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ debug = 2
4343
#embassy-embedded-hal = {path = "../../../embassy/embassy-embedded-hal"}
4444
#embassy-hal-internal = {path = "../../../embassy/embassy-hal-internal"}
4545

46-
embassy-executor = {git = "https://github.com/embassy-rs/embassy.git", rev="dda429ce6642deaa490f8737e1373e2e2ba79655"}
47-
embassy-nrf = {git = "https://github.com/embassy-rs/embassy.git", rev="dda429ce6642deaa490f8737e1373e2e2ba79655"}
48-
embassy-sync = {git = "https://github.com/embassy-rs/embassy.git", rev="dda429ce6642deaa490f8737e1373e2e2ba79655"}
49-
embassy-futures = {git = "https://github.com/embassy-rs/embassy.git", rev="dda429ce6642deaa490f8737e1373e2e2ba79655"}
50-
embassy-time = {git = "https://github.com/embassy-rs/embassy.git", rev="dda429ce6642deaa490f8737e1373e2e2ba79655"}
51-
embassy-time-driver = {git = "https://github.com/embassy-rs/embassy.git", rev="dda429ce6642deaa490f8737e1373e2e2ba79655"}
52-
embassy-embedded-hal = {git = "https://github.com/embassy-rs/embassy.git", rev="dda429ce6642deaa490f8737e1373e2e2ba79655"}
53-
nrf-sdc = { git = "https://github.com/alexmoon/nrf-sdc.git", rev = "1bcd64523471ddd5eea38f5c7227aef3b59c623a"}
54-
nrf-mpsl = { git = "https://github.com/alexmoon/nrf-sdc.git", rev = "1bcd64523471ddd5eea38f5c7227aef3b59c623a"}
46+
embassy-executor = {git = "https://github.com/embassy-rs/embassy.git", rev="7ff2baf4e29c47c622e21c4eeba2d20596b65137"}
47+
embassy-nrf = {git = "https://github.com/embassy-rs/embassy.git", rev="7ff2baf4e29c47c622e21c4eeba2d20596b65137"}
48+
embassy-sync = {git = "https://github.com/embassy-rs/embassy.git", rev="7ff2baf4e29c47c622e21c4eeba2d20596b65137"}
49+
embassy-futures = {git = "https://github.com/embassy-rs/embassy.git", rev="7ff2baf4e29c47c622e21c4eeba2d20596b65137"}
50+
embassy-time = {git = "https://github.com/embassy-rs/embassy.git", rev="7ff2baf4e29c47c622e21c4eeba2d20596b65137"}
51+
embassy-time-driver = {git = "https://github.com/embassy-rs/embassy.git", rev="7ff2baf4e29c47c622e21c4eeba2d20596b65137"}
52+
embassy-embedded-hal = {git = "https://github.com/embassy-rs/embassy.git", rev="7ff2baf4e29c47c622e21c4eeba2d20596b65137"}
53+
nrf-sdc = { git = "https://github.com/alexmoon/nrf-sdc.git", rev = "e559dc97c7feee707cb8b6084affb5c55aa043e3"}
54+
nrf-mpsl = { git = "https://github.com/alexmoon/nrf-sdc.git", rev = "e559dc97c7feee707cb8b6084affb5c55aa043e3"}
5555
#bt-hci = { git = "https://github.com/embassy-rs/bt-hci.git", rev = "83a9e179ff019ed60abb73705f54383f89fc60fc" }
5656
#nrf-sdc = { path = "../../../nrf-sdc/nrf-sdc" }
5757
#nrf-mpsl = { path = "../../../nrf-sdc/nrf-mpsl" }

‎examples/nrf54/src/bin/ble_bas_peripheral.rs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,11 @@ async fn main(spawner: Spawner) {
5757
config.lfclk_source = config::LfclkSource::ExternalXtal;
5858
let p = embassy_nrf::init(config);
5959
let mpsl_p = mpsl::Peripherals::new(
60-
p.GRTC,
60+
p.GRTC_CH7,
61+
p.GRTC_CH8,
62+
p.GRTC_CH9,
63+
p.GRTC_CH10,
64+
p.GRTC_CH11,
6165
p.TIMER10,
6266
p.TIMER20,
6367
p.TEMP,

‎examples/nrf54/src/bin/ble_l2cap_peripheral.rs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,11 @@ async fn main(spawner: Spawner) {
5858
config.lfclk_source = config::LfclkSource::ExternalXtal;
5959
let p = embassy_nrf::init(config);
6060
let mpsl_p = mpsl::Peripherals::new(
61-
p.GRTC,
61+
p.GRTC_CH7,
62+
p.GRTC_CH8,
63+
p.GRTC_CH9,
64+
p.GRTC_CH10,
65+
p.GRTC_CH11,
6266
p.TIMER10,
6367
p.TIMER20,
6468
p.TEMP,

0 commit comments

Comments
 (0)