Update to embassy-nrf 0.8

Author: ivmarkov

examples/nrf/Cargo.lock

@@ -38,7 +38,7 @@ embassy-sync = { version = "0.7", features = ["defmt"] }
 embassy-futures = "0.1"
 embassy-time = { version = "0.5", features = ["defmt"] }
 embassy-net = { version = "0.7", features = ["defmt", "proto-ipv6", "medium-ip", "udp"] }
-embassy-nrf = { version = "0.7", features = ["defmt", "nrf52840", "time-driver-rtc1", "gpiote", "unstable-pac", "time"] }
+embassy-nrf = { version = "0.8", features = ["defmt", "nrf52840", "time-driver-rtc1", "gpiote", "unstable-pac", "time"] }
 defmt = "0.3"
 heapless = "0.8"
 critical-section = "1.1"

examples/nrf/Cargo.toml

@@ -22,7 +22,6 @@ use embassy_net::{Config, ConfigV6, Ipv6Cidr, Runner, StackResources, StaticConf
 use embassy_nrf::interrupt;
 use embassy_nrf::interrupt::{InterruptExt, Priority};
 use embassy_nrf::mode::Blocking;
-use embassy_nrf::peripherals::{RADIO, RNG};
 use embassy_nrf::rng::Rng;
 use embassy_nrf::{bind_interrupts, peripherals, radio};
 
@@ -89,7 +88,7 @@ async fn main(spawner: Spawner) {
 
     info!("Starting...");
 
-    let rng = mk_static!(Rng<'static, RNG, Blocking>, Rng::new_blocking(p.RNG));
+    let rng = mk_static!(Rng<'static, Blocking>, Rng::new_blocking(p.RNG));
 
     let enet_seed = rng.next_u64();
 
@@ -223,7 +222,7 @@ async fn run_enet_driver(
 }
 
 #[embassy_executor::task]
-async fn run_radio(mut runner: PhyRadioRunner<'static>, radio: NrfRadio<'static, RADIO>) -> ! {
+async fn run_radio(mut runner: PhyRadioRunner<'static>, radio: NrfRadio<'static>) -> ! {
     runner
         .run(
             radio,

examples/nrf/src/bin/basic_enet.rs

@@ -18,7 +18,6 @@ use embassy_executor::Spawner;
 use embassy_nrf::interrupt;
 use embassy_nrf::interrupt::{InterruptExt, Priority};
 use embassy_nrf::mode::Blocking;
-use embassy_nrf::peripherals::{RADIO, RNG};
 use embassy_nrf::rng::Rng;
 use embassy_nrf::{bind_interrupts, peripherals, radio};
 
@@ -82,7 +81,7 @@ async fn main(spawner: Spawner) {
 
     info!("Starting...");
 
-    let rng = mk_static!(Rng<'static, RNG, Blocking>, Rng::new_blocking(p.RNG));
+    let rng = mk_static!(Rng<'static, Blocking>, Rng::new_blocking(p.RNG));
 
     let mut ieee_eui64 = [0; 8];
     RngCore::fill_bytes(rng, &mut ieee_eui64);
@@ -155,7 +154,7 @@ async fn run_ot(ot: OpenThread<'static>, radio: ProxyRadio<'static>) -> ! {
 }
 
 #[embassy_executor::task]
-async fn run_radio(mut runner: PhyRadioRunner<'static>, radio: NrfRadio<'static, RADIO>) -> ! {
+async fn run_radio(mut runner: PhyRadioRunner<'static>, radio: NrfRadio<'static>) -> ! {
     runner
         .run(
             radio,

examples/nrf/src/bin/basic_udp.rs

@@ -22,7 +22,6 @@ use embassy_executor::Spawner;
 use embassy_nrf::interrupt;
 use embassy_nrf::interrupt::{InterruptExt, Priority};
 use embassy_nrf::mode::Blocking;
-use embassy_nrf::peripherals::{RADIO, RNG};
 use embassy_nrf::rng::Rng;
 use embassy_nrf::{bind_interrupts, peripherals, radio};
 
@@ -89,7 +88,7 @@ async fn main(spawner: Spawner) {
 
     info!("Starting...");
 
-    let rng = mk_static!(Rng<'static, RNG, Blocking>, Rng::new_blocking(p.RNG));
+    let rng = mk_static!(Rng<'static, Blocking>, Rng::new_blocking(p.RNG));
 
     let mut ieee_eui64 = [0; 8];
     RngCore::fill_bytes(rng, &mut ieee_eui64);
@@ -208,7 +207,7 @@ async fn run_ot(ot: OpenThread<'static>, radio: ProxyRadio<'static>) -> ! {
 }
 
 #[embassy_executor::task]
-async fn run_radio(mut runner: PhyRadioRunner<'static>, radio: NrfRadio<'static, RADIO>) -> ! {
+async fn run_radio(mut runner: PhyRadioRunner<'static>, radio: NrfRadio<'static>) -> ! {
     runner
         .run(
             radio,

examples/nrf/src/bin/srp.rs

@@ -41,5 +41,5 @@ bitflags = "2.5"
 embassy-net-driver-channel = { version = "0.3", optional = true }
 edge-nal = { version = "0.5", optional = true }
 esp-radio = { version = "0.15", features = ["unstable", "ieee802154"], optional = true }
-embassy-nrf = { version = "0.7", optional = true }
+embassy-nrf = { version = "0.8", optional = true }
 portable-atomic = "1"

openthread/Cargo.lock

@@ -18,22 +18,16 @@ impl RadioError for Error {
 }
 
 /// The `embassy-nrf` ESP IEEE 802.15.4 radio.
-pub struct NrfRadio<'a, T>
-where
-    T: Ieee802154Peripheral,
-{
-    driver: Ieee802154<'a, T>,
+pub struct NrfRadio<'a> {
+    driver: Ieee802154<'a>,
     config: Config,
 }
 
-impl<'a, T> NrfRadio<'a, T>
-where
-    T: Ieee802154Peripheral,
-{
+impl<'a> NrfRadio<'a> {
     const DEFAULT_CONFIG: Config = Config::new();
 
     /// Create a new `EspRadio` instance.
-    pub fn new(radio: Ieee802154<'a, T>) -> Self {
+    pub fn new(radio: Ieee802154<'a>) -> Self {
         let mut this = Self {
             driver: radio,
             config: Self::DEFAULT_CONFIG,
@@ -58,10 +52,7 @@ where
     }
 }
 
-impl<T> Radio for NrfRadio<'_, T>
-where
-    T: Ieee802154Peripheral,
-{
+impl Radio for NrfRadio<'_> {
     type Error = Error;
 
     fn caps(&mut self) -> Capabilities {