Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(nrf-embassy): re-export the peripherals module #68

Merged
merged 1 commit into from
Feb 13, 2024
Merged

feat(nrf-embassy): re-export the peripherals module #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/embassy-http-server/src/pins.rs
View file
Open in desktop
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
10 changes: 6 additions & 4 deletions src/riot-rs-embassy/src/arch/nrf52.rs
View file
Open in desktop
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,10 @@ 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},
};

use crate::arch;

Expand Down
Loading