From 45d4a21c5167d411b9f992f7319996649fbe407f Mon Sep 17 00:00:00 2001 From: Jan Niehusmann Date: Mon, 29 May 2023 17:50:18 +0000 Subject: [PATCH 1/2] Don't specify version of rp2040-hal for on-target tests They should use the current version from the path dependency. --- on-target-tests/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/on-target-tests/Cargo.toml b/on-target-tests/Cargo.toml index 6abdeef77..2872f04d5 100644 --- a/on-target-tests/Cargo.toml +++ b/on-target-tests/Cargo.toml @@ -38,7 +38,7 @@ defmt-rtt = "0.4" defmt-test = "0.3" panic-probe = { version = "0.3", features = ["print-defmt"] } -rp2040-hal = { path = "../rp2040-hal", version = "0.9", features = [ +rp2040-hal = { path = "../rp2040-hal", features = [ "defmt", "critical-section-impl", ] } From edad1d2a2e48c41de09839982daa27ce6d20b253 Mon Sep 17 00:00:00 2001 From: Jan Niehusmann Date: Mon, 29 May 2023 17:53:02 +0000 Subject: [PATCH 2/2] Fix gpio configuration in on-target-tests --- on-target-tests/tests/dma_spi_loopback_u16.rs | 6 +++--- on-target-tests/tests/dma_spi_loopback_u8.rs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/on-target-tests/tests/dma_spi_loopback_u16.rs b/on-target-tests/tests/dma_spi_loopback_u16.rs index df264b65d..5062e95e7 100644 --- a/on-target-tests/tests/dma_spi_loopback_u16.rs +++ b/on-target-tests/tests/dma_spi_loopback_u16.rs @@ -95,9 +95,9 @@ mod tests { ); // These are implicitly used by the spi driver if they are in the correct mode - let spi_sclk = pins.gpio6.into(); - let spi_mosi = pins.gpio7.into(); - let spi_miso = pins.gpio4.into(); + let spi_sclk = pins.gpio6.reconfigure(); + let spi_mosi = pins.gpio7.reconfigure(); + let spi_miso = pins.gpio4.reconfigure(); let spi = hal::spi::Spi::new(pac.SPI0, (spi_mosi, spi_miso, spi_sclk)); // Exchange the uninitialised SPI driver for an initialised one diff --git a/on-target-tests/tests/dma_spi_loopback_u8.rs b/on-target-tests/tests/dma_spi_loopback_u8.rs index b6fef3fe3..3c7f6a2cb 100644 --- a/on-target-tests/tests/dma_spi_loopback_u8.rs +++ b/on-target-tests/tests/dma_spi_loopback_u8.rs @@ -96,9 +96,9 @@ mod tests { ); // These are implicitly used by the spi driver if they are in the correct mode - let spi_sclk = pins.gpio6.into(); - let spi_mosi = pins.gpio7.into(); - let spi_miso = pins.gpio4.into(); + let spi_sclk = pins.gpio6.reconfigure(); + let spi_mosi = pins.gpio7.reconfigure(); + let spi_miso = pins.gpio4.reconfigure(); let spi = hal::spi::Spi::new(pac.SPI0, (spi_mosi, spi_miso, spi_sclk)); // Exchange the uninitialised SPI driver for an initialised one