Skip to content

Commit

Permalink
feat(nrf-embassy): re-export the peripherals module
Browse files Browse the repository at this point in the history
This allows applications to not directly depend on the architecture
Embassy crates to get access to peripherals.
  • Loading branch information
ROMemories committed Feb 8, 2024
1 parent 68edf32 commit d76bd04
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
4 changes: 2 additions & 2 deletions examples/embassy-http-server/src/pins.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use riot_rs::define_peripherals;

#[cfg(all(feature = "button-readings", builder = "nrf52840dk"))]
use embassy_nrf::peripherals;
#[cfg(feature = "button-readings")]
use riot_rs::embassy::arch::peripherals;

#[cfg(all(feature = "button-readings", builder = "nrf52840dk"))]
define_peripherals!(Buttons {
Expand Down
11 changes: 7 additions & 4 deletions src/riot-rs-embassy/src/arch/nrf52.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
pub(crate) use embassy_executor::InterruptExecutor as Executor;
pub use embassy_nrf::interrupt;
pub use embassy_nrf::interrupt::SWI0_EGU0 as SWI;
pub use embassy_nrf::{init, OptionalPeripherals};
pub use embassy_nrf::{interrupt, peripherals};

#[cfg(feature = "usb")]
use embassy_nrf::{bind_interrupts, peripherals, rng, usb as nrf_usb};
use embassy_nrf::{bind_interrupts, rng, usb as nrf_usb};

#[cfg(feature = "usb")]
bind_interrupts!(struct Irqs {
Expand All @@ -20,8 +20,11 @@ unsafe fn SWI0_EGU0() {

#[cfg(feature = "usb")]
pub mod usb {
use embassy_nrf::peripherals;
use embassy_nrf::usb::{vbus_detect::HardwareVbusDetect, Driver};
use embassy_nrf::{
peripherals,
usb::{vbus_detect::HardwareVbusDetect, Driver},
};

pub type UsbDriver = Driver<'static, peripherals::USBD, HardwareVbusDetect>;
pub fn driver(usbd: peripherals::USBD) -> UsbDriver {
use super::Irqs;
Expand Down

0 comments on commit d76bd04

Please sign in to comment.