aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2020-10-19 21:15:24 +0200
committerDario Nieuwenhuis <[email protected]>2020-10-19 21:25:54 +0200
commitcd9ecaef57982b33376dcfea3a0406a3df4b09c5 (patch)
tree41567981cfe2ba9a65e84a6025daf83cb2204fa5 /examples
parent0e1adc58f48a65c6af1d2ededa8712426fb3ab6e (diff)
integrate static-executor, cleanup time module.
Diffstat (limited to 'examples')
-rw-r--r--examples/Cargo.toml4
-rw-r--r--examples/src/bin/gpiote.rs2
-rw-r--r--examples/src/bin/qspi.rs2
-rw-r--r--examples/src/bin/uart.rs2
4 files changed, 5 insertions, 5 deletions
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"
26nrf52840-hal = { version = "0.11.0" } 26nrf52840-hal = { version = "0.11.0" }
27embassy = { version = "0.1.0", path = "../embassy" } 27embassy = { version = "0.1.0", path = "../embassy" }
28embassy-nrf = { version = "0.1.0", path = "../embassy-nrf", features = ["defmt-trace", "52840"] } 28embassy-nrf = { version = "0.1.0", path = "../embassy-nrf", features = ["defmt-trace", "52840"] }
29static-executor = { version = "0.1.0", features=["defmt"]} 29futures = { version = "0.3.5", default-features = false }
30futures = { version = "0.3.5", default-features = false } \ No newline at end of file 30cortex-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;
13use futures::pin_mut; 13use futures::pin_mut;
14use nrf52840_hal::gpio; 14use nrf52840_hal::gpio;
15 15
16use static_executor::{task, Executor}; 16use embassy::executor::{task, Executor};
17static EXECUTOR: Executor = Executor::new(|| cortex_m::asm::sev()); 17static EXECUTOR: Executor = Executor::new(|| cortex_m::asm::sev());
18 18
19#[task] 19#[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;
11use embassy_nrf::qspi; 11use embassy_nrf::qspi;
12use nrf52840_hal::gpio; 12use nrf52840_hal::gpio;
13 13
14use static_executor::{task, Executor}; 14use embassy::executor::{task, Executor};
15static EXECUTOR: Executor = Executor::new(|| cortex_m::asm::sev()); 15static EXECUTOR: Executor = Executor::new(|| cortex_m::asm::sev());
16 16
17const PAGE_SIZE: usize = 4096; 17const 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;
12use futures::pin_mut; 12use futures::pin_mut;
13use nrf52840_hal::gpio; 13use nrf52840_hal::gpio;
14 14
15use static_executor::{task, Executor}; 15use embassy::executor::{task, Executor};
16static EXECUTOR: Executor = Executor::new(|| cortex_m::asm::sev()); 16static EXECUTOR: Executor = Executor::new(|| cortex_m::asm::sev());
17 17
18#[task] 18#[task]