Merge #607

607: stm32: Add standard crate-wide macros for pin/dma traits r=Dirbaio a=Dirbaio

All drivers will declare the traits using these macros.

This has a few implications:
- ALL drivers will have an Instance trait, even for drivers that usually have only one instance (for example crc, eth)
- It's no longer possible to have a fn configure() in pin traits, drivers will have to do that some other way

In the future, build.rs will generate all the impls instead of macrotables.

Pin/Dma traits are no longer explicitly sealed, since gpio::Pin and dma::Channel are already sealed, which has the same effect. This means the `af_num()` and `request()` funcs are now public, but IMO that's okay, they're unlikely to change.

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

1 files changed, 13 insertions, 8 deletions

diff --git a/examples/stm32h7/src/bin/low_level_timer_api.rs b/examples/stm32h7/src/bin/low_level_timer_api.rs
index 1bf69104d..0c99b0941 100644
--- a/examples/stm32h7/src/bin/low_level_timer_api.rs
+++ b/examples/stm32h7/src/bin/low_level_timer_api.rs
@@ -10,9 +10,10 @@ use embassy::executor::Spawner;
 use embassy::time::{Duration, Timer};
 use embassy::util::Unborrow;
 use embassy_hal_common::unborrow;
-use embassy_stm32::pwm::{pins::*, Channel, OutputCompareMode};
+use embassy_stm32::gpio::low_level::AFType;
+use embassy_stm32::gpio::Speed;
+use embassy_stm32::pwm::*;
 use embassy_stm32::time::{Hertz, U32Ext};
-use embassy_stm32::timer::GeneralPurpose32bitInstance;
 use embassy_stm32::{Config, Peripherals};
 use example_common::*;
 
@@ -50,12 +51,12 @@ async fn main(_spawner: Spawner, p: Peripherals) {
         Timer::after(Duration::from_millis(300)).await;
     }
 }
-pub struct SimplePwm32<'d, T: GeneralPurpose32bitInstance> {
+pub struct SimplePwm32<'d, T: CaptureCompare32bitInstance> {
     phantom: PhantomData<&'d mut T>,
     inner: T,
 }
 
-impl<'d, T: GeneralPurpose32bitInstance> SimplePwm32<'d, T> {
+impl<'d, T: CaptureCompare32bitInstance> SimplePwm32<'d, T> {
     pub fn new<F: Into<Hertz>>(
         tim: impl Unborrow<Target = T> + 'd,
         ch1: impl Unborrow<Target = impl Channel1Pin<T>> + 'd,
@@ -70,10 +71,14 @@ impl<'d, T: GeneralPurpose32bitInstance> SimplePwm32<'d, T> {
         <T as embassy_stm32::rcc::low_level::RccPeripheral>::reset();
 
         unsafe {
-            ch1.configure();
-            ch2.configure();
-            ch3.configure();
-            ch4.configure();
+            ch1.set_speed(Speed::VeryHigh);
+            ch1.set_as_af(ch1.af_num(), AFType::OutputPushPull);
+            ch2.set_speed(Speed::VeryHigh);
+            ch2.set_as_af(ch1.af_num(), AFType::OutputPushPull);
+            ch3.set_speed(Speed::VeryHigh);
+            ch3.set_as_af(ch1.af_num(), AFType::OutputPushPull);
+            ch4.set_speed(Speed::VeryHigh);
+            ch4.set_as_af(ch1.af_num(), AFType::OutputPushPull);
         }
 
         let mut this = Self {