max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

examples: Consistently use unwrap! in favor of .unwrap()

Browse Source 
Unfortunately errors from `embedded_graphics` and `core` doesn't provide
the necessary instances currently.
This commit is contained in:
Ben Gamari
2021-07-31 11:51:40 -04:00
committed by Dario Nieuwenhuis
parent 36402b5487
commit f4950c4449
22 changed files with 67 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/nrf/src/bin/blinky.rs
View File

@ -6,6 +6,7 @@
#[path = "../example_common.rs"]
mod example_common;
use defmt::unwrap;
use embassy::executor::Spawner;
use embassy::time::{Duration, Timer};
use embassy_nrf::gpio::{Level, Output, OutputDrive};
@ -17,9 +18,9 @@ async fn main(_spawner: Spawner, p: Peripherals) {
let mut led = Output::new(p.P0_13, Level::Low, OutputDrive::Standard);
loop {
led.set_high().unwrap();
unwrap!(led.set_high());
Timer::after(Duration::from_millis(300)).await;
led.set_low().unwrap();
unwrap!(led.set_low());
Timer::after(Duration::from_millis(300)).await;
}
}

8
examples/nrf/src/bin/gpiote_port.rs
View File

@ -32,8 +32,8 @@ async fn main(spawner: Spawner, p: Peripherals) {
let btn3 = PortInput::new(Input::new(p.P0_24.degrade(), Pull::Up));
let btn4 = PortInput::new(Input::new(p.P0_25.degrade(), Pull::Up));
spawner.spawn(button_task(1, btn1)).unwrap();
spawner.spawn(button_task(2, btn2)).unwrap();
spawner.spawn(button_task(3, btn3)).unwrap();
spawner.spawn(button_task(4, btn4)).unwrap();
unwrap!(spawner.spawn(button_task(1, btn1)));
unwrap!(spawner.spawn(button_task(2, btn2)));
unwrap!(spawner.spawn(button_task(3, btn3)));
unwrap!(spawner.spawn(button_task(4, btn4)));
}

7
examples/nrf/src/bin/mpsc.rs
View File

@ -6,6 +6,7 @@
#[path = "../example_common.rs"]
mod example_common;
use defmt::unwrap;
use embassy::executor::Spawner;
use embassy::time::{Duration, Timer};
use embassy::util::mpsc::TryRecvError;
@ -39,7 +40,7 @@ async fn main(spawner: Spawner, p: Peripherals) {
let channel = CHANNEL.put(Channel::new());
let (sender, mut receiver) = mpsc::split(channel);
spawner.spawn(my_task(sender)).unwrap();
unwrap!(spawner.spawn(my_task(sender)));
// We could just loop on `receiver.recv()` for simplicity. The code below
// is optimized to drain the queue as fast as possible in the spirit of
@ -53,8 +54,8 @@ async fn main(spawner: Spawner, p: Peripherals) {
Err(TryRecvError::Closed) => break,
};
match maybe_message {
Some(LedState::On) => led.set_high().unwrap(),
Some(LedState::Off) => led.set_low().unwrap(),
Some(LedState::On) => unwrap!(led.set_high()),
Some(LedState::Off) => unwrap!(led.set_low()),
_ => (),
}
}

12
examples/nrf/src/bin/qspi.rs
View File

@ -35,19 +35,19 @@ async fn main(_spawner: Spawner, p: Peripherals) {
.await;
let mut id = [1; 3];
q.custom_instruction(0x9F, &[], &mut id).await.unwrap();
unwrap!(q.custom_instruction(0x9F, &[], &mut id).await);
info!("id: {}", id);
// Read status register
let mut status = [4; 1];
q.custom_instruction(0x05, &[], &mut status).await.unwrap();
unwrap!(q.custom_instruction(0x05, &[], &mut status).await);
info!("status: {:?}", status[0]);
if status[0] & 0x40 == 0 {
status[0] |= 0x40;
q.custom_instruction(0x01, &status, &mut []).await.unwrap();
unwrap!(q.custom_instruction(0x01, &status, &mut []).await);
info!("enabled quad in status");
}
@ -58,19 +58,19 @@ async fn main(_spawner: Spawner, p: Peripherals) {
for i in 0..8 {
info!("page {:?}: erasing... ", i);
q.erase(i * PAGE_SIZE).await.unwrap();
unwrap!(q.erase(i * PAGE_SIZE).await);
for j in 0..PAGE_SIZE {
buf.0[j] = pattern((j + i * PAGE_SIZE) as u32);
}
info!("programming...");
q.write(i * PAGE_SIZE, &buf.0).await.unwrap();
unwrap!(q.write(i * PAGE_SIZE, &buf.0).await);
}
for i in 0..8 {
info!("page {:?}: reading... ", i);
q.read(i * PAGE_SIZE, &mut buf.0).await.unwrap();
unwrap!(q.read(i * PAGE_SIZE, &mut buf.0).await);
info!("verifying...");
for j in 0..PAGE_SIZE {

8
examples/nrf/src/bin/qspi_lowpower.rs
View File

@ -49,19 +49,19 @@ async fn main(_spawner: Spawner, mut p: Peripherals) {
.await;
let mut id = [1; 3];
q.custom_instruction(0x9F, &[], &mut id).await.unwrap();
unwrap!(q.custom_instruction(0x9F, &[], &mut id).await);
info!("id: {}", id);
// Read status register
let mut status = [4; 1];
q.custom_instruction(0x05, &[], &mut status).await.unwrap();
unwrap!(q.custom_instruction(0x05, &[], &mut status).await);
info!("status: {:?}", status[0]);
if status[0] & 0x40 == 0 {
status[0] |= 0x40;
q.custom_instruction(0x01, &status, &mut []).await.unwrap();
unwrap!(q.custom_instruction(0x01, &status, &mut []).await);
info!("enabled quad in status");
}
@ -69,7 +69,7 @@ async fn main(_spawner: Spawner, mut p: Peripherals) {
let mut buf = AlignedBuf([0u8; 64]);
info!("reading...");
q.read(0, &mut buf.0).await.unwrap();
unwrap!(q.read(0, &mut buf.0).await);
info!("read: {=[u8]:x}", buf.0);
// Drop the QSPI instance. This disables the peripehral and deconfigures the pins.

6
examples/nrf/src/bin/rng.rs
View File

@ -6,7 +6,7 @@
#[path = "../example_common.rs"]
mod example_common;
use defmt::panic;
use defmt::{panic, unwrap};
use embassy::executor::Spawner;
use embassy::traits::rng::Rng as _;
use embassy_nrf::interrupt;
@ -20,14 +20,14 @@ async fn main(_spawner: Spawner, p: Peripherals) {
// Async API
let mut bytes = [0; 4];
rng.fill_bytes(&mut bytes).await.unwrap(); // nRF RNG is infallible
unwrap!(rng.fill_bytes(&mut bytes).await); // nRF RNG is infallible
defmt::info!("Some random bytes: {:?}", bytes);
// Sync API with `rand`
defmt::info!("A random number from 1 to 10: {:?}", rng.gen_range(1..=10));
let mut bytes = [0; 1024];
rng.fill_bytes(&mut bytes).await.unwrap();
unwrap!(rng.fill_bytes(&mut bytes).await);
let zero_count: u32 = bytes.iter().fold(0, |acc, val| acc + val.count_zeros());
let one_count: u32 = bytes.iter().fold(0, |acc, val| acc + val.count_ones());
defmt::info!(

16
examples/nrf/src/bin/spim.rs
View File

@ -31,12 +31,12 @@ async fn main(_spawner: Spawner, p: Peripherals) {
// softreset
cortex_m::asm::delay(10);
ncs.set_low().unwrap();
unwrap!(ncs.set_low());
cortex_m::asm::delay(5);
let tx = [0xFF];
unwrap!(spim.read_write(&mut [], &tx).await);
cortex_m::asm::delay(10);
ncs.set_high().unwrap();
unwrap!(ncs.set_high());
cortex_m::asm::delay(100000);
@ -44,31 +44,31 @@ async fn main(_spawner: Spawner, p: Peripherals) {
// read ESTAT
cortex_m::asm::delay(5000);
ncs.set_low().unwrap();
unwrap!(ncs.set_low());
cortex_m::asm::delay(5000);
let tx = [0b000_11101, 0];
unwrap!(spim.read_write(&mut rx, &tx).await);
cortex_m::asm::delay(5000);
ncs.set_high().unwrap();
unwrap!(ncs.set_high());
info!("estat: {=[?]}", rx);
// Switch to bank 3
cortex_m::asm::delay(10);
ncs.set_low().unwrap();
unwrap!(ncs.set_low());
cortex_m::asm::delay(5);
let tx = [0b100_11111, 0b11];
unwrap!(spim.read_write(&mut rx, &tx).await);
cortex_m::asm::delay(10);
ncs.set_high().unwrap();
unwrap!(ncs.set_high());
// read EREVID
cortex_m::asm::delay(10);
ncs.set_low().unwrap();
unwrap!(ncs.set_low());
cortex_m::asm::delay(5);
let tx = [0b000_10010, 0];
unwrap!(spim.read_write(&mut rx, &tx).await);
cortex_m::asm::delay(10);
ncs.set_high().unwrap();
unwrap!(ncs.set_high());
info!("erevid: {=[?]}", rx);
}

2
examples/nrf/src/bin/twim.rs
View File

@ -27,7 +27,7 @@ async fn main(_spawner: Spawner, p: Peripherals) {
info!("Reading...");
let mut buf = [0u8; 16];
twi.write_then_read(ADDRESS, &mut [0x00], &mut buf).unwrap();
unwrap!(twi.write_then_read(ADDRESS, &mut [0x00], &mut buf));
info!("Read: {=[u8]:x}", buf);
}

2
examples/nrf/src/bin/twim_lowpower.rs
View File

@ -37,7 +37,7 @@ async fn main(_spawner: Spawner, mut p: Peripherals) {
info!("Reading...");
let mut buf = [0u8; 16];
twi.write_then_read(ADDRESS, &mut [0x00], &mut buf).unwrap();
unwrap!(twi.write_then_read(ADDRESS, &mut [0x00], &mut buf));
info!("Read: {=[u8]:x}", buf);