docs

Author: burrbull

CHANGELOG.md

@@ -11,7 +11,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
  - Bump `synopsys-usb-otg` to 0.3.2 (bug fix)
  - Update readme, clippy fixes
- - Added possibility to pass complementary pins to `Pwm` and change pwm channel polarity [#571]
+ - Added possibility to pass complementary pins to `Pwm` and change pwm channel polarity [#571],
+   set dead time and idle state for advanced timers [#578]
 
 ### Added
 
@@ -27,6 +28,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 [#571]: https://github.com/stm32-rs/stm32f4xx-hal/pull/571
 [#572]: https://github.com/stm32-rs/stm32f4xx-hal/pull/572
 [#577]: https://github.com/stm32-rs/stm32f4xx-hal/pull/577
+[#578]: https://github.com/stm32-rs/stm32f4xx-hal/pull/578
+
 
 ## [v0.14.0] - 2022-12-12
 

src/timer.rs

@@ -246,7 +246,7 @@ pub type CCR4<T> = CCR<T, 3>;
 pub struct DMAR<T>(T);
 
 mod sealed {
-    use super::{Channel, Event, Ocm, Polarity, IdleState};
+    use super::{Channel, Event, IdleState, Ocm, Polarity};
     pub trait General {
         type Width: Into<u32> + From<u16>;
         fn max_auto_reload() -> u32;
@@ -485,11 +485,14 @@ macro_rules! hal {
                         }
                         fn idle_state(c: u8, comp: bool, s: IdleState) {
                             let tim = unsafe { &*<$TIM>::ptr() };
-                            if !comp && (c < Self::CH_NUMBER) {
-                                unsafe { bb::write(&tim.cr2, c*2 + 8, s == IdleState::Set); }
-                            }
-                            if comp && (c < Self::COMP_CH_NUMBER) {
-                                unsafe { bb::write(&tim.cr2, c*2 + 9, s == IdleState::Set); }
+                            if !comp {
+                                if c < Self::CH_NUMBER {
+                                    unsafe { bb::write(&tim.cr2, c*2 + 8, s == IdleState::Set); }
+                                }
+                            } else {
+                                if c < Self::COMP_CH_NUMBER {
+                                    unsafe { bb::write(&tim.cr2, c*2 + 9, s == IdleState::Set); }
+                                }
                             }
                         }
                     }

src/timer/pwm.rs

@@ -34,7 +34,8 @@
 //! and change their polarity with `set_polarity` and `set_complementary_polarity`.
 
 use super::{
-    compute_arr_presc, Advanced, Channel, FTimer, Instance, Ocm, Polarity, Timer, WithPwm, IdleState,
+    compute_arr_presc, Advanced, Channel, FTimer, IdleState, Instance, Ocm, Polarity, Timer,
+    WithPwm,
 };
 use crate::rcc::Clocks;
 use core::marker::PhantomData;
@@ -438,17 +439,31 @@ where
         TIM::enable_nchannel(PINS::check_complementary_used(channel) as u8, false)
     }
 
+    /// Set number DTS ticks during that complementary pin is `dead`
     #[inline]
     pub fn set_dead_time(&mut self, dts_ticks: u16) {
         let bits = pack_ceil_dead_time(dts_ticks);
         TIM::set_dtg_value(bits);
     }
 
+    /// Set raw dead time (DTG) bits
+    #[inline]
+    pub fn set_dead_time_bits(&mut self, bits: u8) {
+        TIM::set_dtg_value(bits);
+    }
+
+    /// Return dead time for complementary pins in DTS ticks
     #[inline]
     pub fn get_dead_time(&self) -> u16 {
         unpack_dead_time(TIM::read_dtg_value())
     }
 
+    /// Get raw dead time (DTG) bits
+    #[inline]
+    pub fn get_dead_time_bits(&self) -> u8 {
+        TIM::read_dtg_value()
+    }
+
     #[inline]
     pub fn set_idle_state(&mut self, channel: Channel, s: IdleState) {
         TIM::idle_state(PINS::check_used(channel) as u8, false, s);
@@ -626,17 +641,31 @@ where
         TIM::enable_nchannel(PINS::check_complementary_used(channel) as u8, false)
     }
 
+    /// Set number DTS ticks during that complementary pin is `dead`
     #[inline]
     pub fn set_dead_time(&mut self, dts_ticks: u16) {
         let bits = pack_ceil_dead_time(dts_ticks);
         TIM::set_dtg_value(bits);
     }
 
+    /// Set raw dead time (DTG) bits
+    #[inline]
+    pub fn set_dead_time_bits(&mut self, bits: u8) {
+        TIM::set_dtg_value(bits);
+    }
+
+    /// Return dead time for complementary pins in DTS ticks
     #[inline]
     pub fn get_dead_time(&self) -> u16 {
         unpack_dead_time(TIM::read_dtg_value())
     }
 
+    /// Get raw dead time (DTG) bits
+    #[inline]
+    pub fn get_dead_time_bits(&self) -> u8 {
+        TIM::read_dtg_value()
+    }
+
     #[inline]
     pub fn set_idle_state(&mut self, channel: Channel, s: IdleState) {
         TIM::idle_state(PINS::check_used(channel) as u8, false, s);