diff options
| author | Dario Nieuwenhuis <[email protected]> | 2022-06-11 05:08:57 +0200 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2022-06-12 21:45:38 +0200 |
| commit | 5085100df2845745f13715669c18a785a374a879 (patch) | |
| tree | d24d264b23753d628e58fa3b92da77a78e28ce35 /examples/nrf/src/bin | |
| parent | db344c2bda55bd0352a43720788185cc4d3a420e (diff) | |
Add embassy-cortex-m crate.
- 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`.
Diffstat (limited to 'examples/nrf/src/bin')
| -rw-r--r-- | examples/nrf/src/bin/multiprio.rs | 4 | ||||
| -rw-r--r-- | examples/nrf/src/bin/usb_hid_keyboard.rs | 2 |
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 | ||
| 60 | use cortex_m_rt::entry; | 60 | use cortex_m_rt::entry; |
| 61 | use defmt::{info, unwrap}; | 61 | use defmt::{info, unwrap}; |
| 62 | use embassy::executor::{Executor, InterruptExecutor}; | ||
| 63 | use embassy::interrupt::InterruptExt; | ||
| 64 | use embassy::time::{Duration, Instant, Timer}; | 62 | use embassy::time::{Duration, Instant, Timer}; |
| 65 | use embassy::util::Forever; | 63 | use embassy::util::Forever; |
| 64 | use embassy_nrf::executor::{Executor, InterruptExecutor}; | ||
| 66 | use embassy_nrf::interrupt; | 65 | use embassy_nrf::interrupt; |
| 66 | use embassy_nrf::interrupt::InterruptExt; | ||
| 67 | 67 | ||
| 68 | use defmt_rtt as _; // global logger | 68 | use defmt_rtt as _; // global logger |
| 69 | use panic_probe as _; | 69 | use panic_probe as _; |
diff --git a/examples/nrf/src/bin/usb_hid_keyboard.rs b/examples/nrf/src/bin/usb_hid_keyboard.rs index d855a3a57..8aa08fe3d 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}; | |||
| 8 | use defmt::*; | 8 | use defmt::*; |
| 9 | use embassy::channel::Signal; | 9 | use embassy::channel::Signal; |
| 10 | use embassy::executor::Spawner; | 10 | use embassy::executor::Spawner; |
| 11 | use embassy::interrupt::InterruptExt; | ||
| 12 | use embassy::time::Duration; | 11 | use embassy::time::Duration; |
| 13 | use embassy::util::{select, select3, Either, Either3}; | 12 | use embassy::util::{select, select3, Either, Either3}; |
| 14 | use embassy_nrf::gpio::{Input, Pin, Pull}; | 13 | use embassy_nrf::gpio::{Input, Pin, Pull}; |
| 15 | use embassy_nrf::interrupt; | 14 | use embassy_nrf::interrupt; |
| 15 | use embassy_nrf::interrupt::InterruptExt; | ||
| 16 | use embassy_nrf::pac; | 16 | use embassy_nrf::pac; |
| 17 | use embassy_nrf::usb::Driver; | 17 | use embassy_nrf::usb::Driver; |
| 18 | use embassy_nrf::Peripherals; | 18 | use embassy_nrf::Peripherals; |
