update examples

examples/blinky-blocking.rs

@@ -3,63 +3,42 @@
 #![allow(unreachable_code)] // for the `block!` macro
 #![deny(unsafe_code)]
 #![deny(warnings)]
-#![feature(const_fn)]
-#![feature(used)]
+#![feature(proc_macro)]
 #![no_std]
 
 extern crate blue_pill;
 
-extern crate embedded_hal as hal;
-
-// version = "0.2.3"
-extern crate cortex_m_rt;
-
-// version = "0.1.0"
-#[macro_use]
 extern crate cortex_m_rtfm as rtfm;
 
-#[macro_use]
+#[macro_use(block)]
 extern crate nb;
 
+use blue_pill::Timer;
 use blue_pill::led::{self, Green};
+use blue_pill::prelude::*;
 use blue_pill::time::Hertz;
-use blue_pill::{Timer, stm32f103xx};
-use hal::prelude::*;
-use rtfm::{P0, T0, TMax};
+use rtfm::app;
 
-// CONFIGURATION
 const FREQUENCY: Hertz = Hertz(1);
 
-// RESOURCES
-peripherals!(stm32f103xx, {
-    GPIOC: Peripheral {
-        ceiling: C0,
-    },
-    RCC: Peripheral {
-        ceiling: C0,
-    },
-    TIM3: Peripheral {
-        ceiling: C0,
-    },
-});
+app! {
+    device: blue_pill::stm32f103xx,
 
-// INITIALIZATION PHASE
-fn init(ref prio: P0, thr: &TMax) {
-    let gpioc = &GPIOC.access(prio, thr);
-    let rcc = &RCC.access(prio, thr);
-    let tim3 = TIM3.access(prio, thr);
+    idle: {
+        resources: [TIM3],
+    }
+}
 
-    let timer = Timer(&*tim3);
+fn init(p: init::Peripherals) {
+    led::init(p.GPIOC, p.RCC);
 
-    led::init(gpioc, rcc);
-    timer.init(FREQUENCY.invert(), rcc);
-}
+    let timer = Timer(&*p.TIM3);
 
-// IDLE LOOP
-fn idle(ref prio: P0, ref thr: T0) -> ! {
-    let tim3 = TIM3.access(prio, thr);
+    timer.init(FREQUENCY.invert(), p.RCC);
+}
 
-    let timer = Timer(&*tim3);
+fn idle(r: idle::Resources) -> ! {
+    let timer = Timer(&*r.TIM3);
 
     timer.resume();
     let mut state = false;
@@ -75,6 +54,3 @@ fn idle(ref prio: P0, ref thr: T0) -> ! {
         }
     }
 }
-
-// TASKS
-tasks!(stm32f103xx, {});

examples/capture1.rs

@@ -37,7 +37,7 @@ fn idle(r: idle::Resources) -> ! {
     const CHANNELS: [Channel; 4] =
         [Channel::_1, Channel::_2, Channel::_3, Channel::_4];
 
-    let capture = Capture(&**r.TIM1);
+    let capture = Capture(&*r.TIM1);
 
     for c in &CHANNELS {
         capture.enable(*c);

examples/capture2.rs

@@ -37,7 +37,7 @@ fn idle(r: idle::Resources) -> ! {
     const CHANNELS: [Channel; 4] =
         [Channel::_1, Channel::_2, Channel::_3, Channel::_4];
 
-    let capture = Capture(&**r.TIM2);
+    let capture = Capture(&*r.TIM2);
 
     for c in &CHANNELS {
         capture.enable(*c);

examples/capture3.rs

@@ -36,7 +36,7 @@ fn init(p: init::Peripherals) {
 fn idle(r: idle::Resources) -> ! {
     const CHANNELS: [Channel; 2] = [Channel::_1, Channel::_2];
 
-    let capture = Capture(&**r.TIM3);
+    let capture = Capture(&*r.TIM3);
 
     for c in &CHANNELS {
         capture.enable(*c);

examples/capture4.rs

@@ -37,7 +37,7 @@ fn idle(r: idle::Resources) -> ! {
     const CHANNELS: [Channel; 4] =
         [Channel::_1, Channel::_2, Channel::_3, Channel::_4];
 
-    let capture = Capture(&**r.TIM4);
+    let capture = Capture(&*r.TIM4);
 
     for c in &CHANNELS {
         capture.enable(*c);

examples/hello-world.rs

+//! Prints "Hello" and then "World" in the OpenOCD console
+
+#![deny(unsafe_code)]
+#![deny(warnings)]
+#![feature(const_fn)]
+#![feature(proc_macro)]
+#![no_std]
+
+extern crate blue_pill;
+extern crate cortex_m_rtfm as rtfm;
+extern crate cortex_m_semihosting as semihosting;
+
+use core::fmt::Write;
+
+use rtfm::app;
+use semihosting::hio::{self, HStdout};
+
+app! {
+    device: blue_pill::stm32f103xx,
+
+    resources: {
+        static HSTDOUT: Option<HStdout> = None;
+    },
+
+    idle: {
+        resources: [HSTDOUT],
+    },
+}
+
+fn init(_p: init::Peripherals, r: init::Resources) {
+    let mut hstdout = hio::hstdout().unwrap();
+
+    writeln!(hstdout, "Hello").unwrap();
+
+    **r.HSTDOUT = Some(hstdout);
+}
+
+fn idle(r: idle::Resources) -> ! {
+    writeln!(r.HSTDOUT.as_mut().unwrap(), "World").unwrap();
+
+    loop {
+        rtfm::wfi();
+    }
+}

examples/hello.rs

-//! Prints "Hello" and then "World" on the OpenOCD console
+//! Prints "Hello, World" in the OpenOCD console
 
 #![deny(unsafe_code)]
 #![deny(warnings)]
-#![feature(const_fn)]
 #![feature(proc_macro)]
 #![no_std]
 
 extern crate blue_pill;
-extern crate cortex_m;
 extern crate cortex_m_rtfm as rtfm;
-extern crate cortex_m_semihosting;
+extern crate cortex_m_semihosting as semihosting;
 
 use core::fmt::Write;
 
-use cortex_m_semihosting::hio::{self, HStdout};
 use rtfm::app;
+use semihosting::hio;
 
 app! {
     device: blue_pill::stm32f103xx,
-
-    resources: {
-        static HSTDOUT: Option<HStdout> = None;
-    },
-
-    idle: {
-        resources: [HSTDOUT],
-    },
 }
 
-// INITIALIZATION PHASE
-fn init(_p: init::Peripherals, r: init::Resources) {
-    let mut hstdout = hio::hstdout().unwrap();
-
-    writeln!(hstdout, "Hello").unwrap();
+fn init(_p: init::Peripherals) {}
 
-    **r.HSTDOUT = Some(hstdout);
-}
-
-// IDLE LOOP
-fn idle(r: idle::Resources) -> ! {
-    if let Some(mut hstdout) = r.HSTDOUT.take() {
-        writeln!(hstdout, "World").unwrap();
-    }
+fn idle() -> ! {
+    writeln!(hio::hstdout().unwrap(), "Hello, world!").unwrap();
 
-    // Sleep
     loop {
         rtfm::wfi();
     }

examples/spi1.rs

@@ -41,7 +41,7 @@ fn idle(r: idle::Resources) -> ! {
     // Read mode
     pub const R: u8 = 1 << 7;
 
-    let spi = Spi(&**r.SPI1);
+    let spi = Spi(&*r.SPI1);
 
     rtfm::bkpt();
 

examples/spi2.rs

@@ -41,7 +41,7 @@ fn idle(r: idle::Resources) -> ! {
     // Read mode
     pub const R: u8 = 1 << 7;
 
-    let spi = Spi(&**r.SPI2);
+    let spi = Spi(&*r.SPI2);
 
     rtfm::bkpt();
 

examples/wait1.rs

@@ -34,7 +34,7 @@ fn init(p: init::Peripherals) {
 }
 
 fn idle(r: idle::Resources) -> ! {
-    let timer = Timer(&**r.TIM1);
+    let timer = Timer(&*r.TIM1);
 
     let mut state = false;
     loop {

examples/wait2.rs

@@ -33,7 +33,7 @@ fn init(p: init::Peripherals) {
 }
 
 fn idle(r: idle::Resources) -> ! {
-    let timer = Timer(&**r.TIM2);
+    let timer = Timer(&*r.TIM2);
 
     let mut state = false;
     loop {

examples/wait3.rs

@@ -34,7 +34,7 @@ fn init(p: init::Peripherals) {
 }
 
 fn idle(r: idle::Resources) -> ! {
-    let timer = Timer(&**r.TIM3);
+    let timer = Timer(&*r.TIM3);
 
     let mut state = false;
     loop {

examples/wait4.rs

@@ -34,7 +34,7 @@ fn init(p: init::Peripherals) {
 }
 
 fn idle(r: idle::Resources) -> ! {
-    let timer = Timer(&**r.TIM4);
+    let timer = Timer(&*r.TIM4);
 
     let mut state = false;
     loop {

examples/ws2812.rs

@@ -17,7 +17,7 @@ use blue_pill::dma::{Buffer, Dma1Channel2};
 use blue_pill::prelude::*;
 use blue_pill::time::Hertz;
 use blue_pill::{Channel, Pwm};
-use rtfm::app;
+use rtfm::{app, Static};
 
 // CONFIGURATION
 const FREQUENCY: Hertz = Hertz(200_000);
@@ -52,11 +52,12 @@ fn init(p: init::Peripherals, r: init::Resources) {
 }
 
 fn idle(r: idle::Resources) -> ! {
-    let pwm = Pwm(&**r.TIM2);
+    let pwm = Pwm(&*r.TIM2);
+    let buffer = Static::wrap_mut(r.BUFFER);
 
-    pwm.set_duties(r.DMA1, Channel::_1, r.BUFFER).unwrap();
+    pwm.set_duties(r.DMA1, Channel::_1, buffer).unwrap();
 
-    block!(r.BUFFER.release(r.DMA1)).unwrap();
+    block!(buffer.release(r.DMA1)).unwrap();
 
     rtfm::bkpt();
 

src/lib.rs

@@ -19,7 +19,6 @@
 #![no_std]
 
 extern crate cast;
-extern crate either;
 extern crate embedded_hal as hal;
 extern crate nb;
 extern crate static_ref;