From b3858441f76c43981ba13c13aafbd3bdfec3280f Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Sat, 31 Oct 2020 22:37:24 +0100
Subject: Update examples.

---
 examples/src/bin/uart.rs | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'examples/src/bin/uart.rs')

diff --git a/examples/src/bin/uart.rs b/examples/src/bin/uart.rs
index 0eec2cd8d..eeaf5fee6 100644
--- a/examples/src/bin/uart.rs
+++ b/examples/src/bin/uart.rs
@@ -7,13 +7,13 @@ mod example_common;
 use example_common::*;
 
 use cortex_m_rt::entry;
-use embassy::io::{AsyncBufRead, AsyncBufReadExt, AsyncWrite, AsyncWriteExt};
-use embassy_nrf::uarte;
 use futures::pin_mut;
 use nrf52840_hal::gpio;
 
 use embassy::executor::{task, Executor};
-static EXECUTOR: Executor = Executor::new(|| cortex_m::asm::sev());
+use embassy::io::{AsyncBufRead, AsyncBufReadExt, AsyncWrite, AsyncWriteExt};
+use embassy::util::Forever;
+use embassy_nrf::uarte;
 
 #[task]
 async fn run() {
@@ -64,16 +64,17 @@ async fn run() {
     }
 }
 
+static EXECUTOR: Forever<Executor> = Forever::new();
+
 #[entry]
 fn main() -> ! {
     info!("Hello World!");
 
-    unsafe {
-        EXECUTOR.spawn(run()).dewrap();
+    let executor = EXECUTOR.put(Executor::new(cortex_m::asm::wfi));
+    executor.spawn(run()).dewrap();
 
-        loop {
-            EXECUTOR.run();
-            cortex_m::asm::wfe();
-        }
+    loop {
+        executor.run();
+        cortex_m::asm::wfe();
     }
 }
-- 
cgit