rp-rs · jannic · May 7, 2025 · Mar 13, 2025
diff --git a/rp2040-hal-examples/Cargo.toml b/rp2040-hal-examples/Cargo.toml
@@ -31,8 +31,7 @@ hd44780-driver = "0.4.0"
 nb = "1.0"
 panic-halt = "0.2.0"
 panic-probe = {version = "0.3.1", features = ["print-defmt"]}
-pio = "0.2.0"
-pio-proc = "0.2.0"
+pio = "0.3.0"
 # We aren't using this, but embedded-hal-bus 0.2 unconditionally requires atomics.
 # Should be fixed in e-h-b 0.3 via https://github.com/rust-embedded/embedded-hal/pull/607
 portable-atomic = {version = "1.7.0", features = ["critical-section"]}

diff --git a/rp2040-hal-examples/src/bin/pio_dma.rs b/rp2040-hal-examples/src/bin/pio_dma.rs
@@ -51,7 +51,7 @@ fn main() -> ! {
 
     // Define a PIO program which reads data from the TX FIFO bit by bit, configures the LED
     // according to the data, and then writes the data back to the RX FIFO.
-    let program = pio_proc::pio_asm!(
+    let program = pio::pio_asm!(
         ".wrap_target",
         "    out x, 1",
         "    mov pins, x",

diff --git a/rp2040-hal-examples/src/bin/pio_proc_blink.rs b/rp2040-hal-examples/src/bin/pio_proc_blink.rs
@@ -1,4 +1,4 @@
-//! This example toggles the GPIO25 pin, using a PIO program compiled via pio_proc::pio!().
+//! This example toggles the GPIO25 pin, using a PIO program compiled via pio::pio_asm!().
 //!
 //! If a LED is connected to that pin, like on a Pico board, the LED should blink.
 #![no_std]
@@ -41,7 +41,7 @@ fn main() -> ! {
     let led_pin_id = led.id().num;
 
     // Define some simple PIO program.
-    let program = pio_proc::pio_asm!(
+    let program = pio::pio_asm!(
         ".wrap_target",
         "set pins, 1 [31]",
         "set pins, 0 [31]",

diff --git a/rp2040-hal-examples/src/bin/pio_side_set.rs b/rp2040-hal-examples/src/bin/pio_side_set.rs
@@ -1,4 +1,4 @@
-//! This example toggles the GPIO25 pin, using a PIO program compiled via pio_proc::pio!().
+//! This example toggles the GPIO25 pin, using a PIO program compiled via pio::pio_asm!().
 //!
 //! If a LED is connected to that pin, like on a Pico board, the LED should blink.
 //!
@@ -46,7 +46,7 @@ fn main() -> ! {
     let led_pin_id = led.id().num;
 
     // Define some simple PIO program.
-    let program = pio_proc::pio_asm!(
+    let program = pio::pio_asm!(
         ".side_set 1", // each instruction must set 1 bit
         ".wrap_target",
         "    nop side 1 [15]",

diff --git a/rp2040-hal-examples/src/bin/pio_synchronized.rs b/rp2040-hal-examples/src/bin/pio_synchronized.rs
@@ -46,7 +46,7 @@ fn main() -> ! {
     let pin1 = gp1.id().num;
 
     // Define some simple PIO program.
-    let program = pio_proc::pio_asm!(
+    let program = pio::pio_asm!(
         "
 .wrap_target
     set pins, 1 [31]

diff --git a/rp2040-hal/CHANGELOG.md b/rp2040-hal/CHANGELOG.md
@@ -13,6 +13,10 @@ The Minimum-Supported Rust Version (MSRV) for the next release is 1.81
 
 - Bump MSRV to 1.81 because the crate `home` (an indirect build-depencency) requires it.
 
+### Changed
+
+- Update to pio 0.3.0
+
 ## [0.11.0] - 2024-12-22
 
 ### MSRV

diff --git a/rp2040-hal/Cargo.toml b/rp2040-hal/Cargo.toml
@@ -33,7 +33,7 @@ fugit = "0.3.6"
 itertools = {version = "0.10.1", default-features = false}
 nb = "1.0"
 paste = "1.0"
-pio = "0.2.0"
+pio = "0.3.0"
 rand_core = "0.6.3"
 rp-binary-info = { version = "0.1.0", path = "../rp-binary-info" }
 rp-hal-common = {version="0.1.0", path="../rp-hal-common"}
@@ -51,7 +51,6 @@ rtic-monotonic = {version = "1.0.0", optional = true}
 
 [dev-dependencies]
 # Non-optional dependencies. Keep these sorted by name.
-pio-proc = "0.2.0"
 rand = {version = "0.8.5", default-features = false}
 
 # Optional dependencies. Keep these sorted by name.

diff --git a/rp2040-hal/src/pio.rs b/rp2040-hal/src/pio.rs
@@ -285,7 +285,7 @@ impl<P: PIOExt> PIO<P> {
 /// let mut peripherals = pac::Peripherals::take().unwrap();
 /// let (mut pio, sm0, _, _, _) = peripherals.PIO0.split(&mut peripherals.RESETS);
 /// // Install a program in instruction memory.
-/// let program = pio_proc::pio_asm!(
+/// let program = pio::pio_asm!(
 ///     ".wrap_target",
 ///     "set pins, 1 [31]",
 ///     "set pins, 0 [31]",

diff --git a/rp235x-hal-examples/Cargo.toml b/rp235x-hal-examples/Cargo.toml
@@ -30,8 +30,7 @@ hd44780-driver = "0.4.0"
 heapless = "0.8.0"
 nb = "1.0"
 panic-halt = "0.2.0"
-pio = "0.2.0"
-pio-proc = "0.2.0"
+pio = "0.3.0"
 rp235x-hal = {path = "../rp235x-hal", version = "0.3.0", features = ["binary-info", "critical-section-impl", "rt", "defmt"]}
 # The examples use features not yet available in rp-binary-info 0.1.0,
 # so the minimum version implied by the rp235x-hal 0.3.0 dependency is not sufficient.

diff --git a/rp235x-hal-examples/src/bin/pio_dma.rs b/rp235x-hal-examples/src/bin/pio_dma.rs
@@ -55,7 +55,7 @@ fn main() -> ! {
 
     // Define a PIO program which reads data from the TX FIFO bit by bit, configures the LED
     // according to the data, and then writes the data back to the RX FIFO.
-    let program = pio_proc::pio_asm!(
+    let program = pio::pio_asm!(
         ".wrap_target",
         "    out x, 1",
         "    mov pins, x",

diff --git a/rp235x-hal-examples/src/bin/pio_proc_blink.rs b/rp235x-hal-examples/src/bin/pio_proc_blink.rs
@@ -1,4 +1,4 @@
-//! This example toggles the GPIO25 pin, using a PIO program compiled via pio_proc::pio!().
+//! This example toggles the GPIO25 pin, using a PIO program compiled via pio::pio_asm!().
 //!
 //! If a LED is connected to that pin, like on a Pico board, the LED should blink.
 #![no_std]
@@ -41,7 +41,7 @@ fn main() -> ! {
     let led_pin_id = led.id().num;
 
     // Define some simple PIO program.
-    let program = pio_proc::pio_asm!(
+    let program = pio::pio_asm!(
         ".wrap_target",
         "set pins, 1 [31]",
         "set pins, 0 [31]",

diff --git a/rp235x-hal-examples/src/bin/pio_side_set.rs b/rp235x-hal-examples/src/bin/pio_side_set.rs
@@ -1,4 +1,4 @@
-//! This example toggles the GPIO25 pin, using a PIO program compiled via pio_proc::pio!().
+//! This example toggles the GPIO25 pin, using a PIO program compiled via pio::pio_asm!().
 //!
 //! If a LED is connected to that pin, like on a Pico board, the LED should blink.
 //!
@@ -43,7 +43,7 @@ fn main() -> ! {
     let led_pin_id = led.id().num;
 
     // Define some simple PIO program.
-    let program = pio_proc::pio_asm!(
+    let program = pio::pio_asm!(
         ".side_set 1", // each instruction must set 1 bit
         ".wrap_target",
         "    nop side 1 [15]",

diff --git a/rp235x-hal-examples/src/bin/pio_synchronized.rs b/rp235x-hal-examples/src/bin/pio_synchronized.rs
@@ -46,7 +46,7 @@ fn main() -> ! {
     let pin1 = gp1.id().num;
 
     // Define some simple PIO program.
-    let program = pio_proc::pio_asm!(
+    let program = pio::pio_asm!(
         "
 .wrap_target
     set pins, 1 [31]

diff --git a/rp235x-hal/CHANGELOG.md b/rp235x-hal/CHANGELOG.md
@@ -13,6 +13,10 @@ The Minimum-Supported Rust Version (MSRV) for the next release is 1.81
 
 - Bump MSRV to 1.81 because the crate `home` (an indirect build-depencency) requires it.
 
+### Changed
+
+- Update to pio 0.3.0
+
 ## [0.3.0] - 2025-03-02
 
 ### MSRV

diff --git a/rp235x-hal/Cargo.toml b/rp235x-hal/Cargo.toml
@@ -33,7 +33,7 @@ gcd = ">=2.1,<3.0"
 itertools = {version = "0.13.0", default-features = false}
 nb = "1.0"
 paste = "1.0"
-pio = "0.2.0"
+pio = "0.3.0"
 rand_core = "0.6.3"
 rp-binary-info = {version = "0.1.1", path = "../rp-binary-info"}
 rp-hal-common = {version = "0.1.0", path = "../rp-hal-common"}
@@ -59,7 +59,6 @@ riscv-rt = "0.12"
 
 [dev-dependencies]
 # Non-optional dependencies. Keep these sorted by name.
-pio-proc = "0.2.0"
 rand = {version = "0.8.5", default-features = false}
 
 # Optional dependencies. Keep these sorted by name.

diff --git a/rp235x-hal/src/pio.rs b/rp235x-hal/src/pio.rs
@@ -294,7 +294,7 @@ impl<P: PIOExt> PIO<P> {
 /// let mut peripherals = hal::pac::Peripherals::take().unwrap();
 /// let (mut pio, sm0, _, _, _) = peripherals.PIO0.split(&mut peripherals.RESETS);
 /// // Install a program in instruction memory.
-/// let program = pio_proc::pio_asm!(
+/// let program = pio::pio_asm!(
 ///     ".wrap_target",
 ///     "set pins, 1 [31]",
 ///     "set pins, 0 [31]",