Merge #581

581: stm32: expose all functionality as inherent methods. r=Dirbaio a=Dirbaio

This is the previous step to implementing both the embedded-hal 0.2 and embedded-hal 1.0 + embedded-hal-async traits.

The equivalent in nrf was done in #552 

- Removes need for `unwrap` in gpio.
- Removes need for `use embedded_hal::whatever` in all cases.

Co-authored-by: Dario Nieuwenhuis <[email protected]>

5 files changed, 28 insertions, 20 deletions

diff --git a/tests/stm32/src/bin/gpio.rs b/tests/stm32/src/bin/gpio.rs
index 51ede6cea..305da8d12 100644
--- a/tests/stm32/src/bin/gpio.rs
+++ b/tests/stm32/src/bin/gpio.rs
@@ -8,7 +8,6 @@ use defmt::assert;
 use embassy::executor::Spawner;
 use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed};
 use embassy_stm32::Peripherals;
-use embedded_hal::digital::v2::{InputPin, OutputPin};
 use example_common::*;
 
 #[embassy::main(config = "config()")]
@@ -35,12 +34,12 @@ async fn main(_spawner: Spawner, p: Peripherals) {
         {
             let _a = Output::new(&mut a, Level::Low, Speed::Low);
             delay();
-            assert!(b.is_low().unwrap());
+            assert!(b.is_low());
         }
         {
             let _a = Output::new(&mut a, Level::High, Speed::Low);
             delay();
-            assert!(b.is_high().unwrap());
+            assert!(b.is_high());
         }
     }
 
@@ -51,38 +50,38 @@ async fn main(_spawner: Spawner, p: Peripherals) {
 
         let mut a = Output::new(&mut a, Level::Low, Speed::Low);
         delay();
-        assert!(b.is_low().unwrap());
-        a.set_high().unwrap();
+        assert!(b.is_low());
+        a.set_high();
         delay();
-        assert!(b.is_high().unwrap());
+        assert!(b.is_high());
     }
 
     // Test input pulldown
     {
         let b = Input::new(&mut b, Pull::Down);
         delay();
-        assert!(b.is_low().unwrap());
+        assert!(b.is_low());
 
         let mut a = Output::new(&mut a, Level::Low, Speed::Low);
         delay();
-        assert!(b.is_low().unwrap());
-        a.set_high().unwrap();
+        assert!(b.is_low());
+        a.set_high();
         delay();
-        assert!(b.is_high().unwrap());
+        assert!(b.is_high());
     }
 
     // Test input pullup
     {
         let b = Input::new(&mut b, Pull::Up);
         delay();
-        assert!(b.is_high().unwrap());
+        assert!(b.is_high());
 
         let mut a = Output::new(&mut a, Level::Low, Speed::Low);
         delay();
-        assert!(b.is_low().unwrap());
-        a.set_high().unwrap();
+        assert!(b.is_low());
+        a.set_high();
         delay();
-        assert!(b.is_high().unwrap());
+        assert!(b.is_high());
     }
 
     info!("Test OK");
diff --git a/tests/stm32/src/bin/spi.rs b/tests/stm32/src/bin/spi.rs
index 043505c7b..47d0017ac 100644
--- a/tests/stm32/src/bin/spi.rs
+++ b/tests/stm32/src/bin/spi.rs
@@ -10,7 +10,6 @@ use embassy_stm32::dma::NoDma;
 use embassy_stm32::spi::{self, Spi};
 use embassy_stm32::time::Hertz;
 use embassy_stm32::Peripherals;
-use embedded_hal::blocking::spi::Transfer;
 use example_common::*;
 
 #[embassy::main(config = "config()")]
@@ -38,7 +37,7 @@ async fn main(_spawner: Spawner, p: Peripherals) {
     // Arduino pins D11 and D12 (MOSI-MISO) are connected together with a 1K resistor.
     // so we should get the data we sent back.
     let mut buf = data;
-    spi.transfer(&mut buf).unwrap();
+    spi.blocking_transfer_in_place(&mut buf).unwrap();
     assert_eq!(buf, data);
 
     info!("Test OK");
diff --git a/tests/stm32/src/bin/usart.rs b/tests/stm32/src/bin/usart.rs
index f887b084a..44ee730e4 100644
--- a/tests/stm32/src/bin/usart.rs
+++ b/tests/stm32/src/bin/usart.rs
@@ -9,7 +9,6 @@ use embassy::executor::Spawner;
 use embassy_stm32::dma::NoDma;
 use embassy_stm32::usart::{Config, Uart};
 use embassy_stm32::Peripherals;
-use embedded_hal::blocking::serial::Write;
 use example_common::*;
 
 #[embassy::main(config = "config()")]
@@ -42,10 +41,10 @@ async fn main(_spawner: Spawner, p: Peripherals) {
     // This is because we aren't sending+receiving at the same time.
 
     let data = [0xC0, 0xDE];
-    usart.bwrite_all(&data).unwrap();
+    usart.blocking_write(&data).unwrap();
 
     let mut buf = [0; 2];
-    usart.read_blocking(&mut buf).unwrap();
+    usart.blocking_read(&mut buf).unwrap();
     assert_eq!(buf, data);
 
     info!("Test OK");
diff --git a/tests/stm32/src/bin/usart_dma.rs b/tests/stm32/src/bin/usart_dma.rs
index 96c6a6640..37faaf376 100644
--- a/tests/stm32/src/bin/usart_dma.rs
+++ b/tests/stm32/src/bin/usart_dma.rs
@@ -8,7 +8,6 @@ use defmt::assert_eq;
 use embassy::executor::Spawner;
 use embassy_stm32::usart::{Config, Uart};
 use embassy_stm32::Peripherals;
-use embassy_traits::uart::{Read, Write};
 use example_common::*;
 
 #[embassy::main(config = "config()")]
diff --git a/tests/stm32/teleprobe.sh b/tests/stm32/teleprobe.sh
new file mode 100755
index 000000000..6eec6ca93
--- /dev/null
+++ b/tests/stm32/teleprobe.sh
@@ -0,0 +1,12 @@
+echo Running target=$1 elf=$2
+STATUSCODE=$(
+    curl \
+        -sS \
+        --output /dev/stderr \
+        --write-out "%{http_code}" \
+        -H "Authorization: Bearer $TELEPROBE_TOKEN" \
+        https://teleprobe.embassy.dev/targets/$1/run --data-binary @$2
+)
+echo
+echo HTTP Status code: $STATUSCODE
+test "$STATUSCODE" -eq 200