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

Merge branch 'master' into center-align

Browse Source
This commit is contained in:
Dion Dokter
2023-10-20 14:17:55 +02:00
parent 6f2995cd4c 88ada52146
commit 5b3f75dc72
433 changed files with 6915 additions and 7018 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/boot/application/nrf/Cargo.toml
View File

@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
[dependencies]
embassy-sync = { version = "0.3.0", path = "../../../../embassy-sync" }
embassy-executor = { version = "0.3.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers", "arch-cortex-m", "executor-thread"] }
embassy-time = { version = "0.1.3", path = "../../../../embassy-time", features = ["nightly"] }
embassy-time = { version = "0.1.5", path = "../../../../embassy-time", features = ["nightly"] }
embassy-nrf = { version = "0.1.0", path = "../../../../embassy-nrf", features = ["time-driver-rtc1", "gpiote", "nightly"] }
embassy-boot = { version = "0.1.0", path = "../../../../embassy-boot/boot", features = ["nightly"] }
embassy-boot-nrf = { version = "0.1.0", path = "../../../../embassy-boot/nrf", features = ["nightly"] }

6
examples/boot/application/nrf/src/bin/b.rs
View File

@ -5,7 +5,7 @@
use embassy_executor::Spawner;
use embassy_nrf::gpio::{Level, Output, OutputDrive};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use panic_reset as _;
#[embassy_executor::main]
@ -19,8 +19,8 @@ async fn main(_spawner: Spawner) {
loop {
led.set_high();
Timer::after(Duration::from_millis(300)).await;
Timer::after_millis(300).await;
led.set_low();
Timer::after(Duration::from_millis(300)).await;
Timer::after_millis(300).await;
}
}

2
examples/boot/application/rp/Cargo.toml
View File

@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
[dependencies]
embassy-sync = { version = "0.3.0", path = "../../../../embassy-sync" }
embassy-executor = { version = "0.3.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers", "arch-cortex-m", "executor-thread"] }
embassy-time = { version = "0.1.3", path = "../../../../embassy-time", features = ["nightly"] }
embassy-time = { version = "0.1.5", path = "../../../../embassy-time", features = ["nightly"] }
embassy-rp = { version = "0.1.0", path = "../../../../embassy-rp", features = ["time-driver", "unstable-traits", "nightly"] }
embassy-boot-rp = { version = "0.1.0", path = "../../../../embassy-boot/rp", features = ["nightly"] }
embassy-embedded-hal = { version = "0.1.0", path = "../../../../embassy-embedded-hal" }

4
examples/boot/application/rp/src/bin/a.rs
View File

@ -41,7 +41,7 @@ async fn main(_s: Spawner) {
let mut aligned = AlignedBuffer([0; 1]);
let mut updater = BlockingFirmwareUpdater::new(config, &mut aligned.0);
Timer::after(Duration::from_secs(5)).await;
Timer::after_secs(5).await;
watchdog.feed();
led.set_high();
let mut offset = 0;
@ -61,7 +61,7 @@ async fn main(_s: Spawner) {
watchdog.feed();
defmt::info!("firmware written, marking update");
updater.mark_updated().unwrap();
Timer::after(Duration::from_secs(2)).await;
Timer::after_secs(2).await;
led.set_low();
defmt::info!("update marked, resetting");
cortex_m::peripheral::SCB::sys_reset();

6
examples/boot/application/rp/src/bin/b.rs
View File

@ -4,7 +4,7 @@
use embassy_executor::Spawner;
use embassy_rp::gpio;
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use gpio::{Level, Output};
use {defmt_rtt as _, panic_reset as _};
@ -15,9 +15,9 @@ async fn main(_s: Spawner) {
loop {
led.set_high();
Timer::after(Duration::from_millis(100)).await;
Timer::after_millis(100).await;
led.set_low();
Timer::after(Duration::from_millis(100)).await;
Timer::after_millis(100).await;
}
}

2
examples/boot/application/stm32f3/Cargo.toml
View File

@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
[dependencies]
embassy-sync = { version = "0.3.0", path = "../../../../embassy-sync" }
embassy-executor = { version = "0.3.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] }
embassy-time = { version = "0.1.3", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] }
embassy-time = { version = "0.1.5", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] }
embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32f303re", "time-driver-any", "exti"] }
embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] }
embassy-embedded-hal = { version = "0.1.0", path = "../../../../embassy-embedded-hal" }

6
examples/boot/application/stm32f3/src/bin/b.rs
View File

@ -6,7 +6,7 @@
use defmt_rtt::*;
use embassy_executor::Spawner;
use embassy_stm32::gpio::{Level, Output, Speed};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use panic_reset as _;
#[embassy_executor::main]
@ -16,9 +16,9 @@ async fn main(_spawner: Spawner) {
loop {
led.set_high();
Timer::after(Duration::from_millis(500)).await;
Timer::after_millis(500).await;
led.set_low();
Timer::after(Duration::from_millis(500)).await;
Timer::after_millis(500).await;
}
}

2
examples/boot/application/stm32f7/Cargo.toml
View File

@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
[dependencies]
embassy-sync = { version = "0.3.0", path = "../../../../embassy-sync" }
embassy-executor = { version = "0.3.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] }
embassy-time = { version = "0.1.3", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] }
embassy-time = { version = "0.1.5", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] }
embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32f767zi", "time-driver-any", "exti"] }
embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] }
embassy-embedded-hal = { version = "0.1.0", path = "../../../../embassy-embedded-hal" }

8
examples/boot/application/stm32f7/src/bin/b.rs
View File

@ -6,21 +6,21 @@
use defmt_rtt::*;
use embassy_executor::Spawner;
use embassy_stm32::gpio::{Level, Output, Speed};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use panic_reset as _;
#[embassy_executor::main]
async fn main(_spawner: Spawner) {
let p = embassy_stm32::init(Default::default());
Timer::after(Duration::from_millis(300)).await;
Timer::after_millis(300).await;
let mut led = Output::new(p.PB7, Level::High, Speed::Low);
led.set_high();
loop {
led.set_high();
Timer::after(Duration::from_millis(500)).await;
Timer::after_millis(500).await;
led.set_low();
Timer::after(Duration::from_millis(500)).await;
Timer::after_millis(500).await;
}
}

2
examples/boot/application/stm32h7/Cargo.toml
View File

@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
[dependencies]
embassy-sync = { version = "0.3.0", path = "../../../../embassy-sync" }
embassy-executor = { version = "0.3.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] }
embassy-time = { version = "0.1.3", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] }
embassy-time = { version = "0.1.5", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] }
embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32h743zi", "time-driver-any", "exti"] }
embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] }
embassy-embedded-hal = { version = "0.1.0", path = "../../../../embassy-embedded-hal" }

8
examples/boot/application/stm32h7/src/bin/b.rs
View File

@ -6,21 +6,21 @@
use defmt_rtt::*;
use embassy_executor::Spawner;
use embassy_stm32::gpio::{Level, Output, Speed};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use panic_reset as _;
#[embassy_executor::main]
async fn main(_spawner: Spawner) {
let p = embassy_stm32::init(Default::default());
Timer::after(Duration::from_millis(300)).await;
Timer::after_millis(300).await;
let mut led = Output::new(p.PB14, Level::High, Speed::Low);
led.set_high();
loop {
led.set_high();
Timer::after(Duration::from_millis(500)).await;
Timer::after_millis(500).await;
led.set_low();
Timer::after(Duration::from_millis(500)).await;
Timer::after_millis(500).await;
}
}

2
examples/boot/application/stm32l0/Cargo.toml
View File

@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
[dependencies]
embassy-sync = { version = "0.3.0", path = "../../../../embassy-sync" }
embassy-executor = { version = "0.3.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] }
embassy-time = { version = "0.1.3", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] }
embassy-time = { version = "0.1.5", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] }
embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32l072cz", "time-driver-any", "exti", "memory-x"] }
embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] }
embassy-embedded-hal = { version = "0.1.0", path = "../../../../embassy-embedded-hal" }

4
examples/boot/application/stm32l0/src/bin/a.rs
View File

@ -11,7 +11,7 @@ use embassy_stm32::exti::ExtiInput;
use embassy_stm32::flash::{Flash, WRITE_SIZE};
use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed};
use embassy_sync::mutex::Mutex;
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use panic_reset as _;
#[cfg(feature = "skip-include")]
@ -46,6 +46,6 @@ async fn main(_spawner: Spawner) {
updater.mark_updated().await.unwrap();
led.set_low();
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
cortex_m::peripheral::SCB::sys_reset();
}

6
examples/boot/application/stm32l0/src/bin/b.rs
View File

@ -6,7 +6,7 @@
use defmt_rtt::*;
use embassy_executor::Spawner;
use embassy_stm32::gpio::{Level, Output, Speed};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use panic_reset as _;
#[embassy_executor::main]
@ -16,9 +16,9 @@ async fn main(_spawner: Spawner) {
loop {
led.set_high();
Timer::after(Duration::from_millis(500)).await;
Timer::after_millis(500).await;
led.set_low();
Timer::after(Duration::from_millis(500)).await;
Timer::after_millis(500).await;
}
}

2
examples/boot/application/stm32l1/Cargo.toml
View File

@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
[dependencies]
embassy-sync = { version = "0.3.0", path = "../../../../embassy-sync" }
embassy-executor = { version = "0.3.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] }
embassy-time = { version = "0.1.3", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] }
embassy-time = { version = "0.1.5", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] }
embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32l151cb-a", "time-driver-any", "exti"] }
embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] }
embassy-embedded-hal = { version = "0.1.0", path = "../../../../embassy-embedded-hal" }

4
examples/boot/application/stm32l1/src/bin/a.rs
View File

@ -11,7 +11,7 @@ use embassy_stm32::exti::ExtiInput;
use embassy_stm32::flash::{Flash, WRITE_SIZE};
use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed};
use embassy_sync::mutex::Mutex;
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use panic_reset as _;
#[cfg(feature = "skip-include")]
@ -46,6 +46,6 @@ async fn main(_spawner: Spawner) {
updater.mark_updated().await.unwrap();
led.set_low();
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
cortex_m::peripheral::SCB::sys_reset();
}

6
examples/boot/application/stm32l1/src/bin/b.rs
View File

@ -6,7 +6,7 @@
use defmt_rtt::*;
use embassy_executor::Spawner;
use embassy_stm32::gpio::{Level, Output, Speed};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use panic_reset as _;
#[embassy_executor::main]
@ -16,9 +16,9 @@ async fn main(_spawner: Spawner) {
loop {
led.set_high();
Timer::after(Duration::from_millis(500)).await;
Timer::after_millis(500).await;
led.set_low();
Timer::after(Duration::from_millis(500)).await;
Timer::after_millis(500).await;
}
}

2
examples/boot/application/stm32l4/Cargo.toml
View File

@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
[dependencies]
embassy-sync = { version = "0.3.0", path = "../../../../embassy-sync" }
embassy-executor = { version = "0.3.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] }
embassy-time = { version = "0.1.3", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] }
embassy-time = { version = "0.1.5", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] }
embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32l475vg", "time-driver-any", "exti"] }
embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] }
embassy-embedded-hal = { version = "0.1.0", path = "../../../../embassy-embedded-hal" }

6
examples/boot/application/stm32l4/src/bin/b.rs
View File

@ -6,7 +6,7 @@
use defmt_rtt::*;
use embassy_executor::Spawner;
use embassy_stm32::gpio::{Level, Output, Speed};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use panic_reset as _;
#[embassy_executor::main]
@ -16,9 +16,9 @@ async fn main(_spawner: Spawner) {
loop {
led.set_high();
Timer::after(Duration::from_millis(500)).await;
Timer::after_millis(500).await;
led.set_low();
Timer::after(Duration::from_millis(500)).await;
Timer::after_millis(500).await;
}
}

2
examples/boot/application/stm32wl/Cargo.toml
View File

@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
[dependencies]
embassy-sync = { version = "0.3.0", path = "../../../../embassy-sync" }
embassy-executor = { version = "0.3.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] }
embassy-time = { version = "0.1.3", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] }
embassy-time = { version = "0.1.5", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] }
embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32wl55jc-cm4", "time-driver-any", "exti"] }
embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] }
embassy-embedded-hal = { version = "0.1.0", path = "../../../../embassy-embedded-hal" }

6
examples/boot/application/stm32wl/src/bin/b.rs
View File

@ -6,7 +6,7 @@
use defmt_rtt::*;
use embassy_executor::Spawner;
use embassy_stm32::gpio::{Level, Output, Speed};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use panic_reset as _;
#[embassy_executor::main]
@ -16,9 +16,9 @@ async fn main(_spawner: Spawner) {
loop {
led.set_high();
Timer::after(Duration::from_millis(500)).await;
Timer::after_millis(500).await;
led.set_low();
Timer::after(Duration::from_millis(500)).await;
Timer::after_millis(500).await;
}
}

2
examples/nrf-rtos-trace/Cargo.toml
View File

@ -18,7 +18,7 @@ log = [
[dependencies]
embassy-sync = { version = "0.3.0", path = "../../embassy-sync" }
embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "rtos-trace", "rtos-trace-interrupt", "integrated-timers"] }
embassy-time = { version = "0.1.3", path = "../../embassy-time" }
embassy-time = { version = "0.1.5", path = "../../embassy-time" }
embassy-nrf = { version = "0.1.0", path = "../../embassy-nrf", features = ["nrf52840", "time-driver-rtc1", "gpiote", "unstable-pac"] }
cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] }

4
examples/nrf-rtos-trace/src/bin/rtos_trace.rs
View File

@ -6,7 +6,7 @@ use core::future::poll_fn;
use core::task::Poll;
use embassy_executor::Spawner;
use embassy_time::{Duration, Instant, Timer};
use embassy_time::{Instant, Timer};
#[cfg(feature = "log")]
use log::*;
use panic_probe as _;
@ -34,7 +34,7 @@ async fn run1() {
info!("DING DONG");
#[cfg(not(feature = "log"))]
rtos_trace::trace::marker(13);
Timer::after(Duration::from_ticks(16000)).await;
Timer::after_ticks(16000).await;
}
}

2
examples/nrf52840-rtic/Cargo.toml
View File

@ -9,7 +9,7 @@ rtic = { version = "2", features = ["thumbv7-backend"] }
embassy-futures = { version = "0.1.0", path = "../../embassy-futures" }
embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] }
embassy-time = { version = "0.1.3", path = "../../embassy-time", features = ["nightly", "unstable-traits", "defmt", "defmt-timestamp-uptime", "generic-queue"] }
embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["nightly", "unstable-traits", "defmt", "defmt-timestamp-uptime", "generic-queue"] }
embassy-nrf = { version = "0.1.0", path = "../../embassy-nrf", features = ["nightly", "unstable-traits", "defmt", "nrf52840", "time-driver-rtc1", "gpiote", "unstable-pac", "time"] }
defmt = "0.3"

7
examples/nrf52840-rtic/memory.x
View File

@ -1,7 +1,12 @@
MEMORY
{
/* NOTE 1 K = 1 KiBi = 1024 bytes */
/* These values correspond to the NRF52840 with Softdevices S140 7.0.1 */
FLASH : ORIGIN = 0x00000000, LENGTH = 1024K
RAM : ORIGIN = 0x20000000, LENGTH = 256K
/* These values correspond to the NRF52840 with Softdevices S140 7.3.0 */
/*
FLASH : ORIGIN = 0x00027000, LENGTH = 868K
RAM : ORIGIN = 0x20020000, LENGTH = 128K
*/
}

6
examples/nrf52840-rtic/src/bin/blinky.rs
View File

@ -9,7 +9,7 @@ mod app {
use defmt::info;
use embassy_nrf::gpio::{Level, Output, OutputDrive};
use embassy_nrf::peripherals;
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
#[shared]
struct Shared {}
@ -34,10 +34,10 @@ mod app {
loop {
info!("off!");
led.set_high();
Timer::after(Duration::from_millis(300)).await;
Timer::after_millis(300).await;
info!("on!");
led.set_low();
Timer::after(Duration::from_millis(300)).await;
Timer::after_millis(300).await;
}
}
}

8
examples/nrf52840/Cargo.toml
View File

@ -31,12 +31,12 @@ nightly = [
embassy-futures = { version = "0.1.0", path = "../../embassy-futures" }
embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] }
embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "integrated-timers"] }
embassy-time = { version = "0.1.3", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime"] }
embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime"] }
embassy-nrf = { version = "0.1.0", path = "../../embassy-nrf", features = ["defmt", "nrf52840", "time-driver-rtc1", "gpiote", "unstable-pac", "time"] }
embassy-net = { version = "0.1.0", path = "../../embassy-net", features = ["defmt", "tcp", "dhcpv4", "medium-ethernet"], optional = true }
embassy-net = { version = "0.2.0", path = "../../embassy-net", features = ["defmt", "tcp", "dhcpv4", "medium-ethernet"], optional = true }
embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt", "msos-descriptor",], optional = true }
embedded-io = { version = "0.5.0", features = ["defmt-03"] }
embedded-io-async = { version = "0.5.0", optional = true, features = ["defmt-03"] }
embedded-io = { version = "0.6.0", features = ["defmt-03"] }
embedded-io-async = { version = "0.6.0", optional = true, features = ["defmt-03"] }
embassy-lora = { version = "0.1.0", path = "../../embassy-lora", features = ["time", "defmt"], optional = true }
lora-phy = { version = "2", optional = true }
lorawan-device = { version = "0.11.0", default-features = false, features = ["async", "external-lora-phy"], optional = true }

7
examples/nrf52840/memory.x
View File

@ -1,7 +1,12 @@
MEMORY
{
/* NOTE 1 K = 1 KiBi = 1024 bytes */
/* These values correspond to the NRF52840 with Softdevices S140 7.0.1 */
FLASH : ORIGIN = 0x00000000, LENGTH = 1024K
RAM : ORIGIN = 0x20000000, LENGTH = 256K
/* These values correspond to the NRF52840 with Softdevices S140 7.3.0 */
/*
FLASH : ORIGIN = 0x00027000, LENGTH = 868K
RAM : ORIGIN = 0x20020000, LENGTH = 128K
*/
}

6
examples/nrf52840/src/bin/blinky.rs
View File

@ -4,7 +4,7 @@
use embassy_executor::Spawner;
use embassy_nrf::gpio::{Level, Output, OutputDrive};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
#[embassy_executor::main]
@ -14,8 +14,8 @@ async fn main(_spawner: Spawner) {
loop {
led.set_high();
Timer::after(Duration::from_millis(300)).await;
Timer::after_millis(300).await;
led.set_low();
Timer::after(Duration::from_millis(300)).await;
Timer::after_millis(300).await;
}
}

6
examples/nrf52840/src/bin/channel.rs
View File

@ -7,7 +7,7 @@ use embassy_executor::Spawner;
use embassy_nrf::gpio::{Level, Output, OutputDrive};
use embassy_sync::blocking_mutex::raw::ThreadModeRawMutex;
use embassy_sync::channel::Channel;
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
enum LedState {
@ -21,9 +21,9 @@ static CHANNEL: Channel<ThreadModeRawMutex, LedState, 1> = Channel::new();
async fn my_task() {
loop {
CHANNEL.send(LedState::On).await;
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
CHANNEL.send(LedState::Off).await;
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
}
}

6
examples/nrf52840/src/bin/channel_sender_receiver.rs
View File

@ -7,7 +7,7 @@ use embassy_executor::Spawner;
use embassy_nrf::gpio::{AnyPin, Level, Output, OutputDrive, Pin};
use embassy_sync::blocking_mutex::raw::NoopRawMutex;
use embassy_sync::channel::{Channel, Receiver, Sender};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use static_cell::StaticCell;
use {defmt_rtt as _, panic_probe as _};
@ -22,9 +22,9 @@ static CHANNEL: StaticCell<Channel<NoopRawMutex, LedState, 1>> = StaticCell::new
async fn send_task(sender: Sender<'static, NoopRawMutex, LedState, 1>) {
loop {
sender.send(LedState::On).await;
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
sender.send(LedState::Off).await;
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
}
}

4
examples/nrf52840/src/bin/executor_fairness_test.rs
View File

@ -7,14 +7,14 @@ use core::task::Poll;
use defmt::{info, unwrap};
use embassy_executor::Spawner;
use embassy_time::{Duration, Instant, Timer};
use embassy_time::{Instant, Timer};
use {defmt_rtt as _, panic_probe as _};
#[embassy_executor::task]
async fn run1() {
loop {
info!("DING DONG");
Timer::after(Duration::from_ticks(16000)).await;
Timer::after_ticks(16000).await;
}
}

6
examples/nrf52840/src/bin/lora_cad.rs
View File

@ -11,7 +11,7 @@ use embassy_executor::Spawner;
use embassy_lora::iv::GenericSx126xInterfaceVariant;
use embassy_nrf::gpio::{Input, Level, Output, OutputDrive, Pin as _, Pull};
use embassy_nrf::{bind_interrupts, peripherals, spim};
use embassy_time::{Delay, Duration, Timer};
use embassy_time::{Delay, Timer};
use lora_phy::mod_params::*;
use lora_phy::sx1261_2::SX1261_2;
use lora_phy::LoRa;
@ -55,7 +55,7 @@ async fn main(_spawner: Spawner) {
let mut start_indicator = Output::new(p.P1_04, Level::Low, OutputDrive::Standard);
start_indicator.set_high();
Timer::after(Duration::from_secs(5)).await;
Timer::after_secs(5).await;
start_indicator.set_low();
let mdltn_params = {
@ -89,7 +89,7 @@ async fn main(_spawner: Spawner) {
info!("cad successful without activity detected")
}
debug_indicator.set_high();
Timer::after(Duration::from_secs(5)).await;
Timer::after_secs(5).await;
debug_indicator.set_low();
}
Err(err) => info!("cad unsuccessful = {}", err),

6
examples/nrf52840/src/bin/lora_p2p_receive.rs
View File

@ -11,7 +11,7 @@ use embassy_executor::Spawner;
use embassy_lora::iv::GenericSx126xInterfaceVariant;
use embassy_nrf::gpio::{Input, Level, Output, OutputDrive, Pin as _, Pull};
use embassy_nrf::{bind_interrupts, peripherals, spim};
use embassy_time::{Delay, Duration, Timer};
use embassy_time::{Delay, Timer};
use lora_phy::mod_params::*;
use lora_phy::sx1261_2::SX1261_2;
use lora_phy::LoRa;
@ -55,7 +55,7 @@ async fn main(_spawner: Spawner) {
let mut start_indicator = Output::new(p.P1_04, Level::Low, OutputDrive::Standard);
start_indicator.set_high();
Timer::after(Duration::from_secs(5)).await;
Timer::after_secs(5).await;
start_indicator.set_low();
let mut receiving_buffer = [00u8; 100];
@ -107,7 +107,7 @@ async fn main(_spawner: Spawner) {
{
info!("rx successful");
debug_indicator.set_high();
Timer::after(Duration::from_secs(5)).await;
Timer::after_secs(5).await;
debug_indicator.set_low();
} else {
info!("rx unknown packet");

6
examples/nrf52840/src/bin/lora_p2p_receive_duty_cycle.rs
View File

@ -11,7 +11,7 @@ use embassy_executor::Spawner;
use embassy_lora::iv::GenericSx126xInterfaceVariant;
use embassy_nrf::gpio::{Input, Level, Output, OutputDrive, Pin as _, Pull};
use embassy_nrf::{bind_interrupts, peripherals, spim};
use embassy_time::{Delay, Duration, Timer};
use embassy_time::{Delay, Timer};
use lora_phy::mod_params::*;
use lora_phy::sx1261_2::SX1261_2;
use lora_phy::LoRa;
@ -55,7 +55,7 @@ async fn main(_spawner: Spawner) {
let mut start_indicator = Output::new(p.P1_04, Level::Low, OutputDrive::Standard);
start_indicator.set_high();
Timer::after(Duration::from_secs(5)).await;
Timer::after_secs(5).await;
start_indicator.set_low();
let mut receiving_buffer = [00u8; 100];
@ -116,7 +116,7 @@ async fn main(_spawner: Spawner) {
{
info!("rx successful");
debug_indicator.set_high();
Timer::after(Duration::from_secs(5)).await;
Timer::after_secs(5).await;
debug_indicator.set_low();
} else {
info!("rx unknown packet")

6
examples/nrf52840/src/bin/manually_create_executor.rs
View File

@ -8,7 +8,7 @@
use cortex_m_rt::entry;
use defmt::{info, unwrap};
use embassy_executor::Executor;
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use static_cell::StaticCell;
use {defmt_rtt as _, panic_probe as _};
@ -16,7 +16,7 @@ use {defmt_rtt as _, panic_probe as _};
async fn run1() {
loop {
info!("BIG INFREQUENT TICK");
Timer::after(Duration::from_ticks(64000)).await;
Timer::after_ticks(64000).await;
}
}
@ -24,7 +24,7 @@ async fn run1() {
async fn run2() {
loop {
info!("tick");
Timer::after(Duration::from_ticks(13000)).await;
Timer::after_ticks(13000).await;
}
}

8
examples/nrf52840/src/bin/multiprio.rs
View File

@ -62,7 +62,7 @@ use defmt::{info, unwrap};
use embassy_executor::{Executor, InterruptExecutor};
use embassy_nrf::interrupt;
use embassy_nrf::interrupt::{InterruptExt, Priority};
use embassy_time::{Duration, Instant, Timer};
use embassy_time::{Instant, Timer};
use static_cell::StaticCell;
use {defmt_rtt as _, panic_probe as _};
@ -70,7 +70,7 @@ use {defmt_rtt as _, panic_probe as _};
async fn run_high() {
loop {
info!(" [high] tick!");
Timer::after(Duration::from_ticks(27374)).await;
Timer::after_ticks(27374).await;
}
}
@ -87,7 +87,7 @@ async fn run_med() {
let ms = end.duration_since(start).as_ticks() / 33;
info!(" [med] done in {} ms", ms);
Timer::after(Duration::from_ticks(23421)).await;
Timer::after_ticks(23421).await;
}
}
@ -104,7 +104,7 @@ async fn run_low() {
let ms = end.duration_since(start).as_ticks() / 33;
info!("[low] done in {} ms", ms);
Timer::after(Duration::from_ticks(32983)).await;
Timer::after_ticks(32983).await;
}
}

8
examples/nrf52840/src/bin/mutex.rs
View File

@ -6,7 +6,7 @@ use defmt::{info, unwrap};
use embassy_executor::Spawner;
use embassy_sync::blocking_mutex::raw::ThreadModeRawMutex;
use embassy_sync::mutex::Mutex;
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
static MUTEX: Mutex<ThreadModeRawMutex, u32> = Mutex::new(0);
@ -20,11 +20,11 @@ async fn my_task() {
*m += 1000;
// Hold the mutex for a long time.
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
info!("end long operation: count = {}", *m);
}
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
}
}
@ -34,7 +34,7 @@ async fn main(spawner: Spawner) {
unwrap!(spawner.spawn(my_task()));
loop {
Timer::after(Duration::from_millis(300)).await;
Timer::after_millis(300).await;
let mut m = MUTEX.lock().await;
*m += 1;
info!("short operation: count = {}", *m);

4
examples/nrf52840/src/bin/nvmc.rs
View File

@ -5,7 +5,7 @@
use defmt::{info, unwrap};
use embassy_executor::Spawner;
use embassy_nrf::nvmc::Nvmc;
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use embedded_storage::nor_flash::{NorFlash, ReadNorFlash};
use {defmt_rtt as _, panic_probe as _};
@ -15,7 +15,7 @@ async fn main(_spawner: Spawner) {
info!("Hello NVMC!");
// probe-rs run breaks without this, I'm not sure why.
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
let mut f = Nvmc::new(p.NVMC);
const ADDR: u32 = 0x80000;

6
examples/nrf52840/src/bin/pdm.rs
View File

@ -6,7 +6,7 @@ use defmt::info;
use embassy_executor::Spawner;
use embassy_nrf::pdm::{self, Config, Pdm};
use embassy_nrf::{bind_interrupts, peripherals};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use fixed::types::I7F1;
use num_integer::Roots;
use {defmt_rtt as _, panic_probe as _};
@ -28,7 +28,7 @@ async fn main(_p: Spawner) {
pdm.start().await;
// wait some time till the microphon settled
Timer::after(Duration::from_millis(1000)).await;
Timer::after_millis(1000).await;
const SAMPLES: usize = 2048;
let mut buf = [0i16; SAMPLES];
@ -51,7 +51,7 @@ async fn main(_p: Spawner) {
info!("samples: {:?}", &buf);
pdm.stop().await;
Timer::after(Duration::from_millis(100)).await;
Timer::after_millis(100).await;
}
}
}

8
examples/nrf52840/src/bin/pubsub.rs
View File

@ -6,7 +6,7 @@ use defmt::unwrap;
use embassy_executor::Spawner;
use embassy_sync::blocking_mutex::raw::ThreadModeRawMutex;
use embassy_sync::pubsub::{DynSubscriber, PubSubChannel, Subscriber};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
/// Create the message bus. It has a queue of 4, supports 3 subscribers and 1 publisher
@ -39,7 +39,7 @@ async fn main(spawner: Spawner) {
let mut index = 0;
loop {
Timer::after(Duration::from_millis(500)).await;
Timer::after_millis(500).await;
let message = match index % 3 {
0 => Message::A,
@ -81,7 +81,7 @@ async fn fast_logger(mut messages: Subscriber<'static, ThreadModeRawMutex, Messa
async fn slow_logger(mut messages: DynSubscriber<'static, Message>) {
loop {
// Do some work
Timer::after(Duration::from_millis(2000)).await;
Timer::after_millis(2000).await;
// If the publisher has used the `publish_immediate` function, then we may receive a lag message here
let message = messages.next_message().await;
@ -98,7 +98,7 @@ async fn slow_logger(mut messages: DynSubscriber<'static, Message>) {
async fn slow_logger_pure(mut messages: DynSubscriber<'static, Message>) {
loop {
// Do some work
Timer::after(Duration::from_millis(2000)).await;
Timer::after_millis(2000).await;
// Instead of receiving lags here, we just ignore that and read the next message
let message = messages.next_message_pure().await;

4
examples/nrf52840/src/bin/pwm.rs
View File

@ -5,7 +5,7 @@
use defmt::*;
use embassy_executor::Spawner;
use embassy_nrf::pwm::{Prescaler, SimplePwm};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
// for i in range(1024): print(int((math.sin(i/512*math.pi)*0.4+0.5)**2*32767), ', ', end='')
@ -84,6 +84,6 @@ async fn main(_spawner: Spawner) {
pwm.set_duty(1, DUTY[(i + 256) % 1024]);
pwm.set_duty(2, DUTY[(i + 512) % 1024]);
pwm.set_duty(3, DUTY[(i + 768) % 1024]);
Timer::after(Duration::from_millis(3)).await;
Timer::after_millis(3).await;
}
}

4
examples/nrf52840/src/bin/pwm_double_sequence.rs
View File

@ -7,7 +7,7 @@ use embassy_executor::Spawner;
use embassy_nrf::pwm::{
Config, Prescaler, Sequence, SequenceConfig, SequenceMode, SequencePwm, Sequencer, StartSequence,
};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
#[embassy_executor::main]
@ -36,6 +36,6 @@ async fn main(_spawner: Spawner) {
// we can abort a sequence if we need to before its complete with pwm.stop()
// or stop is also implicitly called when the pwm peripheral is dropped
// when it goes out of scope
Timer::after(Duration::from_millis(40000)).await;
Timer::after_millis(40000).await;
info!("pwm stopped early!");
}

4
examples/nrf52840/src/bin/pwm_sequence.rs
View File

@ -5,7 +5,7 @@
use defmt::*;
use embassy_executor::Spawner;
use embassy_nrf::pwm::{Config, Prescaler, SequenceConfig, SequencePwm, SingleSequenceMode, SingleSequencer};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
#[embassy_executor::main]
@ -31,6 +31,6 @@ async fn main(_spawner: Spawner) {
// we can abort a sequence if we need to before its complete with pwm.stop()
// or stop is also implicitly called when the pwm peripheral is dropped
// when it goes out of scope
Timer::after(Duration::from_millis(20000)).await;
Timer::after_millis(20000).await;
info!("pwm stopped early!");
}

4
examples/nrf52840/src/bin/pwm_sequence_ws2812b.rs
View File

@ -7,7 +7,7 @@ use embassy_executor::Spawner;
use embassy_nrf::pwm::{
Config, Prescaler, SequenceConfig, SequenceLoad, SequencePwm, SingleSequenceMode, SingleSequencer,
};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
// WS2812B LED light demonstration. Drives just one light.
@ -52,7 +52,7 @@ async fn main(_spawner: Spawner) {
let sequences = SingleSequencer::new(&mut pwm, &seq_words, seq_config.clone());
unwrap!(sequences.start(SingleSequenceMode::Times(1)));
Timer::after(Duration::from_millis(50)).await;
Timer::after_millis(50).await;
if bit_value == T0H {
if color_bit == 20 {

14
examples/nrf52840/src/bin/pwm_servo.rs
View File

@ -5,7 +5,7 @@
use defmt::*;
use embassy_executor::Spawner;
use embassy_nrf::pwm::{Prescaler, SimplePwm};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
#[embassy_executor::main]
@ -19,29 +19,29 @@ async fn main(_spawner: Spawner) {
pwm.set_max_duty(2500);
info!("pwm initialized!");
Timer::after(Duration::from_millis(5000)).await;
Timer::after_millis(5000).await;
// 1ms 0deg (1/.008=125), 1.5ms 90deg (1.5/.008=187.5), 2ms 180deg (2/.008=250),
loop {
info!("45 deg");
// poor mans inverting, subtract our value from max_duty
pwm.set_duty(0, 2500 - 156);
Timer::after(Duration::from_millis(5000)).await;
Timer::after_millis(5000).await;
info!("90 deg");
pwm.set_duty(0, 2500 - 187);
Timer::after(Duration::from_millis(5000)).await;
Timer::after_millis(5000).await;
info!("135 deg");
pwm.set_duty(0, 2500 - 218);
Timer::after(Duration::from_millis(5000)).await;
Timer::after_millis(5000).await;
info!("180 deg");
pwm.set_duty(0, 2500 - 250);
Timer::after(Duration::from_millis(5000)).await;
Timer::after_millis(5000).await;
info!("0 deg");
pwm.set_duty(0, 2500 - 125);
Timer::after(Duration::from_millis(5000)).await;
Timer::after_millis(5000).await;
}
}

4
examples/nrf52840/src/bin/qspi_lowpower.rs
View File

@ -8,7 +8,7 @@ use defmt::{info, unwrap};
use embassy_executor::Spawner;
use embassy_nrf::qspi::Frequency;
use embassy_nrf::{bind_interrupts, peripherals, qspi};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
// Workaround for alignment requirements.
@ -79,6 +79,6 @@ async fn main(_p: Spawner) {
// Sleep for 1 second. The executor ensures the core sleeps with a WFE when it has nothing to do.
// During this sleep, the nRF chip should only use ~3uA
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
}
}

6
examples/nrf52840/src/bin/raw_spawn.rs
View File

@ -7,21 +7,21 @@ use cortex_m_rt::entry;
use defmt::{info, unwrap};
use embassy_executor::raw::TaskStorage;
use embassy_executor::Executor;
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use static_cell::StaticCell;
use {defmt_rtt as _, panic_probe as _};
async fn run1() {
loop {
info!("BIG INFREQUENT TICK");
Timer::after(Duration::from_ticks(64000)).await;
Timer::after_ticks(64000).await;
}
}
async fn run2() {
loop {
info!("tick");
Timer::after(Duration::from_ticks(13000)).await;
Timer::after_ticks(13000).await;
}
}

4
examples/nrf52840/src/bin/saadc.rs
View File

@ -6,7 +6,7 @@ use defmt::info;
use embassy_executor::Spawner;
use embassy_nrf::saadc::{ChannelConfig, Config, Saadc};
use embassy_nrf::{bind_interrupts, saadc};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
bind_interrupts!(struct Irqs {
@ -24,6 +24,6 @@ async fn main(_p: Spawner) {
let mut buf = [0; 1];
saadc.sample(&mut buf).await;
info!("sample: {=i16}", &buf[0]);
Timer::after(Duration::from_millis(100)).await;
Timer::after_millis(100).await;
}
}

3
examples/nrf52840/src/bin/saadc_continuous.rs
View File

@ -7,7 +7,6 @@ use embassy_executor::Spawner;
use embassy_nrf::saadc::{CallbackResult, ChannelConfig, Config, Saadc};
use embassy_nrf::timer::Frequency;
use embassy_nrf::{bind_interrupts, saadc};
use embassy_time::Duration;
use {defmt_rtt as _, panic_probe as _};
// Demonstrates both continuous sampling and scanning multiple channels driven by a PPI linked timer
@ -32,7 +31,7 @@ async fn main(_p: Spawner) {
// This delay demonstrates that starting the timer prior to running
// the task sampler is benign given the calibration that follows.
embassy_time::Timer::after(Duration::from_millis(500)).await;
embassy_time::Timer::after_millis(500).await;
saadc.calibrate().await;
let mut bufs = [[[0; 3]; 500]; 2];

4
examples/nrf52840/src/bin/self_spawn.rs
View File

@ -4,7 +4,7 @@
use defmt::{info, unwrap};
use embassy_executor::Spawner;
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
mod config {
@ -13,7 +13,7 @@ mod config {
#[embassy_executor::task(pool_size = config::MY_TASK_POOL_SIZE)]
async fn my_task(spawner: Spawner, n: u32) {
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
info!("Spawning self! {}", n);
unwrap!(spawner.spawn(my_task(spawner, n + 1)));
}

4
examples/nrf52840/src/bin/self_spawn_current_executor.rs
View File

@ -4,12 +4,12 @@
use defmt::{info, unwrap};
use embassy_executor::Spawner;
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
#[embassy_executor::task(pool_size = 2)]
async fn my_task(n: u32) {
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
info!("Spawning self! {}", n);
unwrap!(Spawner::for_current_executor().await.spawn(my_task(n + 1)));
}

4
examples/nrf52840/src/bin/temp.rs
View File

@ -6,7 +6,7 @@ use defmt::info;
use embassy_executor::Spawner;
use embassy_nrf::temp::Temp;
use embassy_nrf::{bind_interrupts, temp};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
bind_interrupts!(struct Irqs {
@ -21,6 +21,6 @@ async fn main(_spawner: Spawner) {
loop {
let value = temp.read().await;
info!("temperature: {}℃", value.to_num::<u16>());
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
}
}

6
examples/nrf52840/src/bin/timer.rs
View File

@ -4,14 +4,14 @@
use defmt::{info, unwrap};
use embassy_executor::Spawner;
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
#[embassy_executor::task]
async fn run1() {
loop {
info!("BIG INFREQUENT TICK");
Timer::after(Duration::from_ticks(64000)).await;
Timer::after_ticks(64000).await;
}
}
@ -19,7 +19,7 @@ async fn run1() {
async fn run2() {
loop {
info!("tick");
Timer::after(Duration::from_ticks(13000)).await;
Timer::after_ticks(13000).await;
}
}

4
examples/nrf52840/src/bin/twim_lowpower.rs
View File

@ -14,7 +14,7 @@ use defmt::*;
use embassy_executor::Spawner;
use embassy_nrf::twim::{self, Twim};
use embassy_nrf::{bind_interrupts, peripherals};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
const ADDRESS: u8 = 0x50;
@ -48,6 +48,6 @@ async fn main(_p: Spawner) {
// Sleep for 1 second. The executor ensures the core sleeps with a WFE when it has nothing to do.
// During this sleep, the nRF chip should only use ~3uA
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
}
}

4
examples/nrf52840/src/bin/usb_hid_mouse.rs
View File

@ -10,7 +10,7 @@ use embassy_futures::join::join;
use embassy_nrf::usb::vbus_detect::HardwareVbusDetect;
use embassy_nrf::usb::Driver;
use embassy_nrf::{bind_interrupts, pac, peripherals, usb};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use embassy_usb::class::hid::{HidWriter, ReportId, RequestHandler, State};
use embassy_usb::control::OutResponse;
use embassy_usb::{Builder, Config};
@ -83,7 +83,7 @@ async fn main(_spawner: Spawner) {
let hid_fut = async {
let mut y: i8 = 5;
loop {
Timer::after(Duration::from_millis(500)).await;
Timer::after_millis(500).await;
y = -y;
let report = MouseReport {

6
examples/nrf5340/Cargo.toml
View File

@ -14,7 +14,7 @@ embassy-executor = { version = "0.3.0", path = "../../embassy-executor", feature
"defmt",
"integrated-timers",
] }
embassy-time = { version = "0.1.3", path = "../../embassy-time", features = [
embassy-time = { version = "0.1.5", path = "../../embassy-time", features = [
"defmt",
"defmt-timestamp-uptime",
] }
@ -27,7 +27,7 @@ embassy-nrf = { version = "0.1.0", path = "../../embassy-nrf", features = [
"gpiote",
"unstable-pac",
] }
embassy-net = { version = "0.1.0", path = "../../embassy-net", features = [
embassy-net = { version = "0.2.0", path = "../../embassy-net", features = [
"nightly",
"defmt",
"tcp",
@ -37,7 +37,7 @@ embassy-net = { version = "0.1.0", path = "../../embassy-net", features = [
embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = [
"defmt",
] }
embedded-io-async = { version = "0.5.0" }
embedded-io-async = { version = "0.6.0" }
defmt = "0.3"
defmt-rtt = "0.4"

6
examples/nrf5340/src/bin/blinky.rs
View File

@ -4,7 +4,7 @@
use embassy_executor::Spawner;
use embassy_nrf::gpio::{Level, Output, OutputDrive};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
#[embassy_executor::main]
@ -14,8 +14,8 @@ async fn main(_spawner: Spawner) {
loop {
led.set_high();
Timer::after(Duration::from_millis(300)).await;
Timer::after_millis(300).await;
led.set_low();
Timer::after(Duration::from_millis(300)).await;
Timer::after_millis(300).await;
}
}

6
examples/rp/Cargo.toml
View File

@ -9,10 +9,10 @@ license = "MIT OR Apache-2.0"
embassy-embedded-hal = { version = "0.1.0", path = "../../embassy-embedded-hal", features = ["defmt"] }
embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] }
embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "integrated-timers"] }
embassy-time = { version = "0.1.3", path = "../../embassy-time", features = ["nightly", "unstable-traits", "defmt", "defmt-timestamp-uptime"] }
embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["nightly", "unstable-traits", "defmt", "defmt-timestamp-uptime"] }
embassy-rp = { version = "0.1.0", path = "../../embassy-rp", features = ["defmt", "unstable-traits", "nightly", "unstable-pac", "time-driver", "critical-section-impl"] }
embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] }
embassy-net = { version = "0.1.0", path = "../../embassy-net", features = ["defmt", "nightly", "tcp", "udp", "dhcpv4", "medium-ethernet"] }
embassy-net = { version = "0.2.0", path = "../../embassy-net", features = ["defmt", "nightly", "tcp", "udp", "dhcpv4", "medium-ethernet"] }
embassy-net-wiznet = { version = "0.1.0", path = "../../embassy-net-wiznet", features = ["defmt"] }
embassy-futures = { version = "0.1.0", path = "../../embassy-futures" }
embassy-usb-logger = { version = "0.1.0", path = "../../embassy-usb-logger" }
@ -45,7 +45,7 @@ usbd-hid = "0.6.1"
embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.1" }
embedded-hal-async = "1.0.0-rc.1"
embedded-hal-bus = { version = "0.1.0-rc.1", features = ["async"] }
embedded-io-async = { version = "0.5.0", features = ["defmt-03"] }
embedded-io-async = { version = "0.6.0", features = ["defmt-03"] }
embedded-storage = { version = "0.3" }
static_cell = { version = "1.1", features = ["nightly"]}
log = "0.4"

4
examples/rp/src/bin/adc.rs
View File

@ -10,7 +10,7 @@ use embassy_executor::Spawner;
use embassy_rp::adc::{Adc, Channel, Config, InterruptHandler};
use embassy_rp::bind_interrupts;
use embassy_rp::gpio::Pull;
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
bind_interrupts!(struct Irqs {
@ -36,7 +36,7 @@ async fn main(_spawner: Spawner) {
info!("Pin 28 ADC: {}", level);
let temp = adc.read(&mut ts).await.unwrap();
info!("Temp: {} degrees", convert_to_celsius(temp));
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
}
}

6
examples/rp/src/bin/blinky.rs
View File

@ -9,7 +9,7 @@
use defmt::*;
use embassy_executor::Spawner;
use embassy_rp::gpio;
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use gpio::{Level, Output};
use {defmt_rtt as _, panic_probe as _};
@ -21,10 +21,10 @@ async fn main(_spawner: Spawner) {
loop {
info!("led on!");
led.set_high();
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
info!("led off!");
led.set_low();
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
}
}

2
examples/rp/src/bin/ethernet_w5500_tcp_client.rs
View File

@ -111,7 +111,7 @@ async fn main(spawner: Spawner) {
break;
}
info!("txd: {}", core::str::from_utf8(msg).unwrap());
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
}
}
}

4
examples/rp/src/bin/flash.rs
View File

@ -8,7 +8,7 @@ use defmt::*;
use embassy_executor::Spawner;
use embassy_rp::flash::{Async, ERASE_SIZE, FLASH_BASE};
use embassy_rp::peripherals::FLASH;
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
const ADDR_OFFSET: u32 = 0x100000;
@ -23,7 +23,7 @@ async fn main(_spawner: Spawner) {
// defmt RTT header. Reading that header might touch flash memory, which
// interferes with flash write operations.
// https://github.com/knurling-rs/defmt/pull/683
Timer::after(Duration::from_millis(10)).await;
Timer::after_millis(10).await;
let mut flash = embassy_rp::flash::Flash::<_, Async, FLASH_SIZE>::new(p.FLASH, p.DMA_CH0);

4
examples/rp/src/bin/gpio_async.rs
View File

@ -9,7 +9,7 @@
use defmt::*;
use embassy_executor::Spawner;
use embassy_rp::gpio;
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use gpio::{Input, Level, Output, Pull};
use {defmt_rtt as _, panic_probe as _};
@ -36,6 +36,6 @@ async fn main(_spawner: Spawner) {
info!("done wait_for_high. Turn off LED");
led.set_low();
Timer::after(Duration::from_secs(2)).await;
Timer::after_secs(2).await;
}
}

6
examples/rp/src/bin/gpout.rs
View File

@ -9,7 +9,7 @@
use defmt::*;
use embassy_executor::Spawner;
use embassy_rp::clocks;
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
#[embassy_executor::main]
@ -26,13 +26,13 @@ async fn main(_spawner: Spawner) {
"Pin 25 is now outputing CLK_SYS/1000, should be toggling at {}",
gpout3.get_freq()
);
Timer::after(Duration::from_secs(2)).await;
Timer::after_secs(2).await;
gpout3.set_src(clocks::GpoutSrc::Ref);
info!(
"Pin 25 is now outputing CLK_REF/1000, should be toggling at {}",
gpout3.get_freq()
);
Timer::after(Duration::from_secs(2)).await;
Timer::after_secs(2).await;
}
}

4
examples/rp/src/bin/i2c_async.rs
View File

@ -12,7 +12,7 @@ use embassy_executor::Spawner;
use embassy_rp::bind_interrupts;
use embassy_rp::i2c::{self, Config, InterruptHandler};
use embassy_rp::peripherals::I2C1;
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use embedded_hal_async::i2c::I2c;
use {defmt_rtt as _, panic_probe as _};
@ -106,6 +106,6 @@ async fn main(_spawner: Spawner) {
}
}
Timer::after(Duration::from_millis(100)).await;
Timer::after_millis(100).await;
}
}

4
examples/rp/src/bin/i2c_blocking.rs
View File

@ -10,7 +10,7 @@
use defmt::*;
use embassy_executor::Spawner;
use embassy_rp::i2c::{self, Config};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use embedded_hal_1::i2c::I2c;
use {defmt_rtt as _, panic_probe as _};
@ -70,6 +70,6 @@ async fn main(_spawner: Spawner) {
info!("portb = {:02x}", portb[0]);
val = !val;
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
}
}

6
examples/rp/src/bin/i2c_slave.rs
View File

@ -7,7 +7,7 @@ use defmt::*;
use embassy_executor::Spawner;
use embassy_rp::peripherals::{I2C0, I2C1};
use embassy_rp::{bind_interrupts, i2c, i2c_slave};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use embedded_hal_async::i2c::I2c;
use {defmt_rtt as _, panic_probe as _};
@ -81,7 +81,7 @@ async fn controller_task(mut con: i2c::I2c<'static, I2C0, i2c::Async>) {
Err(e) => error!("Error writing {}", e),
}
Timer::after(Duration::from_millis(100)).await;
Timer::after_millis(100).await;
}
match con.read(DEV_ADDR, &mut resp_buff).await {
Ok(_) => info!("read response: {}", resp_buff),
@ -91,7 +91,7 @@ async fn controller_task(mut con: i2c::I2c<'static, I2C0, i2c::Async>) {
Ok(_) => info!("write_read response: {}", resp_buff),
Err(e) => error!("Error writing {}", e),
}
Timer::after(Duration::from_millis(100)).await;
Timer::after_millis(100).await;
}
}

4
examples/rp/src/bin/lora_p2p_receive.rs
View File

@ -11,7 +11,7 @@ use embassy_executor::Spawner;
use embassy_lora::iv::GenericSx126xInterfaceVariant;
use embassy_rp::gpio::{Input, Level, Output, Pin, Pull};
use embassy_rp::spi::{Config, Spi};
use embassy_time::{Delay, Duration, Timer};
use embassy_time::{Delay, Timer};
use lora_phy::mod_params::*;
use lora_phy::sx1261_2::SX1261_2;
use lora_phy::LoRa;
@ -96,7 +96,7 @@ async fn main(_spawner: Spawner) {
{
info!("rx successful");
debug_indicator.set_high();
Timer::after(Duration::from_secs(5)).await;
Timer::after_secs(5).await;
debug_indicator.set_low();
} else {
info!("rx unknown packet");

4
examples/rp/src/bin/lora_p2p_send_multicore.rs
View File

@ -15,7 +15,7 @@ use embassy_rp::peripherals::SPI1;
use embassy_rp::spi::{Async, Config, Spi};
use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
use embassy_sync::channel::Channel;
use embassy_time::{Delay, Duration, Timer};
use embassy_time::{Delay, Timer};
use lora_phy::mod_params::*;
use lora_phy::sx1261_2::SX1261_2;
use lora_phy::LoRa;
@ -59,7 +59,7 @@ async fn core0_task() {
info!("Hello from core 0");
loop {
CHANNEL.send([0x01u8, 0x02u8, 0x03u8]).await;
Timer::after(Duration::from_millis(60 * 1000)).await;
Timer::after_millis(60 * 1000).await;
}
}

6
examples/rp/src/bin/multicore.rs
View File

@ -13,7 +13,7 @@ use embassy_rp::multicore::{spawn_core1, Stack};
use embassy_rp::peripherals::PIN_25;
use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
use embassy_sync::channel::Channel;
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use static_cell::StaticCell;
use {defmt_rtt as _, panic_probe as _};
@ -46,9 +46,9 @@ async fn core0_task() {
info!("Hello from core 0");
loop {
CHANNEL.send(LedState::On).await;
Timer::after(Duration::from_millis(100)).await;
Timer::after_millis(100).await;
CHANNEL.send(LedState::Off).await;
Timer::after(Duration::from_millis(400)).await;
Timer::after_millis(400).await;
}
}

8
examples/rp/src/bin/multiprio.rs
View File

@ -62,7 +62,7 @@ use defmt::{info, unwrap};
use embassy_executor::{Executor, InterruptExecutor};
use embassy_rp::interrupt;
use embassy_rp::interrupt::{InterruptExt, Priority};
use embassy_time::{Duration, Instant, Timer, TICK_HZ};
use embassy_time::{Instant, Timer, TICK_HZ};
use static_cell::StaticCell;
use {defmt_rtt as _, panic_probe as _};
@ -70,7 +70,7 @@ use {defmt_rtt as _, panic_probe as _};
async fn run_high() {
loop {
info!(" [high] tick!");
Timer::after(Duration::from_ticks(673740)).await;
Timer::after_ticks(673740).await;
}
}
@ -87,7 +87,7 @@ async fn run_med() {
let ms = end.duration_since(start).as_ticks() * 1000 / TICK_HZ;
info!(" [med] done in {} ms", ms);
Timer::after(Duration::from_ticks(53421)).await;
Timer::after_ticks(53421).await;
}
}
@ -104,7 +104,7 @@ async fn run_low() {
let ms = end.duration_since(start).as_ticks() * 1000 / TICK_HZ;
info!("[low] done in {} ms", ms);
Timer::after(Duration::from_ticks(82983)).await;
Timer::after_ticks(82983).await;
}
}

4
examples/rp/src/bin/pio_hd44780.rs
View File

@ -15,7 +15,7 @@ use embassy_rp::pio::{
};
use embassy_rp::pwm::{self, Pwm};
use embassy_rp::{bind_interrupts, into_ref, Peripheral, PeripheralRef};
use embassy_time::{Duration, Instant, Timer};
use embassy_time::{Instant, Timer};
use {defmt_rtt as _, panic_probe as _};
bind_interrupts!(pub struct Irqs {
@ -66,7 +66,7 @@ async fn main(_spawner: Spawner) {
let mut buf = Buf([0; 16], 0);
write!(buf, "up {}s", Instant::now().as_micros() as f32 / 1e6).unwrap();
hd.add_line(&buf.0[0..buf.1]).await;
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
}
}

4
examples/rp/src/bin/pio_ws2812.rs
View File

@ -13,7 +13,7 @@ use embassy_rp::pio::{
Common, Config, FifoJoin, Instance, InterruptHandler, Pio, PioPin, ShiftConfig, ShiftDirection, StateMachine,
};
use embassy_rp::{bind_interrupts, clocks, into_ref, Peripheral, PeripheralRef};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use fixed::types::U24F8;
use fixed_macro::fixed;
use smart_leds::RGB8;
@ -153,7 +153,7 @@ async fn main(_spawner: Spawner) {
}
ws2812.write(&data).await;
Timer::after(Duration::from_millis(10)).await;
Timer::after_millis(10).await;
}
}
}

4
examples/rp/src/bin/pwm.rs
View File

@ -9,7 +9,7 @@
use defmt::*;
use embassy_executor::Spawner;
use embassy_rp::pwm::{Config, Pwm};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
#[embassy_executor::main]
@ -23,7 +23,7 @@ async fn main(_spawner: Spawner) {
loop {
info!("current LED duty cycle: {}/32768", c.compare_b);
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
c.compare_b = c.compare_b.rotate_left(4);
pwm.set_config(&c);
}

32
examples/rp/src/bin/rosc.rs Normal file
View File

@ -0,0 +1,32 @@
//! This example test the RP Pico on board LED.
//!
//! It does not work with the RP Pico W board. See wifi_blinky.rs.
#![no_std]
#![no_main]
#![feature(type_alias_impl_trait)]
use defmt::*;
use embassy_executor::Spawner;
use embassy_rp::{clocks, gpio};
use embassy_time::Timer;
use gpio::{Level, Output};
use {defmt_rtt as _, panic_probe as _};
#[embassy_executor::main]
async fn main(_spawner: Spawner) {
let mut config = embassy_rp::config::Config::default();
config.clocks = clocks::ClockConfig::rosc();
let p = embassy_rp::init(config);
let mut led = Output::new(p.PIN_25, Level::Low);
loop {
info!("led on!");
led.set_high();
Timer::after_secs(1).await;
info!("led off!");
led.set_low();
Timer::after_secs(1).await;
}
}

6
examples/rp/src/bin/rtc.rs
View File

@ -7,7 +7,7 @@
use defmt::*;
use embassy_executor::Spawner;
use embassy_rp::rtc::{DateTime, DayOfWeek, Rtc};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
#[embassy_executor::main]
@ -31,7 +31,7 @@ async fn main(_spawner: Spawner) {
rtc.set_datetime(now).unwrap();
}
Timer::after(Duration::from_millis(20000)).await;
Timer::after_millis(20000).await;
if let Ok(dt) = rtc.now() {
info!(
@ -41,6 +41,6 @@ async fn main(_spawner: Spawner) {
}
info!("Reboot.");
Timer::after(Duration::from_millis(200)).await;
Timer::after_millis(200).await;
cortex_m::peripheral::SCB::sys_reset();
}

4
examples/rp/src/bin/spi_async.rs
View File

@ -8,7 +8,7 @@
use defmt::*;
use embassy_executor::Spawner;
use embassy_rp::spi::{Config, Spi};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
#[embassy_executor::main]
@ -27,6 +27,6 @@ async fn main(_spawner: Spawner) {
let mut rx_buf = [0_u8; 6];
spi.transfer(&mut rx_buf, &tx_buf).await.unwrap();
info!("{:?}", rx_buf);
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
}
}

4
examples/rp/src/bin/uart_buffered_split.rs
View File

@ -13,7 +13,7 @@ use embassy_executor::Spawner;
use embassy_rp::bind_interrupts;
use embassy_rp::peripherals::UART0;
use embassy_rp::uart::{BufferedInterruptHandler, BufferedUart, BufferedUartRx, Config};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use embedded_io_async::{Read, Write};
use static_cell::make_static;
use {defmt_rtt as _, panic_probe as _};
@ -42,7 +42,7 @@ async fn main(spawner: Spawner) {
];
info!("TX {:?}", data);
tx.write_all(&data).await.unwrap();
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
}
}

4
examples/rp/src/bin/uart_unidir.rs
View File

@ -14,7 +14,7 @@ use embassy_executor::Spawner;
use embassy_rp::bind_interrupts;
use embassy_rp::peripherals::UART1;
use embassy_rp::uart::{Async, Config, InterruptHandler, UartRx, UartTx};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
bind_interrupts!(struct Irqs {
@ -35,7 +35,7 @@ async fn main(spawner: Spawner) {
let data = [1u8, 2, 3, 4, 5, 6, 7, 8];
info!("TX {:?}", data);
uart_tx.write(&data).await.unwrap();
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
}
}

3
examples/rp/src/bin/usb_hid_keyboard.rs
View File

@ -78,6 +78,9 @@ async fn main(_spawner: Spawner) {
// Set up the signal pin that will be used to trigger the keyboard.
let mut signal_pin = Input::new(p.PIN_16, Pull::None);
// Enable the schmitt trigger to slightly debounce.
signal_pin.set_schmitt(true);
let (reader, mut writer) = hid.split();
// Do stuff with the class!

4
examples/rp/src/bin/usb_logger.rs
View File

@ -10,7 +10,7 @@ use embassy_executor::Spawner;
use embassy_rp::bind_interrupts;
use embassy_rp::peripherals::USB;
use embassy_rp::usb::{Driver, InterruptHandler};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
bind_interrupts!(struct Irqs {
@ -32,6 +32,6 @@ async fn main(spawner: Spawner) {
loop {
counter += 1;
log::info!("Tick {}", counter);
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
}
}

110
examples/rp/src/bin/usb_midi.rs Normal file
View File

@ -0,0 +1,110 @@
//! This example shows how to use USB (Universal Serial Bus) in the RP2040 chip.
//!
//! This creates a USB MIDI device that echoes MIDI messages back to the host.
#![no_std]
#![no_main]
#![feature(type_alias_impl_trait)]
use defmt::{info, panic};
use embassy_executor::Spawner;
use embassy_futures::join::join;
use embassy_rp::bind_interrupts;
use embassy_rp::peripherals::USB;
use embassy_rp::usb::{Driver, Instance, InterruptHandler};
use embassy_usb::class::midi::MidiClass;
use embassy_usb::driver::EndpointError;
use embassy_usb::{Builder, Config};
use {defmt_rtt as _, panic_probe as _};
bind_interrupts!(struct Irqs {
USBCTRL_IRQ => InterruptHandler<USB>;
});
#[embassy_executor::main]
async fn main(_spawner: Spawner) {
info!("Hello world!");
let p = embassy_rp::init(Default::default());
// Create the driver, from the HAL.
let driver = Driver::new(p.USB, Irqs);
// Create embassy-usb Config
let mut config = Config::new(0xc0de, 0xcafe);
config.manufacturer = Some("Embassy");
config.product = Some("USB-MIDI example");
config.serial_number = Some("12345678");
config.max_power = 100;
config.max_packet_size_0 = 64;
// Required for windows compatibility.
// https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.9.1/kconfig/CONFIG_CDC_ACM_IAD.html#help
config.device_class = 0xEF;
config.device_sub_class = 0x02;
config.device_protocol = 0x01;
config.composite_with_iads = true;
// Create embassy-usb DeviceBuilder using the driver and config.
// It needs some buffers for building the descriptors.
let mut device_descriptor = [0; 256];
let mut config_descriptor = [0; 256];
let mut bos_descriptor = [0; 256];
let mut control_buf = [0; 64];
let mut builder = Builder::new(
driver,
config,
&mut device_descriptor,
&mut config_descriptor,
&mut bos_descriptor,
&mut control_buf,
);
// Create classes on the builder.
let mut class = MidiClass::new(&mut builder, 1, 1, 64);
// The `MidiClass` can be split into `Sender` and `Receiver`, to be used in separate tasks.
// let (sender, receiver) = class.split();
// Build the builder.
let mut usb = builder.build();
// Run the USB device.
let usb_fut = usb.run();
// Use the Midi class!
let midi_fut = async {
loop {
class.wait_connection().await;
info!("Connected");
let _ = midi_echo(&mut class).await;
info!("Disconnected");
}
};
// Run everything concurrently.
// If we had made everything `'static` above instead, we could do this using separate tasks instead.
join(usb_fut, midi_fut).await;
}
struct Disconnected {}
impl From<EndpointError> for Disconnected {
fn from(val: EndpointError) -> Self {
match val {
EndpointError::BufferOverflow => panic!("Buffer overflow"),
EndpointError::Disabled => Disconnected {},
}
}
}
async fn midi_echo<'d, T: Instance + 'd>(class: &mut MidiClass<'d, Driver<'d, T>>) -> Result<(), Disconnected> {
let mut buf = [0; 64];
loop {
let n = class.read_packet(&mut buf).await?;
let data = &buf[..n];
info!("data: {:x}", data);
class.write_packet(data).await?;
}
}

10
examples/rp/src/bin/watchdog.rs
View File

@ -24,7 +24,7 @@ async fn main(_spawner: Spawner) {
// Set the LED high for 2 seconds so we know when we're about to start the watchdog
led.set_high();
Timer::after(Duration::from_secs(2)).await;
Timer::after_secs(2).await;
// Set to watchdog to reset if it's not fed within 1.05 seconds, and start it
watchdog.start(Duration::from_millis(1_050));
@ -33,9 +33,9 @@ async fn main(_spawner: Spawner) {
// Blink once a second for 5 seconds, feed the watchdog timer once a second to avoid a reset
for _ in 1..=5 {
led.set_low();
Timer::after(Duration::from_millis(500)).await;
Timer::after_millis(500).await;
led.set_high();
Timer::after(Duration::from_millis(500)).await;
Timer::after_millis(500).await;
info!("Feeding watchdog");
watchdog.feed();
}
@ -45,8 +45,8 @@ async fn main(_spawner: Spawner) {
// The processor should reset in 1.05 seconds.
loop {
led.set_low();
Timer::after(Duration::from_millis(100)).await;
Timer::after_millis(100).await;
led.set_high();
Timer::after(Duration::from_millis(100)).await;
Timer::after_millis(100).await;
}
}

2
examples/rp/src/bin/wifi_ap_tcp_server.rs
View File

@ -52,7 +52,7 @@ async fn main(spawner: Spawner) {
// at hardcoded addresses, instead of baking them into the program with `include_bytes!`:
// probe-rs download 43439A0.bin --format bin --chip RP2040 --base-address 0x10100000
// probe-rs download 43439A0_clm.bin --format bin --chip RP2040 --base-address 0x10140000
//let fw = unsafe { core::slice::from_raw_parts(0x10100000 as *const u8, 224190) };
//let fw = unsafe { core::slice::from_raw_parts(0x10100000 as *const u8, 230321) };
//let clm = unsafe { core::slice::from_raw_parts(0x10140000 as *const u8, 4752) };
let pwr = Output::new(p.PIN_23, Level::Low);

2
examples/rp/src/bin/wifi_blinky.rs
View File

@ -38,7 +38,7 @@ async fn main(spawner: Spawner) {
// at hardcoded addresses, instead of baking them into the program with `include_bytes!`:
// probe-rs download 43439A0.bin --format bin --chip RP2040 --base-address 0x10100000
// probe-rs download 43439A0_clm.bin --format bin --chip RP2040 --base-address 0x10140000
//let fw = unsafe { core::slice::from_raw_parts(0x10100000 as *const u8, 224190) };
//let fw = unsafe { core::slice::from_raw_parts(0x10100000 as *const u8, 230321) };
//let clm = unsafe { core::slice::from_raw_parts(0x10140000 as *const u8, 4752) };
let pwr = Output::new(p.PIN_23, Level::Low);

2
examples/rp/src/bin/wifi_scan.rs
View File

@ -49,7 +49,7 @@ async fn main(spawner: Spawner) {
// at hardcoded addresses, instead of baking them into the program with `include_bytes!`:
// probe-rs download 43439A0.bin --format bin --chip RP2040 --base-address 0x10100000
// probe-rs download 43439A0_clm.bin --format bin --chip RP2040 --base-address 0x10140000
//let fw = unsafe { core::slice::from_raw_parts(0x10100000 as *const u8, 224190) };
//let fw = unsafe { core::slice::from_raw_parts(0x10100000 as *const u8, 230321) };
//let clm = unsafe { core::slice::from_raw_parts(0x10140000 as *const u8, 4752) };
let pwr = Output::new(p.PIN_23, Level::Low);

11
examples/rp/src/bin/wifi_tcp_server.rs
View File

@ -18,7 +18,7 @@ use embassy_rp::bind_interrupts;
use embassy_rp::gpio::{Level, Output};
use embassy_rp::peripherals::{DMA_CH0, PIN_23, PIN_25, PIO0};
use embassy_rp::pio::{InterruptHandler, Pio};
use embassy_time::Duration;
use embassy_time::{Duration, Timer};
use embedded_io_async::Write;
use static_cell::make_static;
use {defmt_rtt as _, panic_probe as _};
@ -55,7 +55,7 @@ async fn main(spawner: Spawner) {
// at hardcoded addresses, instead of baking them into the program with `include_bytes!`:
// probe-rs download 43439A0.bin --format bin --chip RP2040 --base-address 0x10100000
// probe-rs download 43439A0_clm.bin --format bin --chip RP2040 --base-address 0x10140000
//let fw = unsafe { core::slice::from_raw_parts(0x10100000 as *const u8, 224190) };
//let fw = unsafe { core::slice::from_raw_parts(0x10100000 as *const u8, 230321) };
//let clm = unsafe { core::slice::from_raw_parts(0x10140000 as *const u8, 4752) };
let pwr = Output::new(p.PIN_23, Level::Low);
@ -102,6 +102,13 @@ async fn main(spawner: Spawner) {
}
}
// Wait for DHCP, not necessary when using static IP
info!("waiting for DHCP...");
while !stack.is_config_up() {
Timer::after_millis(100).await;
}
info!("DHCP is now up!");
// And now we can use it!
let mut rx_buffer = [0; 4096];

8
examples/std/Cargo.toml
View File

@ -7,12 +7,12 @@ license = "MIT OR Apache-2.0"
[dependencies]
embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["log"] }
embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["arch-std", "executor-thread", "log", "nightly", "integrated-timers"] }
embassy-time = { version = "0.1.3", path = "../../embassy-time", features = ["log", "std", "nightly"] }
embassy-net = { version = "0.1.0", path = "../../embassy-net", features=[ "std", "nightly", "log", "medium-ethernet", "medium-ip", "tcp", "udp", "dns", "dhcpv4", "proto-ipv6"] }
embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["log", "std", "nightly"] }
embassy-net = { version = "0.2.0", path = "../../embassy-net", features=[ "std", "nightly", "log", "medium-ethernet", "medium-ip", "tcp", "udp", "dns", "dhcpv4", "proto-ipv6"] }
embassy-net-tuntap = { version = "0.1.0", path = "../../embassy-net-tuntap" }
embassy-net-ppp = { version = "0.1.0", path = "../../embassy-net-ppp", features = ["log"]}
embedded-io-async = { version = "0.5.0" }
embedded-io-adapters = { version = "0.5.0", features = ["futures-03"] }
embedded-io-async = { version = "0.6.0" }
embedded-io-adapters = { version = "0.6.0", features = ["futures-03"] }
critical-section = { version = "1.1", features = ["std"] }
smoltcp = { version = "0.10.0", features = ["dns-max-server-count-4"] }

2
examples/std/src/bin/net_ppp.rs
View File

@ -8,7 +8,7 @@
//! nc 192.168.7.10 1234
#![feature(type_alias_impl_trait)]
#![feature(async_fn_in_trait, impl_trait_projections)]
#![feature(async_fn_in_trait)]
#[path = "../serial_port.rs"]
mod serial_port;

2
examples/std/src/bin/tcp_accept.rs
View File

@ -100,7 +100,7 @@ async fn main_task(spawner: Spawner) {
return;
}
Timer::after(Duration::from_millis(500)).await;
Timer::after_millis(500).await;
}
info!("Closing the connection");
socket.abort();

4
examples/std/src/bin/tick.rs
View File

@ -1,14 +1,14 @@
#![feature(type_alias_impl_trait)]
use embassy_executor::Spawner;
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use log::*;
#[embassy_executor::task]
async fn run() {
loop {
info!("tick");
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
}
}

2
examples/stm32c0/Cargo.toml
View File

@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0"
embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "time-driver-any", "stm32c031c6", "memory-x", "unstable-pac", "exti"] }
embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] }
embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] }
embassy-time = { version = "0.1.3", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] }
embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] }
defmt = "0.3"
defmt-rtt = "0.4"

6
examples/stm32c0/src/bin/blinky.rs
View File

@ -5,7 +5,7 @@
use defmt::*;
use embassy_executor::Spawner;
use embassy_stm32::gpio::{Level, Output, Speed};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
#[embassy_executor::main]
@ -18,10 +18,10 @@ async fn main(_spawner: Spawner) {
loop {
info!("high");
led.set_high();
Timer::after(Duration::from_millis(300)).await;
Timer::after_millis(300).await;
info!("low");
led.set_low();
Timer::after(Duration::from_millis(300)).await;
Timer::after_millis(300).await;
}
}

2
examples/stm32f0/Cargo.toml
View File

@ -16,7 +16,7 @@ defmt-rtt = "0.4"
panic-probe = "0.3"
embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] }
embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "integrated-timers"] }
embassy-time = { version = "0.1.3", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] }
embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] }
static_cell = { version = "1.1", features = ["nightly"]}
[profile.release]

4
examples/stm32f0/src/bin/adc.rs
View File

@ -7,7 +7,7 @@ use embassy_executor::Spawner;
use embassy_stm32::adc::{Adc, SampleTime};
use embassy_stm32::peripherals::ADC;
use embassy_stm32::{adc, bind_interrupts};
use embassy_time::{Delay, Duration, Timer};
use embassy_time::{Delay, Timer};
use {defmt_rtt as _, panic_probe as _};
bind_interrupts!(struct Irqs {
@ -36,6 +36,6 @@ async fn main(_spawner: Spawner) {
loop {
let v = adc.read(&mut pin).await;
info!("--> {} - {} mV", v, convert_to_millivolts(v));
Timer::after(Duration::from_millis(100)).await;
Timer::after_millis(100).await;
}
}

6
examples/stm32f0/src/bin/blinky.rs
View File

@ -5,7 +5,7 @@
use defmt::*;
use embassy_executor::Spawner;
use embassy_stm32::gpio::{Level, Output, Speed};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
// main is itself an async function.
@ -19,10 +19,10 @@ async fn main(_spawner: Spawner) {
loop {
info!("high");
led.set_high();
Timer::after(Duration::from_millis(300)).await;
Timer::after_millis(300).await;
info!("low");
led.set_low();
Timer::after(Duration::from_millis(300)).await;
Timer::after_millis(300).await;
}
}

4
examples/stm32f0/src/bin/button_controlled_blink.rs
View File

@ -10,7 +10,7 @@ use defmt::info;
use embassy_executor::Spawner;
use embassy_stm32::exti::ExtiInput;
use embassy_stm32::gpio::{AnyPin, Input, Level, Output, Pin, Pull, Speed};
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
static BLINK_MS: AtomicU32 = AtomicU32::new(0);
@ -24,7 +24,7 @@ async fn led_task(led: AnyPin) {
loop {
let del = BLINK_MS.load(Ordering::Relaxed);
info!("Value of del is {}", del);
Timer::after(Duration::from_millis(del.into())).await;
Timer::after_millis(del.into()).await;
info!("LED toggling");
led.toggle();
}

4
examples/stm32f0/src/bin/hello.rs
View File

@ -4,14 +4,14 @@
use defmt::info;
use embassy_executor::Spawner;
use embassy_time::{Duration, Timer};
use embassy_time::Timer;
use {defmt_rtt as _, panic_probe as _};
#[embassy_executor::main]
async fn main(_spawner: Spawner) -> ! {
let _p = embassy_stm32::init(Default::default());
loop {
Timer::after(Duration::from_secs(1)).await;
Timer::after_secs(1).await;
info!("Hello");
}
}

8
examples/stm32f0/src/bin/multiprio.rs
View File

@ -62,7 +62,7 @@ use defmt::*;
use embassy_executor::{Executor, InterruptExecutor};
use embassy_stm32::interrupt;
use embassy_stm32::interrupt::{InterruptExt, Priority};
use embassy_time::{Duration, Instant, Timer};
use embassy_time::{Instant, Timer};
use static_cell::StaticCell;
use {defmt_rtt as _, panic_probe as _};
@ -70,7 +70,7 @@ use {defmt_rtt as _, panic_probe as _};
async fn run_high() {
loop {
// info!(" [high] tick!");
Timer::after(Duration::from_ticks(27374)).await;
Timer::after_ticks(27374).await;
}
}
@ -87,7 +87,7 @@ async fn run_med() {
let ms = end.duration_since(start).as_ticks() / 33;
info!(" [med] done in {} ms", ms);
Timer::after(Duration::from_ticks(23421)).await;
Timer::after_ticks(23421).await;
}
}
@ -104,7 +104,7 @@ async fn run_low() {
let ms = end.duration_since(start).as_ticks() / 33;
info!("[low] done in {} ms", ms);
Timer::after(Duration::from_ticks(32983)).await;
Timer::after_ticks(32983).await;
}
}

Some files were not shown because too many files have changed in this diff Show More