From cd9ecaef57982b33376dcfea3a0406a3df4b09c5 Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Mon, 19 Oct 2020 21:15:24 +0200 Subject: integrate static-executor, cleanup time module. --- examples/Cargo.toml | 4 ++-- examples/src/bin/gpiote.rs | 2 +- examples/src/bin/qspi.rs | 2 +- examples/src/bin/uart.rs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'examples') diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 7b49ffb1f..7c44b07a4 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -26,5 +26,5 @@ panic-probe = "0.1.0" nrf52840-hal = { version = "0.11.0" } embassy = { version = "0.1.0", path = "../embassy" } embassy-nrf = { version = "0.1.0", path = "../embassy-nrf", features = ["defmt-trace", "52840"] } -static-executor = { version = "0.1.0", features=["defmt"]} -futures = { version = "0.3.5", default-features = false } \ No newline at end of file +futures = { version = "0.3.5", default-features = false } +cortex-m-rtic = { git = "https://github.com/rtic-rs/cortex-m-rtic", branch = "master"} \ No newline at end of file diff --git a/examples/src/bin/gpiote.rs b/examples/src/bin/gpiote.rs index 5578062fa..5a6ae9333 100644 --- a/examples/src/bin/gpiote.rs +++ b/examples/src/bin/gpiote.rs @@ -13,7 +13,7 @@ use embassy_nrf::gpiote; use futures::pin_mut; use nrf52840_hal::gpio; -use static_executor::{task, Executor}; +use embassy::executor::{task, Executor}; static EXECUTOR: Executor = Executor::new(|| cortex_m::asm::sev()); #[task] diff --git a/examples/src/bin/qspi.rs b/examples/src/bin/qspi.rs index 4e6ee53ea..c60a666ec 100644 --- a/examples/src/bin/qspi.rs +++ b/examples/src/bin/qspi.rs @@ -11,7 +11,7 @@ use embassy::flash::Flash; use embassy_nrf::qspi; use nrf52840_hal::gpio; -use static_executor::{task, Executor}; +use embassy::executor::{task, Executor}; static EXECUTOR: Executor = Executor::new(|| cortex_m::asm::sev()); const PAGE_SIZE: usize = 4096; diff --git a/examples/src/bin/uart.rs b/examples/src/bin/uart.rs index 6b9df380a..0eec2cd8d 100644 --- a/examples/src/bin/uart.rs +++ b/examples/src/bin/uart.rs @@ -12,7 +12,7 @@ use embassy_nrf::uarte; use futures::pin_mut; use nrf52840_hal::gpio; -use static_executor::{task, Executor}; +use embassy::executor::{task, Executor}; static EXECUTOR: Executor = Executor::new(|| cortex_m::asm::sev()); #[task] -- cgit