Merge pull request rp-rs#624 from jannic/on-target-tests

Fix on target tests
nilclass · May 30, 2023 · 0b16b13 · 0b16b13
2 parents b087c0c + edad1d2
commit 0b16b13
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git 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",
 ] }

diff --git 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
@@ -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