From 37130f45e4f74f7b4faeb7cac017c4588e5b422a Mon Sep 17 00:00:00 2001
From: Romain Goyet <romain@goyet.com>
Date: Thu, 5 Sep 2024 11:39:09 -0400
Subject: [PATCH] stm32: Use the updated LPTIM pac

---
 embassy-stm32/src/lptim/mod.rs   | 6 +++---
 embassy-stm32/src/lptim/pwm.rs   | 1 +
 embassy-stm32/src/lptim/timer.rs | 9 ++++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/embassy-stm32/src/lptim/mod.rs b/embassy-stm32/src/lptim/mod.rs
index 327a1d44b..dc5f1d5bb 100644
--- a/embassy-stm32/src/lptim/mod.rs
+++ b/embassy-stm32/src/lptim/mod.rs
@@ -28,16 +28,16 @@ pin_trait!(Channel1Pin, Instance);
 pin_trait!(Channel2Pin, Instance);
 
 pub(crate) trait SealedInstance: RccPeripheral {
-    fn regs() -> crate::pac::lptim::LptimAdv;
+    fn regs() -> crate::pac::lptim::Lptim;
 }
 
 /// LPTIM instance trait.
 #[allow(private_bounds)]
 pub trait Instance: SealedInstance + 'static {}
 foreach_interrupt! {
-    ($inst:ident, lptim, LPTIM_ADV, GLOBAL, $irq:ident) => {
+    ($inst:ident, lptim, LPTIM, UP, $irq:ident) => {
         impl SealedInstance for crate::peripherals::$inst {
-            fn regs() -> crate::pac::lptim::LptimAdv {
+            fn regs() -> crate::pac::lptim::Lptim {
                 crate::pac::$inst
             }
         }
diff --git a/embassy-stm32/src/lptim/pwm.rs b/embassy-stm32/src/lptim/pwm.rs
index 725aa676e..24725f625 100644
--- a/embassy-stm32/src/lptim/pwm.rs
+++ b/embassy-stm32/src/lptim/pwm.rs
@@ -66,6 +66,7 @@ impl<'d, T: Instance> Pwm<'d, T> {
         this.inner.enable();
         this.set_frequency(freq);
 
+        #[cfg(any(lptim_v2a, lptim_v2b))]
         [Channel::Ch1, Channel::Ch2].iter().for_each(|&channel| {
             this.inner.set_channel_direction(channel, ChannelDirection::OutputPwm);
         });
diff --git a/embassy-stm32/src/lptim/timer.rs b/embassy-stm32/src/lptim/timer.rs
index 06392b2e7..b354c1f61 100644
--- a/embassy-stm32/src/lptim/timer.rs
+++ b/embassy-stm32/src/lptim/timer.rs
@@ -8,6 +8,7 @@ use crate::rcc;
 use crate::time::Hertz;
 
 /// Direction of a low-power timer channel
+#[cfg(any(lptim_v2a, lptim_v2b))]
 pub enum ChannelDirection {
     /// Use channel as a PWM output
     OutputPwm,
@@ -15,6 +16,7 @@ pub enum ChannelDirection {
     InputCapture,
 }
 
+#[cfg(any(lptim_v2a, lptim_v2b))]
 impl From<ChannelDirection> for vals::Ccsel {
     fn from(direction: ChannelDirection) -> Self {
         match direction {
@@ -147,9 +149,10 @@ impl<'d, T: Instance> Timer<'d, T> {
     }
 
     /// Set channel direction.
+    #[cfg(any(lptim_v2a, lptim_v2b))]
     pub fn set_channel_direction(&self, channel: Channel, direction: ChannelDirection) {
         T::regs()
-            .ccmr()
+            .ccmr(0)
             .modify(|w| w.set_ccsel(channel.index(), direction.into()));
     }
 
@@ -185,14 +188,14 @@ impl<'d, T: Instance> Timer<'d, T> {
 
     /// Enable/disable a channel.
     pub fn enable_channel(&self, channel: Channel, enable: bool) {
-        T::regs().ccmr().modify(|w| {
+        T::regs().ccmr(0).modify(|w| {
             w.set_cce(channel.index(), enable);
         });
     }
 
     /// Get enable/disable state of a channel
     pub fn get_channel_enable_state(&self, channel: Channel) -> bool {
-        T::regs().ccmr().read().cce(channel.index())
+        T::regs().ccmr(0).read().cce(channel.index())
     }
 
     /// Set compare value for a channel.