summaryrefslogtreecommitdiff
path: root/examples/src/bin/flash.rs
diff options
context:
space:
mode:
authorDario Nieuwenhuis <dirbaio@dirbaio.net>2021-05-10 00:24:24 +0200
committerDario Nieuwenhuis <dirbaio@dirbaio.net>2021-05-10 00:24:24 +0200
commit8201255a9d6dde4b29a5a539a1d6aeefcbd467df (patch)
tree3366939a2c4b121091eb1abb3605f82e750b5c2f /examples/src/bin/flash.rs
parent7e0bf163f35dca8a1daba11429035a7780f5f4b7 (diff)
downloadnrf-softdevice-8201255a9d6dde4b29a5a539a1d6aeefcbd467df.zip
Update embassy
Diffstat (limited to 'examples/src/bin/flash.rs')
-rw-r--r--examples/src/bin/flash.rs15
1 files changed, 7 insertions, 8 deletions
diff --git a/examples/src/bin/flash.rs b/examples/src/bin/flash.rs
index 174151d..3e5fe57 100644
--- a/examples/src/bin/flash.rs
+++ b/examples/src/bin/flash.rs
@@ -4,30 +4,30 @@
#![feature(min_type_alias_impl_trait)]
#![feature(impl_trait_in_bindings)]
#![feature(alloc_error_handler)]
+#![allow(incomplete_features)]
#[path = "../example_common.rs"]
mod example_common;
-use example_common::*;
use cortex_m_rt::entry;
use defmt::*;
-use embassy::executor::{task, Executor};
+use embassy::executor::Executor;
use embassy::traits::flash::Flash as _;
use embassy::util::Forever;
-
use futures::pin_mut;
+
use nrf_softdevice::{Flash, Softdevice};
static EXECUTOR: Forever<Executor> = Forever::new();
-#[task]
+#[embassy::task]
async fn softdevice_task(sd: &'static Softdevice) {
sd.run().await;
}
-#[task]
+#[embassy::task]
async fn flash_task(sd: &'static Softdevice) {
- let mut f = Flash::take(sd);
+ let f = Flash::take(sd);
pin_mut!(f);
info!("starting erase");
@@ -43,8 +43,7 @@ async fn flash_task(sd: &'static Softdevice) {
fn main() -> ! {
info!("Hello World!");
- let (sdp, _p) = take_peripherals();
- let sd = Softdevice::enable(sdp, &Default::default());
+ let sd = Softdevice::enable(&Default::default());
let executor = EXECUTOR.put(Executor::new());
executor.run(|spawner| {