Bump rp2040-hal to 0.10.0 and embedded-hal to 1.0 #60

martinsp · 2024-03-16T16:41:49Z

~~Depends on unreleased version of ws2812-pio with rp2040-hal 0.10.0 support~~

boards/adafruit-itsy-bitsy-rp2040/examples/adafruit_itsy_bitsy_rainbow.rs

boards/rp-pico/examples/pico_uart_irq_buffer.rs

martinsp · 2024-03-17T08:20:05Z

Bumped ws2812-pio to 0.8

ithinuel

Thank you for this PR !!!

I'd only request one change (but of course repeated for so many boards :o).

boards/adafruit-feather-rp2040/examples/adafruit_feather_neopixel_rainbow.rs

boards/pimoroni-servo2040/examples/pimoroni_servo2040_rainbow.rs

boards/adafruit-itsy-bitsy-rp2040/examples/adafruit_itsy_bitsy_rainbow.rs

boards/adafruit-kb2040/examples/adafruit_kb2040_rainbow.rs

boards/adafruit-metro-rp2040/examples/adafruit_metro_rainbow.rs

boards/solderparty-rp2040-stamp/examples/solderparty_stamp_neopixel_rainbow.rs

boards/sparkfun-pro-micro-rp2040/examples/sparkfun_pro_micro_rainbow.rs

boards/sparkfun-thing-plus-rp2040/examples/sparkfun_thing_plus_rainbow.rs

boards/vcc-gnd-yd-rp2040/examples/yd_rp2040_neopixel_rainbow.rs

boards/waveshare-rp2040-zero/examples/waveshare_rp2040_zero_neopixel_rainbow.rs

martinsp · 2024-03-17T13:28:07Z

I'd only request one change (but of course repeated for so many boards :o).

@ithinuel I have made the changes

ithinuel

The last bit is a little nit, sorry I missed that in your previous iteration.

ithinuel · 2024-03-17T16:16:40Z

boards/adafruit-itsy-bitsy-rp2040/examples/adafruit_itsy_bitsy_rainbow.rs

@@ -66,12 +64,12 @@ fn main() -> ! {
    );

    let mut n: u8 = 128;
+    let mut timer = timer;


The mut can be placed on the first binding :)

If I change let timer = Timer::new(pac.TIMER, &mut pac.RESETS, &clocks); to let mut timer = Timer::new(pac.TIMER, &mut pac.RESETS, &clocks);

Then compiler complains with the following error:

error[E0502]: cannot borrow `timer` as mutable because it is also borrowed as immutable --> boards/adafruit-itsy-bitsy-rp2040/examples/adafruit_itsy_bitsy_rainbow.rs:72:9 | 63 | timer.count_down(), | ----- immutable borrow occurs here ... 69 | ws.write(brightness(once(wheel(n)), 32)).unwrap(); | -- immutable borrow later used here ... 72 | timer.delay_ms(25); | ^^^^^^^^^^^^^^^^^^ mutable borrow occurs here

oh I see. It might be worth adding a note that the "rebind" is to force a copy of the timer.
Or maybe change 63 | timer.count_down(), to 63 | timer.clone().count_down(), ?

timer.clone().count_down() fails with an error creates a temporary value which is freed while still in use, so I added a note

ithinuel · 2024-03-17T16:17:01Z

boards/adafruit-kb2040/examples/adafruit_kb2040_rainbow.rs

@@ -80,12 +78,12 @@ fn main() -> ! {
    // Infinite colour wheel loop

    let mut n: u8 = 128;
+    let mut timer = timer;


ithinuel · 2024-03-17T16:17:13Z

boards/adafruit-metro-rp2040/examples/adafruit_metro_rainbow.rs

@@ -62,12 +60,12 @@ fn main() -> ! {
    );

    let mut n: u8 = 128;
+    let mut timer = timer;


ithinuel · 2024-03-17T16:28:04Z

boards/adafruit-qt-py-rp2040/examples/adafruit_qt_py_rp2040_rainbow.rs

@@ -66,12 +64,12 @@ fn main() -> ! {
    );

    let mut n: u8 = 128;
+    let mut timer = timer;


ithinuel · 2024-03-17T16:28:12Z

boards/adafruit-trinkey-qt2040/examples/adafruit_trinkey_qt2040_rainbow.rs

@@ -80,12 +78,12 @@ fn main() -> ! {
    // Infinite colour wheel loop

    let mut n: u8 = 128;
+    let mut timer = timer;


ithinuel · 2024-03-17T16:28:54Z

boards/solderparty-rp2040-stamp/examples/solderparty_stamp_neopixel_rainbow.rs

@@ -67,12 +65,12 @@ fn main() -> ! {

    // Infinite colour wheel loop
    let mut n: u8 = 128;
+    let mut timer = timer;


ithinuel · 2024-03-17T16:29:05Z

boards/sparkfun-pro-micro-rp2040/examples/sparkfun_pro_micro_rainbow.rs

@@ -79,12 +77,12 @@ fn main() -> ! {
    // Infinite colour wheel loop

    let mut n: u8 = 128;
+    let mut timer = timer;


ithinuel · 2024-03-17T16:29:15Z

boards/sparkfun-thing-plus-rp2040/examples/sparkfun_thing_plus_rainbow.rs

@@ -78,12 +76,12 @@ fn main() -> ! {
    // Infinite colour wheel loop

    let mut n: u8 = 128;
+    let mut timer = timer;


ithinuel · 2024-03-17T16:29:31Z

boards/vcc-gnd-yd-rp2040/examples/yd_rp2040_neopixel_rainbow.rs

@@ -67,12 +65,12 @@ fn main() -> ! {

    // Infinite colour wheel loop
    let mut n: u8 = 128;
+    let mut timer = timer;


ithinuel · 2024-03-17T16:29:41Z

boards/waveshare-rp2040-zero/examples/waveshare_rp2040_zero_neopixel_rainbow.rs

@@ -67,12 +65,12 @@ fn main() -> ! {

    // Infinite colour wheel loop
    let mut n: u8 = 128;
+    let mut timer = timer;


jannic · 2024-03-18T08:44:04Z

error: package `embedded-hal-async v1.0.0` cannot be built because it requires rustc 1.75 or newer, while the currently active rustc version is 1.72.0-nightly

I think we need to set MSRV to 1.75, that's also what rp2040-hal uses.

martinsp · 2024-03-18T11:35:36Z

error: package `embedded-hal-async v1.0.0` cannot be built because it requires rustc 1.75 or newer, while the currently active rustc version is 1.72.0-nightly
I think we need to set MSRV to 1.75, that's also what rp2040-hal uses.

Should I do this as part of this PR or this will be dealt separately?

I guess the toolchain version should be aligned in this block

rp-hal-boards/.github/workflows/build_and_test.yml

Line 28 in 6eb85ab

udeps:

with the one in rp2040-hal ?

jannic · 2024-03-18T17:47:24Z

Should I do this as part of this PR or this will be dealt separately?

I think it would be easiest to change it in this PR, otherwise you'd have to rebase this PR to get the pipeline fixed.

I guess the toolchain version should be aligned in this block

rp-hal-boards/.github/workflows/build_and_test.yml

Line 28 in 6eb85ab

udeps:

with the one in rp2040-hal ?

Yes, replacing toolchain: nightly-2023-06-27 with toolchain: nightly-2024-01-30 should work.

martinsp · 2024-03-18T18:59:28Z

I tested GitHub action on my fork and had to adjust dependencies for pimoroni-tufty204 board to make udeps step pass, looks like it was failing on main branch also

jannic · 2024-03-19T14:19:26Z

Looks good! Thank you for the patience to address all our comments. This is a huge step forward towards BSP releases based on rp2040-hal 0.10.0.

martinsp added 29 commits March 16, 2024 10:23

Update rp2040-hal to v0.10.0

cd38603

embedded-hal 1.0, remove "unproven" feature flag

16e4637

Fix compilation for boards

2a666a3

Compile adafruit-macropad examples

2436cb7

Compile arduino_nano_connect examples

884ec23

Compile adafruit-qt-py-rp2040 examples

8cb0b51

Compile adafruit-feather-rp2040 examples

8ffa330

Compile adafruit-trinkey-qt2040 examples

6e0cd22

Compile pimoroni_badger2040 examples

d9df59c

Compile solderparty-rp2040-stamp examples

0254251

Compile sparkfun-pro-micro-rp2040 examples

9f43f07

Compile pimoroni-pico-lipo-16mb examples

28c0797

Compile sparkfun-thing-plus-rp2040 examples

f699521

Compile waveshare-rp2040-zero examples

d3596b2

Compile adafruit-itsy-bitsy-rp2040 examples

f56411f

Compile sparkfun-micromod-rp2040 examples

a22c35e

Compile pimoroni-pico-explorer examples

0fdc395

Compile adafruit-metro-rp2040 examples

b08dad6

Compile pimoroni-tiny2040 examples

7c04564

Compile vcc-gnd-yd-rp2040 examples

d4a4c44

Compile adafruit-kb2040 examples

c4be486

Compile pimoroni-tufty2040 examples

1e0b5de

Compile pimoroni-servo2040 examples

fc5153f

Compile pimoroni-plasma-2040 examples

9fd64a3

Compile rp-pico examples

aea04f9

Compile boardsource-blok examples

188175c

Compile seeeduino-xiao-rp2040 examples

d3a94e7

Update deps

b2fcb01

Update ws2812-pio dep

4eadec3

jannic reviewed Mar 16, 2024

View reviewed changes

boards/adafruit-itsy-bitsy-rp2040/examples/adafruit_itsy_bitsy_rainbow.rs Outdated Show resolved Hide resolved

jannic reviewed Mar 16, 2024

View reviewed changes

boards/rp-pico/examples/pico_uart_irq_buffer.rs Outdated Show resolved Hide resolved

martinsp added 4 commits March 16, 2024 20:32

Use DelayNs instead of CountDown

ff91980

Make clippy happy

31c808b

Use embedded_hal_nb::serial instead of embedded_hal_0_2::serial

8ce3897

Bump ws2812-pio to 0.8.0

0a681ab

ithinuel requested changes Mar 17, 2024

View reviewed changes

martinsp mentioned this pull request Mar 17, 2024

Bump rp2040-pac to 0.6 in rtic-monotonics rtic-rs/rtic#905

Merged

Use timer variable name

5a06d24

martinsp force-pushed the rp2040-hal-update branch from c42bbdf to 5a06d24 Compare March 17, 2024 13:25

ithinuel approved these changes Mar 17, 2024

View reviewed changes

Add note about timer rebind

52a6989

martinsp added 2 commits March 18, 2024 19:55

Update rust toolchain used in udeps job

b1dc5ac

Adjust dependencies for pimoroni-tufty2040

c836045

jannic merged commit 3fdd613 into rp-rs:main Mar 19, 2024
7 checks passed

jenshnielsen mentioned this pull request Mar 31, 2024

Upgrade to embedded-hal v1.0.0 #57

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump rp2040-hal to 0.10.0 and embedded-hal to 1.0 #60

Bump rp2040-hal to 0.10.0 and embedded-hal to 1.0 #60

martinsp commented Mar 16, 2024 •

edited

Loading

martinsp commented Mar 17, 2024

ithinuel left a comment

martinsp commented Mar 17, 2024

ithinuel left a comment

ithinuel Mar 17, 2024

martinsp Mar 17, 2024

ithinuel Mar 17, 2024

martinsp Mar 17, 2024

ithinuel Mar 17, 2024

ithinuel Mar 17, 2024

ithinuel Mar 17, 2024

ithinuel Mar 17, 2024

ithinuel Mar 17, 2024

ithinuel Mar 17, 2024

ithinuel Mar 17, 2024

ithinuel Mar 17, 2024

ithinuel Mar 17, 2024

jannic commented Mar 18, 2024

martinsp commented Mar 18, 2024

jannic commented Mar 18, 2024

martinsp commented Mar 18, 2024

jannic commented Mar 19, 2024

Bump rp2040-hal to 0.10.0 and embedded-hal to 1.0 #60

Bump rp2040-hal to 0.10.0 and embedded-hal to 1.0 #60

Conversation

martinsp commented Mar 16, 2024 • edited Loading

martinsp commented Mar 17, 2024

ithinuel left a comment

Choose a reason for hiding this comment

martinsp commented Mar 17, 2024

ithinuel left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jannic commented Mar 18, 2024

martinsp commented Mar 18, 2024

jannic commented Mar 18, 2024

martinsp commented Mar 18, 2024

jannic commented Mar 19, 2024

martinsp commented Mar 16, 2024 •

edited

Loading