Merge branch 'embassy-rs:main' into fix/simple-pwm-32bit-timer-support

3 files changed, 30 insertions, 9 deletions

diff --git a/docs/examples/basic/Cargo.toml b/docs/examples/basic/Cargo.toml
index b90180853..fadda102b 100644
--- a/docs/examples/basic/Cargo.toml
+++ b/docs/examples/basic/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Dario Nieuwenhuis <[email protected]>"]
-edition = "2018"
+edition = "2024"
 name = "embassy-basic-example"
 version = "0.1.0"
 license = "MIT OR Apache-2.0"
diff --git a/docs/examples/basic/src/main.rs b/docs/examples/basic/src/main.rs
index 6e274bacb..42797612c 100644
--- a/docs/examples/basic/src/main.rs
+++ b/docs/examples/basic/src/main.rs
@@ -3,24 +3,41 @@
 
 use defmt::*;
 use embassy_executor::Spawner;
-use embassy_nrf::gpio::{Level, Output, OutputDrive};
-use embassy_time::{Duration, Timer};
-use {defmt_rtt as _, panic_probe as _}; // global logger
+use embassy_nrf::Peri;
+use embassy_nrf::gpio::{AnyPin, Input, Level, Output, OutputDrive, Pull};
+use embassy_time::Timer;
+use {defmt_rtt as _, panic_probe as _};
 
+// Declare async tasks
 #[embassy_executor::task]
-async fn blinker(mut led: Output<'static>, interval: Duration) {
+async fn blink(pin: Peri<'static, AnyPin>) {
+    let mut led = Output::new(pin, Level::Low, OutputDrive::Standard);
+
     loop {
+        // Timekeeping is globally available, no need to mess with hardware timers.
         led.set_high();
-        Timer::after(interval).await;
+        Timer::after_millis(150).await;
         led.set_low();
-        Timer::after(interval).await;
+        Timer::after_millis(150).await;
     }
 }
 
+// Main is itself an async task as well.
 #[embassy_executor::main]
 async fn main(spawner: Spawner) {
+    // Initialize the embassy-nrf HAL.
     let p = embassy_nrf::init(Default::default());
 
-    let led = Output::new(p.P0_13, Level::Low, OutputDrive::Standard);
-    spawner.spawn(unwrap!(blinker(led, Duration::from_millis(300))));
+    // Spawned tasks run in the background, concurrently.
+    spawner.spawn(blink(p.P0_13.into()).unwrap());
+
+    let mut button = Input::new(p.P0_11, Pull::Up);
+    loop {
+        // Asynchronously wait for GPIO events, allowing other tasks
+        // to run, or the core to sleep.
+        button.wait_for_low().await;
+        info!("Button pressed!");
+        button.wait_for_high().await;
+        info!("Button released!");
+    }
 }
diff --git a/docs/pages/embassy_in_the_wild.adoc b/docs/pages/embassy_in_the_wild.adoc
index 3b58bb9b4..0792130eb 100644
--- a/docs/pages/embassy_in_the_wild.adoc
+++ b/docs/pages/embassy_in_the_wild.adoc
@@ -4,6 +4,10 @@ Here are known examples of real-world projects which make use of Embassy. Feel f
 
 _newer entries at the top_
 
+* link:https://github.com/thataquarel/protovolt[ProtoV MINI: A USB-C mini lab power supply]
+** A dual-channel USB PD powered breadboard power supply based on the RP2040, running embedded graphics. Open-source schematics and firmware.
+* link:https://github.com/Dawson-HEP/opentrig/[Opentrig: A particle physics trigger and data acquisition system]
+** Digital event trigger with threshold, data acquisition system designed to interface with AIDA-2020 TLU systems, tested at the DESY II Test Beam Facility. Based on the RP2040, and Embassy's async event handling.
 * link:https://github.com/1-rafael-1/air-quality-monitor[Air Quality Monitor]
 ** Air Quality Monitor based on rp2350 board, ens160 and aht21 sensors and ssd1306 display. Code and 3D printable enclosure included.
 * link:https://github.com/CarlKCarlK/clock[Embassy Clock: Layered, modular bare-metal clock with emulation]