aboutsummaryrefslogtreecommitdiff
path: root/examples/nrf/src
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2022-06-12 19:49:15 +0000
committerGitHub <[email protected]>2022-06-12 19:49:15 +0000
commitfff0a03fe0f9e84209dd40fd8f93790871d03d75 (patch)
treef0d0d0adf0731fb7326f34f8adaec3676bbe22c7 /examples/nrf/src
parent6b3499a5c831e6deb1c8550efdfe7601fa4c6e56 (diff)
parent5085100df2845745f13715669c18a785a374a879 (diff)
Merge #806
806: Add embassy-cortex-m crate. r=Dirbaio a=Dirbaio - Move Interrupt and InterruptExecutor from `embassy` to `embassy-cortex-m`. - Move Unborrow from `embassy` to `embassy-hal-common` (nothing in `embassy` requires it anymore) - Move PeripheralMutex from `embassy-hal-common` to `embassy-cortex-m`. Co-authored-by: Dario Nieuwenhuis <[email protected]>
Diffstat (limited to 'examples/nrf/src')
-rw-r--r--examples/nrf/src/bin/multiprio.rs4
-rw-r--r--examples/nrf/src/bin/usb_hid_keyboard.rs2
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/nrf/src/bin/multiprio.rs b/examples/nrf/src/bin/multiprio.rs
index 54f6606a9..abda18aa5 100644
--- a/examples/nrf/src/bin/multiprio.rs
+++ b/examples/nrf/src/bin/multiprio.rs
@@ -59,11 +59,11 @@
59 59
60use cortex_m_rt::entry; 60use cortex_m_rt::entry;
61use defmt::{info, unwrap}; 61use defmt::{info, unwrap};
62use embassy::executor::{Executor, InterruptExecutor};
63use embassy::interrupt::InterruptExt;
64use embassy::time::{Duration, Instant, Timer}; 62use embassy::time::{Duration, Instant, Timer};
65use embassy::util::Forever; 63use embassy::util::Forever;
64use embassy_nrf::executor::{Executor, InterruptExecutor};
66use embassy_nrf::interrupt; 65use embassy_nrf::interrupt;
66use embassy_nrf::interrupt::InterruptExt;
67 67
68use defmt_rtt as _; // global logger 68use defmt_rtt as _; // global logger
69use panic_probe as _; 69use panic_probe as _;
diff --git a/examples/nrf/src/bin/usb_hid_keyboard.rs b/examples/nrf/src/bin/usb_hid_keyboard.rs
index d7affae11..98e7dd696 100644
--- a/examples/nrf/src/bin/usb_hid_keyboard.rs
+++ b/examples/nrf/src/bin/usb_hid_keyboard.rs
@@ -8,11 +8,11 @@ use core::sync::atomic::{AtomicBool, Ordering};
8use defmt::*; 8use defmt::*;
9use embassy::channel::signal::Signal; 9use embassy::channel::signal::Signal;
10use embassy::executor::Spawner; 10use embassy::executor::Spawner;
11use embassy::interrupt::InterruptExt;
12use embassy::time::Duration; 11use embassy::time::Duration;
13use embassy::util::{select, select3, Either, Either3}; 12use embassy::util::{select, select3, Either, Either3};
14use embassy_nrf::gpio::{Input, Pin, Pull}; 13use embassy_nrf::gpio::{Input, Pin, Pull};
15use embassy_nrf::interrupt; 14use embassy_nrf::interrupt;
15use embassy_nrf::interrupt::InterruptExt;
16use embassy_nrf::pac; 16use embassy_nrf::pac;
17use embassy_nrf::usb::Driver; 17use embassy_nrf::usb::Driver;
18use embassy_nrf::Peripherals; 18use embassy_nrf::Peripherals;